Author: dward
Date: 2007-10-15 23:55:18 +0200 (Mon, 15 Oct 2007)
New Revision: 5398
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/gwt2.js
Log:
- CURRIKI-1009
- Javascript files can't use $msg.get(), so load the value from the page
instead (with default if not there)
Modified: xwiki-products/curriki/trunk/web/src/main/webapp/gwt2.js
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/gwt2.js 2007-10-15
20:59:25 UTC (rev 5397)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/gwt2.js 2007-10-15
21:55:18 UTC (rev 5398)
@@ -591,9 +591,11 @@
function displayLoadingMsg() {
if (window.jQuery)
(function($){
- // Put the dialogue box up
- //This is a translated string (which means it cannot be sent by
apache)
- $("<div id='loadingGWT' class='tk-ModalDialog dialog-loading'><div
id='loadingGWTMsg'>$msg.get('loading.loading_msg')</div><div
id='loadingGWTImg'><img src='/xwiki/skins/curriki8/icons/spinner.gif'
/></div></div>").appendTo('body');
+ $('<div id="loadingGWTGlass" class="tk-GlassPanel
tk-ModalDialog-glassPanel" style="position: absolute; left: 0px; top: 0px;
width: 100%; height: '+$(window).height()+'px;"/>').appendTo('body');
+ $("<div id='loadingGWT' class='tk-ModalDialog dialog-loading'><div
id='loadingGWTMsg'>Loading, please wait...</div><div id='loadingGWTImg'><img
src='/xwiki/skins/curriki8/icons/spinner.gif' /></div></div>").appendTo('body');
+ if (window.GWTArguments && window.GWTArguments.loading_msg){
+ $("#loadingGWTMsg").html(GWTArguments.loading_msg);
+ }
})(jQuery);
}
@@ -601,6 +603,7 @@
if (window.jQuery)
(function($){
$('#loadingGWT').remove();
+ $('#loadingGWTGlass').remove();
})(jQuery);
return true;
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications