Fix for bug #18: merged files and incorrect module loading

ocombe · Apr 30, 2014 · 4d1ee22 · 4d1ee22
1 parent 9066bdc
commit 4d1ee22
Show file tree

Hide file tree

Showing 14 changed files with 1,027 additions and 1,024 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.1.3 (30 April 2014)
+* Fix for bug #18: merged files and incorrect module loading
+
 # 0.1.2 (14 April 2014)
 * Fix for bug #16: config blocks didn't work for module dependencies
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ocLazyLoad",
   "main": "ocLazyLoad.min.js",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "homepage": "https://github.com/ocombe/ocLazyLoad",
   "authors": [
     "Olivier Combe <olivier.combe@gmail.com>"

diff --git a/example/index.html b/example/index.html
@@ -6,21 +6,21 @@
         <!-- // end lazy load -->
 
         <!-- Templates -->
-        <script type="text/ng-template" id="/partials/testLazyLoad.html">
+        <script type="text/ng-template" id="partials/testLazyLoad.html">
             <div ng-controller="LazyLoadCtrl">
                 Lazy Hello World Test : {{ worldmessage }}<br/>
                 Lazier Hello Universe Test : {{ universemessage}}
             </div>
 
-            <div ng-include="'/partials/testTemplate.html'"></div>
-            <div ng-include="'/partials/testTemplate2.html'"></div>
+            <div ng-include="'partials/testTemplate.html'"></div>
+            <div ng-include="'partials/testTemplate2.html'"></div>
         </script>
         <!-- // end Templates -->
 
         <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular.min.js"></script>
         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.0/angular-ui-router.js"></script>
         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/script.js/2.4.0/script.min.js"></script>
-        <script type="text/javascript" src="ocLazyLoad.js"></script>
-        <script type="text/javascript" src="app.js"></script>
+        <script type="text/javascript" src="js/ocLazyLoad.js"></script>
+        <script type="text/javascript" src="js/app.js"></script>
     </body>
 </html>
diff --git a/example/app.js → example/js/app.js b/example/app.js → example/js/app.js
@@ -22,18 +22,18 @@ var App = angular.module('app', ['ui.router', 'oc.lazyLoad'])
 			url: "/", // root route
 			views: {
 				"lazyLoadView": {
-					templateUrl: '/partials/testLazyLoad.html'
+					templateUrl: 'partials/testLazyLoad.html'
 				}
 			},
 			resolve: {
 				test: ['$ocLazyLoad', function($ocLazyLoad) {
 					return $ocLazyLoad.load({
 						name: 'TestModule',
-						files: ['testModule.js']
+						files: ['js/testModule.js']
 					});
 				}],
 				templateTest: ['$ocLazyLoad', '$templateCache', function($ocLazyLoad, $templateCache) {
-					return $ocLazyLoad.loadTemplateFile(['partials.html', 'partials2.html']);
+					return $ocLazyLoad.loadTemplateFile(['partials/partials.html', 'partials/partials2.html']);
 				}]
 			}
 		});
@@ -47,11 +47,11 @@ var App = angular.module('app', ['ui.router', 'oc.lazyLoad'])
 			modules: [
                 {
                     name: 'HelloWorld',
-                    files: ['helloWorldModule.js']
+                    files: ['js/helloWorldModule.js']
                 }
 //				{
 //					name: 'TestModule',
-//					files: ['testModule.js'],
+//					files: ['js/testModule.js'],
 //					template: 'partials/testLazyLoad.html'
 //				}
 			],

diff --git a/example/helloUniverseModule.js → example/js/helloUniverseModule.js b/example/helloUniverseModule.js → example/js/helloUniverseModule.js
diff --git a/example/helloWorldModule.js → example/js/helloWorldModule.js b/example/helloWorldModule.js → example/js/helloWorldModule.js