From bbeb1b968f5234a62c32681c2ed9e4a7a189bd34 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Thu, 3 Oct 2013 22:33:09 +0200 Subject: During callback, separate loading of stylesheet files and code snippets; fixes #480 --- .../source/prado/activecontrols/ajax3.js | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'framework/Web/Javascripts') diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js index 55ef64cb..e19f5d49 100644 --- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js +++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js @@ -175,6 +175,10 @@ Object.extend(Prado.CallbackRequest, * Script list header name. */ SCRIPTLIST_HEADER : 'X-PRADO-SCRIPTLIST', + /** + * Stylesheet code header name. + */ + STYLESHEET_HEADER : 'X-PRADO-STYLESHEET', /** * Stylesheet list header name. */ @@ -431,6 +435,22 @@ Object.extend(Prado.CallbackRequest, } }, + loadStyleSheetsCode : function(request, transport) + { + var self = Prado.CallbackRequest; + var data = request.getBodyContentPart(self.STYLESHEET_HEADER); + if (typeof(data) == "string" && data.length > 0) + { + json = Prado.CallbackRequest.decode(data); + if(typeof(json) != "object") + Logger.warn("Invalid stylesheet list:"+data); + else + for(var key in json) + if (/^\d+$/.test(key)) + Prado.StyleSheetManager.createStyleSheetCode(json[key],null); + } + }, + loadStyleSheetsAsync : function(request, transport) { var self = Prado.CallbackRequest; @@ -520,6 +540,8 @@ Object.extend(Prado.CallbackRequest, */ + this.loadStyleSheetsCode(request,transport); + this.loadStyleSheetsAsync(request,transport); this.loadScripts(request,transport,callback); @@ -1127,6 +1149,15 @@ if (typeof(Prado.AssetManagerClass)=="undefined") { asset.href = url; // asset.async = false; // HTML5 only return asset; + }, + + createStyleSheetCode: function(code) { + var asset = document.createElement('style'); + asset.setAttribute('type', 'text/css'); + asset.innerText = code; + + var head = document.getElementsByTagName('head')[0]; + head.appendChild(asset); } }); -- cgit v1.2.3