Add require.js support for desktop version (initial work)

pmuir · May 28, 2012 · 2eb8408 · 2eb8408
1 parent 69932b7
commit 2eb8408
Show file tree

Hide file tree

Showing 13 changed files with 3,297 additions and 878 deletions.
diff --git a/src/main/webapp/desktop-index.html b/src/main/webapp/desktop-index.html
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script type="text/javascript" src="resources/js/modernizr-2.0.6.js"></script>
+    <script type="text/javascript" src="resources/js/libs/modernizr-2.0.6.js"></script>
 
     <script type="text/javascript">
         if (Modernizr.touch || Modernizr.mq("only all and (max-width: 480px)")) {

diff --git a/src/main/webapp/mobile-index.html b/src/main/webapp/mobile-index.html
@@ -8,11 +8,11 @@
 
     <link rel="stylesheet" href="resources/css/jquery.mobile-1.1.0.css"/>
     <link rel="stylesheet" href="resources/css/m.screen.css"/>
-    <script type="text/javascript" src="resources/js/jquery-1.7.1.js"></script>
-    <script type="text/javascript" src="resources/js/jquery.mobile-1.1.0.js"></script>
-    <script type="text/javascript" src="resources/js/underscore.js"></script>
-    <script type="text/javascript" src="resources/js/backbone.js"></script>
-    <script type="text/javascript" src="resources/app/tm-utils.js"></script>
+    <script type="text/javascript" src="resources/js/libs/jquery-1.7.1.js"></script>
+    <script type="text/javascript" src="resources/js/libs/jquery.mobile-1.1.0.js"></script>
+    <script type="text/javascript" src="resources/js/libs/underscore.js"></script>
+    <script type="text/javascript" src="resources/js/libs/backbone.js"></script>
+    <script type="text/javascript" src="resources/js/app/tm-utils.js"></script>
     <script type="text/javascript">
         $.mobile.hashListeningEnabled = false;
         $.mobile.linkBindingEnabled = false;

diff --git a/src/main/webapp/resources/app/tm-utils.js b/src/main/webapp/resources/app/tm-utils.js