holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing options in et2_dialog

Browse Source
This commit is contained in:
Hadi Nategh 2020-01-22 16:08:34 +01:00
parent a5299abbf7
commit 28e4e81478
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/js/etemplate/et2_widget_dialog.js
View File

@ -23,8 +23,15 @@ var __extends = (this && this.__extends) || (function () {
}; };
})(); })();
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
/*egw:uses
et2_core_widget;
/vendor/bower-asset/jquery-ui/jquery-ui.js;
*/
var et2_core_widget_1 = require("./et2_core_widget"); var et2_core_widget_1 = require("./et2_core_widget");
var et2_core_widget_2 = require("./et2_core_widget");
var et2_widget_button_1 = require("./et2_widget_button"); var et2_widget_button_1 = require("./et2_widget_button");
var et2_core_inheritance_1 = require("./et2_core_inheritance");
var et2_core_DOMWidget_1 = require("./et2_core_DOMWidget");
/** /**
* A common dialog widget that makes it easy to imform users or prompt for information. * A common dialog widget that makes it easy to imform users or prompt for information.
* *
@ -101,7 +108,7 @@ var et2_widget_button_1 = require("./et2_widget_button");
var et2_dialog = /** @class */ (function (_super) { var et2_dialog = /** @class */ (function (_super) {
__extends(et2_dialog, _super); __extends(et2_dialog, _super);
function et2_dialog(_parent, _attrs, _child) { function et2_dialog(_parent, _attrs, _child) {
var _this = _super.call(this) || this; var _this = _super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_core_DOMWidget_1.et2_DOMWidget._attributes, _child || {})) || this;
/** /**
* Details for dialog type options * Details for dialog type options
*/ */
@ -394,7 +401,7 @@ var et2_dialog = /** @class */ (function (_super) {
_egw_or_appname = egw_appName; _egw_or_appname = egw_appName;
} }
// create a dummy parent with a correct reference to an application specific egw object // create a dummy parent with a correct reference to an application specific egw object
var parent = new et2_core_widget_1.et2_widget(); var parent = new et2_core_widget_2.et2_widget();
// if egw object is passed in because called from et2, just use it // if egw object is passed in because called from et2, just use it
if (typeof _egw_or_appname != 'string') { if (typeof _egw_or_appname != 'string') {
parent.setApiInstance(_egw_or_appname); parent.setApiInstance(_egw_or_appname);
@ -499,7 +506,7 @@ var et2_dialog = /** @class */ (function (_super) {
var buttonId = _senders.id; var buttonId = _senders.id;
var dialogMsg = (typeof _dialogMsg != "undefined") ? _dialogMsg : ''; var dialogMsg = (typeof _dialogMsg != "undefined") ? _dialogMsg : '';
var titleMsg = (typeof _titleMsg != "undefined") ? _titleMsg : ''; var titleMsg = (typeof _titleMsg != "undefined") ? _titleMsg : '';
var egw = _senders instanceof et2_core_widget_1.et2_widget ? _senders.egw() : et2_dialog._create_parent().egw(); var egw = _senders instanceof et2_core_widget_2.et2_widget ? _senders.egw() : et2_dialog._create_parent().egw();
var callbackDialog = function (button_id) { var callbackDialog = function (button_id) {
if (button_id == et2_dialog.YES_BUTTON) { if (button_id == et2_dialog.YES_BUTTON) {
if (_postSubmit) { if (_postSubmit) {
@ -792,6 +799,6 @@ var et2_dialog = /** @class */ (function (_super) {
et2_dialog.YES_BUTTON = 2; et2_dialog.YES_BUTTON = 2;
et2_dialog.NO_BUTTON = 3; et2_dialog.NO_BUTTON = 3;
return et2_dialog; return et2_dialog;
}(et2_core_widget_1.et2_widget)); }(et2_core_widget_2.et2_widget));
et2_register_widget(et2_dialog, ["dialog"]); et2_core_widget_1.et2_register_widget(et2_dialog, ["dialog"]);
//# sourceMappingURL=et2_widget_dialog.js.map //# sourceMappingURL=et2_widget_dialog.js.map

2
api/js/etemplate/et2_widget_dialog.js.map
View File

File diff suppressed because one or more lines are too long

6
api/js/etemplate/et2_widget_dialog.ts
View File

@ -14,9 +14,11 @@
/vendor/bower-asset/jquery-ui/jquery-ui.js; /vendor/bower-asset/jquery-ui/jquery-ui.js;
*/ */
import {WidgetConfig} from "./et2_core_widget"; import {et2_register_widget, WidgetConfig} from "./et2_core_widget";
import {et2_widget} from "./et2_core_widget"; import {et2_widget} from "./et2_core_widget";
import {et2_button} from "./et2_widget_button"; import {et2_button} from "./et2_widget_button";
import {ClassWithAttributes} from "./et2_core_inheritance";
import {et2_DOMWidget} from "./et2_core_DOMWidget";
/** /**
* A common dialog widget that makes it easy to imform users or prompt for information. * A common dialog widget that makes it easy to imform users or prompt for information.
@ -262,7 +264,7 @@ class et2_dialog extends et2_widget {
template: any = null; template: any = null;
constructor(_parent?, _attrs? : WidgetConfig, _child? : object) { constructor(_parent?, _attrs? : WidgetConfig, _child? : object) {
super(); super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_DOMWidget._attributes, _child || {}));
// Define this as null to avoid breaking any hierarchies (eg: destroy()) // Define this as null to avoid breaking any hierarchies (eg: destroy())
if (this.getParent() != null) this.getParent().removeChild(this); if (this.getParent() != null) this.getParent().removeChild(this);