svn commit: r1305566 [1/3] - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp: index.html js/order.js js/require.1.0.7.js js/text.js

[ol...@apache.org]

Author: olamy
Date: Mon Mar 26 20:46:09 2012
New Revision: 1305566

URL: http://svn.apache.org/viewvc?rev=1305566&view=rev
Log:
upgrade require js and plugins

Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/require.1.0.7.js   (with props)
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/order.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/text.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=1305566&r1=1305565&r2=1305566&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 Mar 26 20:46:09 2012
@@ -10,7 +10,7 @@
   <script type="text/javascript" src="js/jquery-1.7.2.js"></script>
 
   <script type="text/javascript" src="js/lab.js"></script>
-  <script type="text/javascript" src="js/require.1.0.1.js"></script>
+  <script type="text/javascript" src="js/require.1.0.7.js"></script>
   <script type="text/javascript" src="js/jquery.i18n.properties-1.0.9.js"></script>
   <script type="text/javascript" src="js/archiva/startup.js"></script>
   <title>Apache Archiva</title>
@@ -49,6 +49,15 @@
 <script type="text/javascript">
 
     $(function() {
+
+        require.config({
+            baseUrl: "js/",
+            "paths": {
+                "i18n":"jquery.i18n.properties-1.0.9",
+                "jquery": "jquery-1.7.2"
+            }
+        });
+
         loadJs();
     });
 

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/order.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/order.js?rev=1305566&r1=1305565&r2=1305566&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/order.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/order.js Mon Mar 26 20:46:09 2012
@@ -1,5 +1,5 @@
 /**
- * @license RequireJS order 1.0.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS order 1.0.5 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -120,11 +120,20 @@
     }
 
     define({
-        version: '1.0.0',
+        version: '1.0.5',
 
         load: function (name, req, onLoad, config) {
-            var url = req.nameToUrl(name, null),
-                node, context;
+            var hasToUrl = !!req.nameToUrl,
+                url, node, context;
+
+            //If no nameToUrl, then probably a build with a loader that
+            //does not support it, and all modules are inlined.
+            if (!hasToUrl) {
+                req([name], onLoad);
+                return;
+            }
+
+            url = req.nameToUrl(name, null);
 
             //Make sure the async attribute is not set for any pathway involving
             //this script.