collectionRepeat: only digest if available

ionic-team · Apr 29, 2014 · 431449f · 431449f
1 parent a467418
commit 431449f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/demos/collection-repeat/index.html b/demos/collection-repeat/index.html
@@ -5,8 +5,8 @@
 
   <title>Collection-Repeat: Early Preview</title>
 
-  <link href="http://code.ionicframework.com/nightly/css/ionic.css" rel="stylesheet">
-  <script src="http://code.ionicframework.com/nightly/js/ionic.bundle.js"></script>
+  <link href="../../dist/css/ionic.css" rel="stylesheet">
+  <script src="../../dist/js/ionic.bundle.js"></script>
   <link href="style.css" rel="stylesheet">
   <script src="script.js"></script>
   <script src="contacts.js"></script>

diff --git a/js/angular/service/collectionRepeatManager.js b/js/angular/service/collectionRepeatManager.js
@@ -198,10 +198,6 @@ function($rootScope, $timeout) {
 
       this.setCurrentIndex(startIndex);
       this.lastRenderScrollValue = startPos;
-
-      // if (!this.dataSource.scope.$$phase) {
-      //   this.dataSource.scope.$digest();
-      // }
     },
     renderItem: function(dataIndex, primaryPos, secondaryPos) {
       var item = this.dataSource.getItem(dataIndex);
@@ -211,7 +207,9 @@ function($rootScope, $timeout) {
           primaryPos, secondaryPos, secondaryPos
         );
         this.renderedItems[dataIndex] = item;
-        item.scope.$digest();
+        if (!item.scope.$$phase) {
+          item.scope.$digest();
+        }
       } else {
         delete this.renderedItems[dataIndex];
       }