Bug #30 - $digest overwhelming calls

Author: ruhley

lib/scripts/directive.js

@@ -38,7 +38,7 @@
 
                     $document.on('click', function (evt) {
                         if ($scope.find(evt.target).length === 0) {
-                            $scope.log('Color Picker: Document Hide Event');
+                            $scope.log('Color Picker: Document Click Event');
                             $scope.hide();
                         }
                     });
@@ -74,11 +74,11 @@
                     $scope.lightnessUpdate();
                 };
 
-                $scope.hide = function (apply) {
+                $scope.hide = function () {
                     $scope.log('Color Picker: Hide Event');
-                    $scope.visible = false;
 
-                    if (apply !== false) {
+                    if ($scope.visible) {
+                        $scope.visible = false;
                         $scope.$apply();
                     }
                 };
@@ -339,7 +339,7 @@
                 // HELPER FUNCTIONS
                 //---------------------------
                 $scope.log = function () {
-                    //console.log.apply(console, arguments);
+                    // console.log.apply(console, arguments);
                 };
 
                 // taken and modified from jQuery's find
@@ -363,26 +363,14 @@
                         results = context.querySelectorAll(selector);
 
                     } else {
-                        if ($scope.contains(context, selector)) {
+                        if (context.contains(selector)) {
                             results.push(selector);
                         }
                     }
 
                     return angular.element(results);
                 };
 
-                $scope.contains = function (a, b) {
-                    if (b) {
-                        while ((b = b.parentNode)) {
-                            if (b === a) {
-                                return true;
-                            }
-                        }
-                    }
-
-                    return false;
-                };
-
                 // taken and modified from jQuery's offset
                 $scope.offset = function (el) {
             		var docElem, win, rect, doc, elem = el[0];
@@ -426,6 +414,10 @@
 
 
                 $scope.init();
+
+                $scope.$on('$destroy', function() {
+                    $document.off('click');
+                });
             }
         };
     };