feat: Added support for specifying the type of a file.

* Use files: [{path: 'path/to/file.x', type: 'type'}] where type is either css, html or js. * Added support for specifying the type of a file using requireJS style syntax. * Updated README.md * Added a test case for loading via these methods.
ocombe · Jan 28, 2015 · a3549ee · a3549ee
1 parent 11d8dc0
commit a3549ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/ocLazyLoad.js b/src/ocLazyLoad.js
@@ -53,7 +53,7 @@
           if(debug) {
             $log.info(eventName, params);
           }
-        }
+        };
 
         /**
          * Load a js/css file
@@ -105,10 +105,10 @@
             loaded = 1;
             broadcast('ocLazyLoad.fileLoaded', path);
             deferred.resolve();
-          }
+          };
           el.onerror = function(e) {
             deferred.reject(new Error('Unable to load ' + path));
-          }
+          };
           el.async = params.serie ? 0 : 1;
 
           var insertBeforeElem = anchor.lastChild;
@@ -401,7 +401,7 @@
                 isLoaded = !!moduleExists(module);
               }
               return isLoaded;
-            }
+            };
             if(angular.isString(modulesNames)) {
               modulesNames = [modulesNames];
             }
@@ -591,7 +591,7 @@
 
               // Create a wrapper promise to watch the promise list and resolve it once everything is done.
               return $q.all(promisesList);
-            }
+            };
 
             filesLoader(config, localParams).then(function success() {
               if(moduleName === null) {
@@ -769,7 +769,7 @@
                 provider[args[1]].apply(provider, args[2]);
               }
             }
-          }
+          };
           if(angular.isFunction(args[2][0])) {
             callInvoke(args[2][0]);
           } else if(angular.isArray(args[2][0])) {
@@ -850,7 +850,7 @@
       newInvoke = true;
       regInvokes[moduleName][type].push(invokeName);
       broadcast('ocLazyLoad.componentLoaded', [moduleName, type, invokeName]);
-    }
+    };
     if(angular.isString(invokeList) && regInvokes[moduleName][type].indexOf(invokeList) === -1) {
       onInvoke(invokeList);
     } else if(angular.isObject(invokeList)) {

diff --git a/tests/unit/specs/ocLazyLoad.spec.js b/tests/unit/specs/ocLazyLoad.spec.js
@@ -152,7 +152,8 @@ describe('Module: oc.lazyLoad', function() {
               testModuleNoExt = {
                   name: 'testModuleNoExt',
                   files: [
-                      {type: 'js', file: lazyLoadUrl + 'testModule.NoExtension'},
+                      {type: 'js', path: lazyLoadUrl + 'testModule.NoExtension'},
+                      lazyLoadUrl + 'test.css',
                       'css!' + lazyLoadUrl + 'test.NoExtCss',
                       templateUrl
                   ]