Merge branch 'rebornix-miss_updating_ngmodel'

Author: douglasduteil

src/ui-ace.js

@@ -218,14 +218,14 @@ angular.module('ui.ace', [])
           onChange: function (callback) {
             return function (e) {
               var newValue = session.getValue();
-              if (newValue !== scope.$eval(attrs.value) && !scope.$$phase && !scope.$root.$$phase) {
-                if (ngModel !== null) {
-                  scope.$apply(function () {
-                    ngModel.$setViewValue(newValue);
-                  });
-                }
-                executeUserCallback(callback, e, acee);
+
+              if (ngModel && newValue !== ngModel.$viewValue) {
+                scope.$applyAsync(function () {
+                  ngModel.$setViewValue(newValue);
+                });
               }
+
+              executeUserCallback(callback, e, acee);
             };
           },
           /**
@@ -249,7 +249,7 @@ angular.module('ui.ace', [])
         });
 
         // Value Blind
-        if (ngModel !== null) {
+        if (ngModel) {
           ngModel.$formatters.push(function (value) {
             if (angular.isUndefined(value) || value === null) {
               return '';

test/ace.spec.js

@@ -216,8 +216,36 @@ describe('uiAce', function () {
 
         var value = 'baz';
         _ace.getSession().setValue(value);
+        scope.$apply();
+
         expect(scope.foo).toBe(value);
       });
+
+      it('should update the IDE only if different', function () {
+        scope.change = jasmine.createSpy('scope.change');
+
+        $compile('<div ui-ace ng-model="foo" ng-change="change(foo)">')(scope);
+
+        // change shouldn't be called initialy
+        expect(scope.change).not.toHaveBeenCalled();
+
+        // change shouldn't be called when the value change is coming from the model.
+        scope.$apply('foo = "bar"');
+        expect(scope.change).not.toHaveBeenCalled();
+
+        _ace.getSession().setValue('baz');
+        scope.$apply();
+
+        // ace removeText event + ace insertText event
+        expect(scope.change.calls.count()).toBe(2);
+        // ace removeText event
+        expect(scope.change).toHaveBeenCalledWith('');
+        // ace insertText event
+        expect(scope.change).toHaveBeenCalledWith('baz');
+
+        //
+        expect(scope.foo).toBe('baz');
+      });
     });
 
     describe('when the model is undefined/null', function () {