Merge branch 'hotfix/embed_style' into 'master'

Merge of hotfix/embed_style 修复嵌入应用的loadCss问题 to master

See merge request o2oa/o2oa!1237

(cherry picked from commit 4bbd1564)

326af3ed 修复嵌入应用的loadCss问题

o2web/source/x_component_Common/Main.js

@@ -403,16 +403,19 @@ MWF.xApplication.Common.Main = new Class({
 		this.setContentEvent();
 
 		//if (this.options.title) this.setTitle(this.options.title);
-		if (this.stylePath) o2.loadCss(this.stylePath);
-		//this.content.addClass("appContent");
-
-		this.loadApplication(function(){
-			this.fireAppEvent("postLoadApplication");
-		}.bind(this));
-
-		//this.content.setStyle("height", document.body.getSize().y);
-
-		this.fireAppEvent("postLoad");
+		if (this.stylePath){
+			(this.window.node || this.content).loadCss(this.stylePath, function () {
+				this.loadApplication(function(){
+					this.fireAppEvent("postLoadApplication");
+				}.bind(this));
+				this.fireAppEvent("postLoad");
+			}.bind(this));
+		}else{
+			this.loadApplication(function(){
+				this.fireAppEvent("postLoadApplication");
+			}.bind(this));
+			this.fireAppEvent("postLoad");
+		}
 	},
 
 	openInNewBrowser: function (noClose) {