Просмотр исходного кода

Merge branch 'fix/Template.Mtooltips_modify' into 'wrdp'

Merge of fix/Template.Mtooltips_modify to wrdp

See merge request o2oa/o2oa!2044
蔡祥熠 5 лет назад
Родитель
Сommit
a0848d1a18

+ 1 - 1
o2web/source/x_component_Template/MSelector.js

@@ -50,7 +50,7 @@ var MSelector = new Class({
             this.cssPath = "../x_component_Template/$MSelector/"+this.options.style+"/css.wcss";
             this.cssPath = "../x_component_Template/$MSelector/"+this.options.style+"/css.wcss";
             this._loadCss();
             this._loadCss();
             if( css ){
             if( css ){
-                this.css = Object.merge( this.css, css )
+                this.css = Object.merge( Object.clone(this.css), css )
             }
             }
         }
         }
 
 

+ 2 - 0
o2web/source/x_component_Template/MTooltips.js

@@ -176,6 +176,8 @@ var MTooltips = new Class({
         this.fireEvent("queryCreate",[this]);
         this.fireEvent("queryCreate",[this]);
         this.loadStyle();
         this.loadStyle();
 
 
+        this.fireEvent("loadStyle",[this]);
+
         this.node = new Element("div.tooltipNode", {
         this.node = new Element("div.tooltipNode", {
             styles : this.nodeStyles
             styles : this.nodeStyles
         }).inject( this.container );
         }).inject( this.container );