Merge pull request #50 from angular/master

Update upstream

Author: GulajavaMinistudio

src/ng/directive/ngStyle.js

@@ -52,10 +52,10 @@
    </example>
  */
 var ngStyleDirective = ngDirective(function(scope, element, attr) {
-  scope.$watch(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
+  scope.$watchCollection(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
     if (oldStyles && (newStyles !== oldStyles)) {
       forEach(oldStyles, function(val, style) { element.css(style, '');});
     }
     if (newStyles) element.css(newStyles);
-  }, true);
+  });
 });

src/ngResource/resource.js

@@ -830,7 +830,9 @@ angular.module('ngResource', ['ng']).
 
             function cancelRequest(value) {
               promise.catch(noop);
-              timeoutDeferred.resolve(value);
+              if (timeoutDeferred !== null) {
+                timeoutDeferred.resolve(value);
+              }
             }
           };
 

test/ng/directive/ngStyleSpec.js

@@ -23,6 +23,33 @@ describe('ngStyle', function() {
   }));
 
 
+  it('should not deep watch objects', inject(function($rootScope, $compile) {
+    element = $compile('<div ng-style="{height: heightObj}"></div>')($rootScope);
+    $rootScope.$digest();
+    expect(parseInt(element.css('height') + 0, 10)).toEqual(0); // height could be '' or '0px'
+    $rootScope.heightObj = {toString: function() { return '40px'; }};
+    $rootScope.$digest();
+    expect(element.css('height')).toBe('40px');
+
+    element.css('height', '10px');
+    $rootScope.heightObj.otherProp = 123;
+    $rootScope.$digest();
+    expect(element.css('height')).toBe('10px');
+  }));
+
+
+  it('should support binding for object literals', inject(function($rootScope, $compile) {
+    element = $compile('<div ng-style="{height: heightStr}"></div>')($rootScope);
+    $rootScope.$digest();
+    expect(parseInt(element.css('height') + 0, 10)).toEqual(0); // height could be '' or '0px'
+    $rootScope.$apply('heightStr = "40px"');
+    expect(element.css('height')).toBe('40px');
+
+    $rootScope.$apply('heightStr = "100px"');
+    expect(element.css('height')).toBe('100px');
+  }));
+
+
   it('should support lazy one-time binding for object literals', inject(function($rootScope, $compile) {
     element = $compile('<div ng-style="::{height: heightStr}"></div>')($rootScope);
     $rootScope.$digest();

test/ngResource/resourceSpec.js

@@ -2102,6 +2102,25 @@ describe('cancelling requests', function() {
 
     expect(creditCard.$cancelRequest).toBe(noop);
   });
+
+  it('should not break when calling old `$cancelRequest` after the response arrives', function() {
+    $httpBackend.whenGET('/CreditCard').respond({});
+
+    var CreditCard = $resource('/CreditCard', {}, {
+      get: {
+        method: 'GET',
+        cancellable: true
+      }
+    });
+
+    var creditCard = CreditCard.get();
+    var cancelRequest = creditCard.$cancelRequest;
+
+    $httpBackend.flush();
+
+    expect(cancelRequest).not.toBe(noop);
+    expect(cancelRequest).not.toThrow();
+  });
 });
 
 describe('configuring `cancellable` on the provider', function() {