Cleans up missing randomcolor module

Fixed scope apply error https://docs.angularjs.org/error/$rootScope/inprog?p0=$apply
pro-grid · Jun 29, 2014 · 97f9588 · 97f9588
1 parent cf410ff
commit 97f9588
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/index.html b/app/index.html
@@ -85,7 +85,6 @@
     <script src="scripts/app.js"></script>
     <script src="scripts/config.js"></script>
     <script src="scripts/controllers/main.js"></script>
-    <script src="scripts/services/randomcolor.js"></script>
     <script src="scripts/services/injectstyles.js"></script>
     <!-- endbuild -->
 </body>

diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
@@ -1,14 +1,15 @@
 'use strict';
 
 angular.module('proGridApp')
-  .controller('MainCtrl', ['$scope', 'hostname', 'injectStyle', function ($scope, hostname, injectStyle) {
+  .controller('MainCtrl', ['$scope', '$timeout', 'hostname', 'injectStyle', function ($scope, $timeout, hostname, injectStyle) {
     var socket = io.connect(hostname);
     // Socket listener for updating grid
     var userColor = '';
     var apiKey = 1;
     var updateGrid = function(row, col, color) {
-      $scope.gridArray[row][col].color = !!$scope.gridArray[row][col].color ? '' : color;
-      $scope.$apply();
+      $timeout(function () {
+        $scope.gridArray[row][col].color = !!$scope.gridArray[row][col].color ? '' : color;
+      }, 0);
     };
 
     socket.on('server ready', function (data) {
@@ -19,8 +20,9 @@ angular.module('proGridApp')
       console.log(message);
       userColor = data.userColor;
       injectStyle.gridDimensions(data.gridArray.length);
-      $scope.gridArray = angular.copy(data.gridArray);
-      $scope.$apply();
+      $timeout(function () {
+        $scope.gridArray = angular.copy(data.gridArray);
+      }, 0);
     });
 
     socket.on('fresh api key', function (data) {