Merge pull request #998 from kmilov/bug/fixReturnPromiseOnResolve

Fix to return the ocLazyLoading promise on resolve
SC5 · Sep 2, 2016 · 7a54e17 · 7a54e17
2 parents cdd128e + a668b10
commit 7a54e17
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/app/js/app.js b/lib/app/js/app.js
@@ -41,8 +41,8 @@ angular.module('sgApp', deps)
         templateUrl: 'views/sections.html',
         controller: 'SectionsCtrl',
         resolve: {
-          loadLazyModule: function($ocLazyLoad) {
-            loadModule($ocLazyLoad);
+          loadLazyModule: function($$animateJs, $ocLazyLoad) {
+            return loadModule($$animateJs, $ocLazyLoad);
           }
         }
       })
@@ -51,8 +51,8 @@ angular.module('sgApp', deps)
         templateUrl: 'views/sections.html',
         controller: 'SectionsCtrl',
         resolve: {
-          loadLazyModule: function($ocLazyLoad) {
-            loadModule($ocLazyLoad);
+          loadLazyModule: function($$animateJs, $ocLazyLoad) {
+            return loadModule($$animateJs, $ocLazyLoad);
           }
         }
       })
@@ -81,8 +81,8 @@ angular.module('sgApp', deps)
         templateUrl: 'views/variable-sections.html',
         controller: 'VariablesCtrl',
         resolve: {
-          loadLazyModule: function($ocLazyLoad) {
-            loadModule($ocLazyLoad);
+          loadLazyModule: function($$animateJs, $ocLazyLoad) {
+            return loadModule($$animateJs, $ocLazyLoad);
           }
         }
       })
@@ -91,16 +91,16 @@ angular.module('sgApp', deps)
         templateUrl: 'views/element-fullscreen.html',
         controller: 'ElementCtrl',
         resolve: {
-          loadLazyModule: function($ocLazyLoad) {
-            loadModule($ocLazyLoad);
+          loadLazyModule: function($$animateJs, $ocLazyLoad) {
+            return loadModule($$animateJs, $ocLazyLoad);
           }
         }
       }).state('app.index.404', {
         url: '/:all',
         templateUrl: 'views/404.html'
       });
 
-    function loadModule($ocLazyLoad) {
+    function loadModule($$animateJs, $ocLazyLoad) {
       if (window.filesConfig && window.filesConfig.length) {
         var moduleNames = [];
         angular.forEach(window.filesConfig, function(lazyLoadmodule) {