Fix: carousel on init too soon

ZhiguoZhang · Apr 5, 2017 · 93cf8a4 · 93cf8a4
1 parent 100ab0b
commit 93cf8a4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-carousel",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "authors": [
     {
       "name": "mihnsen",
@@ -36,7 +36,7 @@
   "dependencies": {},
   "devDependencies": {
     "angular-mocks": ">=1.2.0",
-    "angular": "1.4",
+    "angular": "1.6",
     "angular-sanitize": ">=1.2.0",
     "prism": "^1.5.1"
   },

diff --git a/dist/ui-carousel.js b/dist/ui-carousel.js
@@ -43,11 +43,6 @@ angular.module('ui.carousel.controllers').controller('CarouselController', ['$sc
     _this.initRanges();
     _this.setProps();
     _this.setupInfinite();
-
-    // onInit callback
-    if (_this.onInit) {
-      _this.onInit();
-    }
   };
 
   /**
@@ -168,6 +163,11 @@ angular.module('ui.carousel.controllers').controller('CarouselController', ['$sc
       if (!_this.options.fade) {
         _this.refreshTrackStyle();
       }
+
+      // onInit callback
+      if (_this.onInit) {
+        _this.onInit();
+      }
     }).catch(function () {
       // Catch err
     });

diff --git a/dist/ui-carousel.min.js b/dist/ui-carousel.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-carousel",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "author": {
     "name": "mihnsen",
     "email": "[email protected]"

diff --git a/src/demo/main.js b/src/demo/main.js
@@ -8,7 +8,7 @@ app.controller('CarouselDemoCtrl', ['$scope', 'Carousel', function($scope, Carou
   'use strict';
 
   this.singleInit = () => {
-    // console.log('single init');
+    console.log('single init');
   };
 
   this.single = {

diff --git a/src/ui-carousel/controllers/carousel.controller.js b/src/ui-carousel/controllers/carousel.controller.js
@@ -25,11 +25,6 @@ angular.module('ui.carousel.controllers')
       this.initRanges();
       this.setProps();
       this.setupInfinite();
-
-      // onInit callback
-      if (this.onInit) {
-        this.onInit();
-      }
     };
 
     /**
@@ -152,6 +147,11 @@ angular.module('ui.carousel.controllers')
           if (!this.options.fade) {
             this.refreshTrackStyle();
           }
+
+          // onInit callback
+          if (this.onInit) {
+            this.onInit();
+          }
         })
         .catch(() => {
           // Catch err