Merge pull request codemirror#54 from whitehat101/on-change-apply

scope.$apply and $digest already in use
gcziprusz · Apr 29, 2014 · 5cdb98f · 5cdb98f
2 parents 18317b7 + 1d46946
commit 5cdb98f
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/ui-codemirror.js b/src/ui-codemirror.js
@@ -61,16 +61,6 @@ angular.module('ui.codemirror', [])
           if (angular.isDefined(scope.$eval(iAttrs.uiCodemirror))) {
             scope.$watch(iAttrs.uiCodemirror, updateOptions, true);
           }
-          // Specialize change event
-          codeMirror.on('change', function (instance) {
-            var newValue = instance.getValue();
-            if (ngModel && newValue !== ngModel.$viewValue) {
-              ngModel.$setViewValue(newValue);
-            }
-            if (!scope.$$phase) {
-              scope.$apply();
-            }
-          });
 
 
           if (ngModel) {
@@ -95,6 +85,18 @@ angular.module('ui.codemirror', [])
               var safeViewValue = ngModel.$viewValue || '';
               codeMirror.setValue(safeViewValue);
             };
+
+
+            // Keep the ngModel in sync with changes from CodeMirror
+            codeMirror.on('change', function (instance) {
+              var newValue = instance.getValue();
+              if (newValue !== ngModel.$viewValue) {
+                // Changes to the model from a callback need to be wrapped in $apply or angular will not notice them
+                scope.$apply(function() {
+                  ngModel.$setViewValue(newValue);
+                });
+              }
+            });
           }