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

[olamy]

Author: olamy
Date: Wed Aug 22 07:56:39 2012
New Revision: 1375924

URL: http://svn.apache.org/viewvc?rev=1375924&view=rev
Log:
ensure we correctly load tmpl before extend it

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/main.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=1375924&r1=1375923&r2=1375924&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
 Wed Aug 22 07:56:39 2012
@@ -33,7 +33,6 @@
 
   <script type="text/javascript" src="js/jquery-1.8.0.min.js"></script>
   <script type="text/javascript" src="js/sammy.0.7.1.js"></script>
-
   <script type="text/javascript" src="js/require.2.0.2.js"></script>
 
   <title>Apache Archiva</title>
@@ -148,7 +147,7 @@
                     }
                 });
 
-                
require(['jquery','i18n','sammy','startup','utils','domReady!'], function 
(domReady) {
+                
require(['jquery','jquery.tmpl','i18n','sammy','startup','utils','domReady!'], 
function (domReady) {
                     loadi18n(function () {
                       $.ajax({
                           url: 
"restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1375924&r1=1375923&r2=1375924&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
 Wed Aug 22 07:56:39 2012
@@ -568,5 +568,16 @@ function() {
   }
 
 
+  //-----------------------------------------
+  // extends jquery tmpl to support var def
+  //-----------------------------------------
+
+  $.extend($.tmpl.tag, {
+      "var": {
+          open: "var $1;"
+      }
+  });
+
+
 });
 

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=1375924&r1=1375923&r2=1375924&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
 Wed Aug 22 07:56:39 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-define("utils",["jquery","i18n","jquery.tmpl"], function() {
+define("utils",["jquery","jquery.tmpl","i18n"], function() {
 
   loadi18n=function(loadCallback){
     $.log("loadi18n");
@@ -426,14 +426,6 @@ define("utils",["jquery","i18n","jquery.
     return this.substring(idx);
   }
 
-  //-----------------------------------------
-  // extends jquery tmpl to support var def
-  //-----------------------------------------
-
-  $.extend($.tmpl.tag, {
-      "var": {
-          open: "var $1;"
-      }
-  });
+
 
 });
\ No newline at end of file