Merge f7223a8 into ad2a0a9

jeff-collins · Apr 14, 2016 · 6eb5303 · 6eb5303
2 parents ad2a0a9 + f7223a8
commit 6eb5303
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 41 deletions.
diff --git a/bower.json b/bower.json
@@ -25,5 +25,8 @@
     "angular": "~1.2.18",
     "angular-mocks": "~1.2.18",
     "angular-ui-tinymce": "latest"
+  },
+  "resolutions": {
+    "angular": "~1.2.18"
   }
 }
diff --git a/src/mentio.directive.js b/src/mentio.directive.js
@@ -194,54 +194,58 @@ angular.module('mentio', [])
                     }
                 );
 
-                $document.on(
-                    'click', function () {
-                        if ($scope.isActive()) {
-                            $scope.$apply(function () {
-                                $scope.hideAll();
-                            });
-                        }
+                function clickElement() {
+                    if ($scope.isActive()) {
+                        $scope.$apply(function () {
+                            $scope.hideAll();
+                        });
                     }
-                );
-
-                $document.on(
-                    'keydown keypress paste', function (event) {
-                        var activeMenuScope = $scope.getActiveMenuScope();
-                        if (activeMenuScope) {
-                            if (event.which === 9 || event.which === 13) {
-                                event.preventDefault();
-                                activeMenuScope.selectActive();
-                            }
+                }
 
-                            if (event.which === 27) {
-                                event.preventDefault();
-                                activeMenuScope.$apply(function () {
-                                    activeMenuScope.hideMenu();
-                                });
-                            }
+                function keypressElement(event) {
+                    var activeMenuScope = $scope.getActiveMenuScope();
+                    if (activeMenuScope) {
+                        if (event.which === 9 || event.which === 13) {
+                            event.preventDefault();
+                            activeMenuScope.selectActive();
+                        }
 
-                            if (event.which === 40) {
-                                event.preventDefault();
-                                activeMenuScope.$apply(function () {
-                                    activeMenuScope.activateNextItem();
-                                });
-                                activeMenuScope.adjustScroll(1);
-                            }
+                        if (event.which === 27) {
+                            event.preventDefault();
+                            activeMenuScope.$apply(function () {
+                                activeMenuScope.hideMenu();
+                            });
+                        }
 
-                            if (event.which === 38) {
-                                event.preventDefault();
-                                activeMenuScope.$apply(function () {
-                                    activeMenuScope.activatePreviousItem();
-                                });
-                                activeMenuScope.adjustScroll(-1);
-                            }
+                        if (event.which === 40) {
+                            event.preventDefault();
+                            activeMenuScope.$apply(function () {
+                                activeMenuScope.activateNextItem();
+                            });
+                            activeMenuScope.adjustScroll(1);
+                        }
 
-                            if (event.which === 37 || event.which === 39) {
-                                event.preventDefault();
-                             }
+                        if (event.which === 38) {
+                            event.preventDefault();
+                            activeMenuScope.$apply(function () {
+                                activeMenuScope.activatePreviousItem();
+                            });
+                            activeMenuScope.adjustScroll(-1);
                         }
+
+                        if (event.which === 37 || event.which === 39) {
+                            event.preventDefault();
+                         }
                     }
-                );
+                }
+
+                $document.on('click', clickElement);
+                $document.on('keydown keypress paste', keypressElement);
+
+                $scope.$on('$destroy', function() {
+                    $document.off('click', clickElement);
+                    $document.off('keydown keypress paste', keypressElement);
+                });
             },
             link: function (scope, element, attrs) {
                 scope.triggerCharMap = {};