integracion ok

correasebastian · correasebastian · commit 4ee7be15a8fc · 2015-12-21T09:21:51.000-05:00
diff --git a/www/index.html b/www/index.html
@@ -25,7 +25,7 @@
     <script src="js/overview.controller.js"></script>
 </head>
 
-<body ng-app="starter">
+<body ng-app="starter" ng-cloak>
     <ion-pane ng-controller="OverviewController as vm">
         <ion-header-bar class="bar-stable">
             <h1 class="title">🎂  Birthdays  🎉</h1>
diff --git a/www/js/birthday.service.js b/www/js/birthday.service.js
@@ -169,9 +169,11 @@ var db, birthdays, fbA, tm, temp;
 
                     console.log('inserted  to sync', fbKey);
 
-                    $timeout(function  () {
+                   /* $timeout(function() {
                         removeTempbyId(fbKey);
-                    }, 100);
+                    }, 100);*/
+
+                    $timeout(removeTempbyId, 100, true, fbKey);
                     // removeTempbyId(fbKey);
 
                 }
@@ -315,10 +317,6 @@ var db, birthdays, fbA, tm, temp;
         }
 
         function removeTempbyId(fbKey) {
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/master
             _temp.removeWhere({
                 'fbKey': fbKey
             });
