From 431449f28e5ca796e8f8b6c32c00a0991a12ba23 Mon Sep 17 00:00:00 2001
From: Andy Joslin <andytjoslin@gmail.com>
Date: Tue, 29 Apr 2014 06:20:57 -0600
Subject: [PATCH] collectionRepeat: only digest if available

---
 demos/collection-repeat/index.html            | 4 ++--
 js/angular/service/collectionRepeatManager.js | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/demos/collection-repeat/index.html b/demos/collection-repeat/index.html
index 0d954ee87a..bc5c366762 100644
--- 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
index eeb3a0fad8..fef1090b96 100644
--- 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];
       }