fix(ng:options): ng:change should be called after the new val is set

Closes angular#547 Conflicts: test/widgetsSpec.js
groner · Sep 5, 2011 · bf69aa1 · bf69aa1
1 parent 15e3b2d
commit bf69aa1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/widgets.js b/src/widgets.js
@@ -765,8 +765,8 @@ angularWidget('select', function(element){
           }
         }
         if (isDefined(value) && model.get() !== value) {
-          onChange(scope);
           model.set(value);
+          onChange(scope);
         }
         scope.$tryEval(function(){
           scope.$root.$eval();

diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js
@@ -882,22 +882,28 @@ describe("widget", function(){
         createSelect({
           name:'selected',
           'ng:options':'value for value in values',
-          'ng:change':'count = count + 1'
+          'ng:change':'log = log + selected.name'
         });
         scope.values = [{name:'A'}, {name:'B'}];
         scope.selected = scope.values[0];
-        scope.count = 0;
+        scope.log = '';
         scope.$eval();
-        expect(scope.count).toEqual(0);
+        expect(scope.log).toEqual('');
 
         select.val('1');
         browserTrigger(select, 'change');
-        expect(scope.count).toEqual(1);
+        expect(scope.log).toEqual('B');
         expect(scope.selected).toEqual(scope.values[1]);
 
+        // ignore change event when the model doesn't change
         browserTrigger(select, 'change');
-        expect(scope.count).toEqual(1);
+        expect(scope.log).toEqual('B');
         expect(scope.selected).toEqual(scope.values[1]);
+
+        select.val('0');
+        browserTrigger(select, 'change');
+        expect(scope.log).toEqual('BA');
+        expect(scope.selected).toEqual(scope.values[0]);
       });
 
       it('should update model on change through expression', function(){