svn commit: r1308308 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp: index.html js/archiva/startup.js js/archiva/utils.js

[olamy]

Author: olamy
Date: Mon Apr  2 11:37:22 2012
New Revision: 1308308

URL: http://svn.apache.org/viewvc?rev=1308308&view=rev
Log:
really ensure we load i18n before loading ui

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1308308&r1=1308307&r2=1308308&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
 Mon Apr  2 11:37:22 2012
@@ -121,7 +121,8 @@
 
 
                 
require(['order!domReady','order!jquery','order!i18n','order!startup'], 
function (domReady) {
-                  domReady.withResources(function () {
+                  domReady.withResources(
+                    loadi18n(function () {
                       $.ajax({
                           url: 
"restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
                           dataType: 'json',
@@ -140,8 +141,9 @@
 
 
                           }
-                      })
-                  })
+                        })
+                    })
+                  );
                 });
         }
     })

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js?rev=1308308&r1=1308307&r2=1308308&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
 Mon Apr  2 11:37:22 2012
@@ -30,5 +30,5 @@ function() {
     cache: false,//!window.archivaDevMode
     dataType: 'json'
   });
-  loadi18n();
+
 });
\ No newline at end of file

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1308308&r1=1308307&r2=1308308&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
 Mon Apr  2 11:37:22 2012
@@ -19,14 +19,15 @@
 
 define("utils",["jquery","i18n","jquery.tmpl"], function() {
 
-  loadi18n=function(){
+  loadi18n=function(loadCallback){
     var browserLang = usedLang();
     $.log("use browserLang:"+browserLang);
 
     var options = {
       cache:false,
       mode: 'map',
-      encoding:'utf-8'
+      encoding:'utf-8',
+      callback: loadCallback
     };
     
loadAndParseFile("restServices/archivaServices/commonServices/getAllI18nResources?locale="+browserLang,options
 );
   }