提交 87d31286 编写于 作者: 蔡祥熠

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

Merge of fix/Template.Mtooltips_modify to wrdp

See merge request o2oa/o2oa!2044
......@@ -50,7 +50,7 @@ var MSelector = new Class({
this.cssPath = "../x_component_Template/$MSelector/"+this.options.style+"/css.wcss";
this._loadCss();
if( css ){
this.css = Object.merge( this.css, css )
this.css = Object.merge( Object.clone(this.css), css )
}
}
......
......@@ -176,6 +176,8 @@ var MTooltips = new Class({
this.fireEvent("queryCreate",[this]);
this.loadStyle();
this.fireEvent("loadStyle",[this]);
this.node = new Element("div.tooltipNode", {
styles : this.nodeStyles
}).inject( this.container );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册