Merge pull request #81 from angular-ui/fix-digest-in-progress

fix: digest in progress

Author: douglasduteil

src/ui-codemirror.js

@@ -127,8 +127,7 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
     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() {
+        scope.$applyAsync(function() {
           ngModel.$setViewValue(newValue);
         });
       }

test/codemirror.spec.js

@@ -305,6 +305,7 @@ describe('uiCodemirror', function() {
 
       // change should be called when user changes the input.
       codemirror.setValue('baz');
+      scope.$apply();
       expect(scope.change.calls.count()).toBe(1);
       expect(scope.change).toHaveBeenCalledWith();
     });