extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 19:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix copy/paste error in constructors

Browse Source
This commit is contained in:
nathangray 2020-01-22 02:23:24 -07:00
parent b1c094ca47
commit 5693ca42e8
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_core_baseWidget.js
View File

@ -47,7 +47,7 @@ var et2_baseWidget = /** @class */ (function (_super) {
function et2_baseWidget(_parent, _attrs, _child) { function et2_baseWidget(_parent, _attrs, _child) {
var _this = var _this =
// Call the inherited constructor // Call the inherited constructor
_super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_core_DOMWidget_1.et2_DOMWidget._attributes, _child || {})) || this; _super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_baseWidget._attributes, _child || {})) || this;
_this.align = 'left'; _this.align = 'left';
_this.node = null; _this.node = null;
_this.statustext = ''; _this.statustext = '';

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

File diff suppressed because one or more lines are too long

2
api/js/etemplate/et2_core_baseWidget.ts
View File

@ -69,7 +69,7 @@ export class et2_baseWidget extends et2_DOMWidget implements et2_IAligned
constructor(_parent, _attrs? : WidgetConfig, _child? : object) constructor(_parent, _attrs? : WidgetConfig, _child? : object)
{ {
// Call the inherited constructor // Call the inherited constructor
super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_DOMWidget._attributes, _child || {})); super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_baseWidget._attributes, _child || {}));
} }
destroy() destroy()

4
api/js/etemplate/et2_widget_description.js
View File

@ -30,7 +30,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
require("./et2_core_common"); require("./et2_core_common");
var et2_core_inheritance_1 = require("./et2_core_inheritance"); var et2_core_inheritance_1 = require("./et2_core_inheritance");
var et2_core_widget_1 = require("./et2_core_widget"); var et2_core_widget_1 = require("./et2_core_widget");
var et2_core_DOMWidget_1 = require("./et2_core_DOMWidget");
var et2_core_baseWidget_1 = require("./et2_core_baseWidget"); var et2_core_baseWidget_1 = require("./et2_core_baseWidget");
require("./et2_types"); require("./et2_types");
/** /**
@ -44,7 +43,7 @@ var et2_description = /** @class */ (function (_super) {
function et2_description(_parent, _attrs, _child) { function et2_description(_parent, _attrs, _child) {
var _this = var _this =
// Call the inherited constructor // Call the inherited constructor
_super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_core_DOMWidget_1.et2_DOMWidget._attributes, _child || {})) || this; _super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_description._attributes, _child || {})) || this;
_this.legacyOptions = ["font_style", "href", "activate_links", "for", _this.legacyOptions = ["font_style", "href", "activate_links", "for",
"extra_link_target", "extra_link_popup", "statustext"]; "extra_link_target", "extra_link_popup", "statustext"];
_this._labelContainer = null; _this._labelContainer = null;
@ -354,3 +353,4 @@ var et2_description = /** @class */ (function (_super) {
return et2_description; return et2_description;
}(et2_core_baseWidget_1.et2_baseWidget)); }(et2_core_baseWidget_1.et2_baseWidget));
et2_core_widget_1.et2_register_widget(et2_description, ["description", "label"]); et2_core_widget_1.et2_register_widget(et2_description, ["description", "label"]);
//# sourceMappingURL=et2_widget_description.js.map

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

File diff suppressed because one or more lines are too long

4
api/js/etemplate/et2_widget_description.ts
View File

@ -110,7 +110,7 @@ class et2_description extends et2_baseWidget implements et2_IDetachedDOM
"description": "Text to show as tooltip of defined action" "description": "Text to show as tooltip of defined action"
} }
} };
legacyOptions: string[] = ["font_style", "href", "activate_links", "for", legacyOptions: string[] = ["font_style", "href", "activate_links", "for",
"extra_link_target", "extra_link_popup", "statustext"]; "extra_link_target", "extra_link_popup", "statustext"];
@ -127,7 +127,7 @@ class et2_description extends et2_baseWidget implements et2_IDetachedDOM
constructor(_parent, _attrs? : WidgetConfig, _child? : object) constructor(_parent, _attrs? : WidgetConfig, _child? : object)
{ {
// Call the inherited constructor // Call the inherited constructor
super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_DOMWidget._attributes, _child || {})); super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_description._attributes, _child || {}));
// Create the span/label tag which contains the label text // Create the span/label tag which contains the label text
this.span = jQuery(document.createElement(this.options["for"] ? "label" : "span")) this.span = jQuery(document.createElement(this.options["for"] ? "label" : "span"))