ensure we correctly load tmpl before extend it

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1375924 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
index e68b7fc642ce0f5dc232e3c6411245b567f81b1e..92184483fe55c77b01398345b003948d8c0c8ee8 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
@@ -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(),

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index fc8ccb9eb62a91ab0c5b5bfe1b450ca212faedf2..240acdfe1d513fec99cfa43afc447938bf67b303 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -568,5 +568,16 @@ function() {
   }
 
 
+  //-----------------------------------------
+  // extends jquery tmpl to support var def
+  //-----------------------------------------
+
+  $.extend($.tmpl.tag, {
+      "var": {
+          open: "var $1;"
+      }
+  });
+
+
 });
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index 9fb10cc86fd55cca4bd9d5d8fca3eb8c1c5f5791..8502354f091711fa73356d6ddc25d6104dd206bf 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -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.tmpl"], function() {
     return this.substring(idx);
   }
 
-  //-----------------------------------------
-  // extends jquery tmpl to support var def
-  //-----------------------------------------
 
-  $.extend($.tmpl.tag, {
-      "var": {
-          open: "var $1;"
-      }
-  });
 
 });
\ No newline at end of file