From eb80bf69f30f1132e1438646ed214903aeea77b0 Mon Sep 17 00:00:00 2001
From: Ge Yang <yangge1987@gmail.com>
Date: Sat, 5 Sep 2015 17:38:58 -0500
Subject: [PATCH 1/4] move strict to inside function

---
 src/ui-codemirror.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ui-codemirror.js b/src/ui-codemirror.js
index 480f4f2..7b0ec5b 100644
--- a/src/ui-codemirror.js
+++ b/src/ui-codemirror.js
@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  * Binds a CodeMirror widget to a <textarea> element.
  */
@@ -11,6 +9,7 @@ angular.module('ui.codemirror', [])
  * @ngInject
  */
 function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
+  'use strict';
 
   return {
     restrict: 'EA',

From 5257adc2cf5c4cb8d59f1c2f9a80a4aae6938ff6 Mon Sep 17 00:00:00 2001
From: Ge Yang <yangge1987@gmail.com>
Date: Sat, 5 Sep 2015 18:27:40 -0500
Subject: [PATCH 2/4] collect watch and event handles and remove during scope
 destruction

---
 src/ui-codemirror.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/ui-codemirror.js b/src/ui-codemirror.js
index 7b0ec5b..f96ab77 100644
--- a/src/ui-codemirror.js
+++ b/src/ui-codemirror.js
@@ -11,6 +11,7 @@ angular.module('ui.codemirror', [])
 function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
   'use strict';
 
+  var handles = [];
   return {
     restrict: 'EA',
     require: '?ngModel',
@@ -48,18 +49,25 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
 
     // Allow access to the CodeMirror instance through a broadcasted event
     // eg: $broadcast('CodeMirror', function(cm){...});
-    scope.$on('CodeMirror', function(event, callback) {
+    handles.push(scope.$on('CodeMirror', function(event, callback) {
       if (angular.isFunction(callback)) {
         callback(codemirror);
       } else {
         throw new Error('the CodeMirror event requires a callback function');
       }
-    });
+    }));
 
     // onLoad callback
     if (angular.isFunction(codemirrorOptions.onLoad)) {
       codemirrorOptions.onLoad(codemirror);
     }
+
+    handles.push(scope.$on('$destroy', function(){
+      angular.forEach(handles, function(unbind){
+        unbind();
+      });
+      handles = null;
+    }))
   }
 
   function newCodemirrorEditor(iElement, codemirrorOptions) {
@@ -82,7 +90,7 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
     if (!uiCodemirrorAttr) { return; }
 
     var codemirrorDefaultsKeys = Object.keys(window.CodeMirror.defaults);
-    scope.$watch(uiCodemirrorAttr, updateOptions, true);
+    handles.push(scope.$watch(uiCodemirrorAttr, updateOptions, true));
     function updateOptions(newValues, oldValue) {
       if (!angular.isObject(newValues)) { return; }
       codemirrorDefaultsKeys.forEach(function(key) {
@@ -136,14 +144,14 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
   function configUiRefreshAttribute(codeMirror, uiRefreshAttr, scope) {
     if (!uiRefreshAttr) { return; }
 
-    scope.$watch(uiRefreshAttr, function(newVal, oldVal) {
+    handles.push(scope.$watch(uiRefreshAttr, function(newVal, oldVal) {
       // Skip the initial watch firing
       if (newVal !== oldVal) {
         $timeout(function() {
           codeMirror.refresh();
         });
       }
-    });
+    }));
   }
 
 }

From 665a23419e08831e690db28b2647aeb3068689cb Mon Sep 17 00:00:00 2001
From: Ge Yang <yangge1987@gmail.com>
Date: Sat, 5 Sep 2015 18:32:53 -0500
Subject: [PATCH 3/4] fix styling issue to let travis pass

---
 src/ui-codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui-codemirror.js b/src/ui-codemirror.js
index f96ab77..1ec5050 100644
--- a/src/ui-codemirror.js
+++ b/src/ui-codemirror.js
@@ -67,7 +67,7 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
         unbind();
       });
       handles = null;
-    }))
+    }));
   }
 
   function newCodemirrorEditor(iElement, codemirrorOptions) {

From 8254c4fd5b3eae684b45ac7fd44bd6a4e645f6f1 Mon Sep 17 00:00:00 2001
From: Ge Yang <yangge1987@gmail.com>
Date: Sat, 5 Sep 2015 18:53:30 -0500
Subject: [PATCH 4/4] move handles to scope to prevent modifying the conclosure
 scope.

---
 src/ui-codemirror.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/ui-codemirror.js b/src/ui-codemirror.js
index 1ec5050..2f3fd4e 100644
--- a/src/ui-codemirror.js
+++ b/src/ui-codemirror.js
@@ -11,7 +11,6 @@ angular.module('ui.codemirror', [])
 function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
   'use strict';
 
-  var handles = [];
   return {
     restrict: 'EA',
     require: '?ngModel',
@@ -28,6 +27,8 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
 
   function postLink(scope, iElement, iAttrs, ngModel) {
 
+    scope.handles = [];
+
     var codemirrorOptions = angular.extend(
       { value: iElement.text() },
       uiCodemirrorConfig.codemirror || {},
@@ -49,7 +50,7 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
 
     // Allow access to the CodeMirror instance through a broadcasted event
     // eg: $broadcast('CodeMirror', function(cm){...});
-    handles.push(scope.$on('CodeMirror', function(event, callback) {
+    scope.handles.push(scope.$on('CodeMirror', function(event, callback) {
       if (angular.isFunction(callback)) {
         callback(codemirror);
       } else {
@@ -62,11 +63,11 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
       codemirrorOptions.onLoad(codemirror);
     }
 
-    handles.push(scope.$on('$destroy', function(){
-      angular.forEach(handles, function(unbind){
+    scope.handles.push(scope.$on('$destroy', function(){
+      angular.forEach(scope.handles, function(unbind){
         unbind();
       });
-      handles = null;
+      scope.handles = null;
     }));
   }
 
@@ -90,7 +91,7 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
     if (!uiCodemirrorAttr) { return; }
 
     var codemirrorDefaultsKeys = Object.keys(window.CodeMirror.defaults);
-    handles.push(scope.$watch(uiCodemirrorAttr, updateOptions, true));
+    scope.handles.push(scope.$watch(uiCodemirrorAttr, updateOptions, true));
     function updateOptions(newValues, oldValue) {
       if (!angular.isObject(newValues)) { return; }
       codemirrorDefaultsKeys.forEach(function(key) {
@@ -144,7 +145,7 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
   function configUiRefreshAttribute(codeMirror, uiRefreshAttr, scope) {
     if (!uiRefreshAttr) { return; }
 
-    handles.push(scope.$watch(uiRefreshAttr, function(newVal, oldVal) {
+    scope.handles.push(scope.$watch(uiRefreshAttr, function(newVal, oldVal) {
       // Skip the initial watch firing
       if (newVal !== oldVal) {
         $timeout(function() {