Merge branch 'master' of github.com:angular/angular.js into future

1 files changed, 112 insertions, 70 deletions

diff --git a/test/directivesSpec.js b/test/directivesSpec.js
index 42869a05..8a7da41d 100644
--- a/test/directivesSpec.js
+++ b/test/directivesSpec.js
@@ -17,57 +17,82 @@ describe("directives", function(){
     expect(size(jqCache)).toEqual(0);
   });
 
-  it("should ng-init", function() {
-    var scope = compile('<div ng-init="a=123"></div>');
+  it("should ng:init", function() {
+    var scope = compile('<div ng:init="a=123"></div>');
     expect(scope.a).toEqual(123);
   });
 
-  it("should ng-eval", function() {
-    var scope = compile('<div ng-init="a=0" ng-eval="a = a + 1"></div>');
+  it("should ng:eval", function() {
+    var scope = compile('<div ng:init="a=0" ng:eval="a = a + 1"></div>');
     expect(scope.a).toEqual(1);
     scope.$eval();
     expect(scope.a).toEqual(2);
   });
 
-  it('should ng-bind', function() {
-    var scope = compile('<div ng-bind="a"></div>');
-    expect(element.text()).toEqual('');
-    scope.a = 'misko';
-    scope.$eval();
-    expect(element.text()).toEqual('misko');
-  });
+  describe('ng:bind', function(){
+    it('should set text', function() {
+      var scope = compile('<div ng:bind="a"></div>');
+      expect(element.text()).toEqual('');
+      scope.a = 'misko';
+      scope.$eval();
+      expect(element.text()).toEqual('misko');
+    });
 
-  it('should ng-bind html', function() {
-    var scope = compile('<div ng-bind="html|html"></div>');
-    scope.html = '<div>hello</div>';
-    scope.$eval();
-    expect(lowercase(element.html())).toEqual('<div>hello</div>');
-  });
+    it('should set html', function() {
+      var scope = compile('<div ng:bind="html|html"></div>');
+      scope.html = '<div>hello</div>';
+      scope.$eval();
+      expect(lowercase(element.html())).toEqual('<div>hello</div>');
+    });
+
+    it('should set element element', function() {
+      angularFilter.myElement = function() {
+        return jqLite('<a>hello</a>');
+      };
+      var scope = compile('<div ng:bind="0|myElement"></div>');
+      scope.$eval();
+      expect(lowercase(element.html())).toEqual('<a>hello</a>');
+    });
+
+    it('should have $element set to current bind element', function(){
+      angularFilter.myFilter = function(){
+        this.$element.text('HELLO');
+      };
+      var scope = compile('<div>before<div ng:bind="0|myFilter"></div>after</div>');
+      expect(scope.$element.text()).toEqual("beforeHELLOafter");
+    });
 
-  it('should ng-bind element', function() {
-    angularFilter.myElement = function() {
-      return jqLite('<a>hello</a>');
-    };
-    var scope = compile('<div ng-bind="0|myElement"></div>');
-    scope.$eval();
-    expect(lowercase(element.html())).toEqual('<a>hello</a>');
   });
 
-  it('should ng-bind-template', function() {
-    var scope = compile('<div ng-bind-template="Hello {{name}}!"></div>');
-    scope.$set('name', 'Misko');
-    scope.$eval();
-    expect(element.text()).toEqual('Hello Misko!');
+  describe('ng:bind-template', function(){
+    it('should ng:bind-template', function() {
+      var scope = compile('<div ng:bind-template="Hello {{name}}!"></div>');
+      scope.$set('name', 'Misko');
+      scope.$eval();
+      expect(element.text()).toEqual('Hello Misko!');
+    });
+
+    it('should have $element set to current bind element', function(){
+      var innerText = 'blank';
+      angularFilter.myFilter = function(text){
+        innerText = this.$element.text();
+        return text;
+      };
+      var scope = compile('<div>before<span ng:bind-template="{{\'HELLO\'|myFilter}}">INNER</span>after</div>');
+      expect(scope.$element.text()).toEqual("beforeHELLOafter");
+      expect(innerText).toEqual('INNER');
+    });
+
   });
 
-  it('should ng-bind-attr', function(){
-    var scope = compile('<img ng-bind-attr="{src:\'http://localhost/mysrc\', alt:\'myalt\'}"/>');
+  it('should ng:bind-attr', function(){
+    var scope = compile('<img ng:bind-attr="{src:\'http://localhost/mysrc\', alt:\'myalt\'}"/>');
     expect(element.attr('src')).toEqual('http://localhost/mysrc');
     expect(element.attr('alt')).toEqual('myalt');
   });
 
   it('should remove special attributes on false', function(){
-    var scope = compile('<input ng-bind-attr="{disabled:\'{{disabled}}\', readonly:\'{{readonly}}\', checked:\'{{checked}}\'}"/>');
+    var scope = compile('<input ng:bind-attr="{disabled:\'{{disabled}}\', readonly:\'{{readonly}}\', checked:\'{{checked}}\'}"/>');
     var input = scope.$element[0];
     expect(input.disabled).toEqual(false);
     expect(input.readOnly).toEqual(false);
@@ -83,51 +108,48 @@ describe("directives", function(){
     expect(input.checked).toEqual(true);
   });
 
-  it('should ng-non-bindable', function(){
-    var scope = compile('<div ng-non-bindable><span ng-bind="name"></span></div>');
+  it('should ng:non-bindable', function(){
+    var scope = compile('<div ng:non-bindable><span ng:bind="name"></span></div>');
     scope.$set('name', 'misko');
     scope.$eval();
     expect(element.text()).toEqual('');
   });
 
-  it('should ng-repeat over array', function(){
-    var scope = compile('<ul><li ng-repeat="item in items" ng-init="suffix = \';\'" ng-bind="item + suffix"></li></ul>');
+  it('should ng:repeat over array', function(){
+    var scope = compile('<ul><li ng:repeat="item in items" ng:init="suffix = \';\'" ng:bind="item + suffix"></li></ul>');
 
-    scope.$set('items', ['misko', 'shyam']);
+    Array.prototype.extraProperty = "should be ignored";
+    scope.items = ['misko', 'shyam'];
     scope.$eval();
     expect(element.text()).toEqual('misko;shyam;');
+    delete Array.prototype.extraProperty;
 
-    scope.$set('items', ['adam', 'kai', 'brad']);
+    scope.items = ['adam', 'kai', 'brad'];
     scope.$eval();
     expect(element.text()).toEqual('adam;kai;brad;');
 
-    scope.$set('items', ['brad']);
+    scope.items = ['brad'];
     scope.$eval();
     expect(element.text()).toEqual('brad;');
   });
 
-  it('should ng-repeat over object', function(){
-    var scope = compile('<ul><li ng-repeat="(key, value) in items" ng-bind="key + \':\' + value + \';\' "></li></ul>');
+  it('should ng:repeat over object', function(){
+    var scope = compile('<ul><li ng:repeat="(key, value) in items" ng:bind="key + \':\' + value + \';\' "></li></ul>');
     scope.$set('items', {misko:'swe', shyam:'set'});
     scope.$eval();
     expect(element.text()).toEqual('misko:swe;shyam:set;');
   });
 
-  it('should set ng-repeat to [] if undefinde', function(){
-    var scope = compile('<ul><li ng-repeat="item in items"></li></ul>');
-    expect(scope.items).toEqual([]);
-  });
-
-  it('should error on wrong parsing of ng-repeat', function(){
-    var scope = compile('<ul><li ng-repeat="i dont parse"></li></ul>');
+  it('should error on wrong parsing of ng:repeat', function(){
+    var scope = compile('<ul><li ng:repeat="i dont parse"></li></ul>');
     var log = "";
     log += element.attr('ng-exception') + ';';
     log += element.hasClass('ng-exception') + ';';
-    expect(log).toEqual("\"Expected ng-repeat in form of 'item in collection' but got 'i dont parse'.\";true;");
+    expect(log).toEqual("\"Expected ng:repeat in form of 'item in collection' but got 'i dont parse'.\";true;");
   });
 
-  it('should ng-watch', function(){
-    var scope = compile('<div ng-watch="i: count = count + 1" ng-init="count = 0">');
+  it('should ng:watch', function(){
+    var scope = compile('<div ng:watch="i: count = count + 1" ng:init="count = 0">');
     scope.$eval();
     scope.$eval();
     expect(scope.$get('count')).toEqual(0);
@@ -138,8 +160,8 @@ describe("directives", function(){
     expect(scope.$get('count')).toEqual(1);
   });
 
-  it('should ng-click', function(){
-    var scope = compile('<div ng-click="clicked = true"></div>');
+  it('should ng:click', function(){
+    var scope = compile('<div ng:click="clicked = true"></div>');
     scope.$eval();
     expect(scope.$get('clicked')).toBeFalsy();
 
@@ -147,16 +169,16 @@ describe("directives", function(){
     expect(scope.$get('clicked')).toEqual(true);
   });
 
-  it('should ng-class', function(){
-    var scope = compile('<div class="existing" ng-class="[\'A\', \'B\']"></div>');
+  it('should ng:class', function(){
+    var scope = compile('<div class="existing" ng:class="[\'A\', \'B\']"></div>');
     scope.$eval();
     expect(element.hasClass('existing')).toBeTruthy();
     expect(element.hasClass('A')).toBeTruthy();
     expect(element.hasClass('B')).toBeTruthy();
   });
 
-  it('should ng-class odd/even', function(){
-    var scope = compile('<ul><li ng-repeat="i in [0,1]" class="existing" ng-class-odd="\'odd\'" ng-class-even="\'even\'"></li><ul>');
+  it('should ng:class odd/even', function(){
+    var scope = compile('<ul><li ng:repeat="i in [0,1]" class="existing" ng:class-odd="\'odd\'" ng:class-even="\'even\'"></li><ul>');
     scope.$eval();
     var e1 = jqLite(element[0].childNodes[1]);
     var e2 = jqLite(element[0].childNodes[2]);
@@ -166,14 +188,34 @@ describe("directives", function(){
     expect(e2.hasClass('even')).toBeTruthy();
   });
 
-  it('should ng-style', function(){
-    var scope = compile('<div ng-style="{color:\'red\'}"></div>');
-    scope.$eval();
-    expect(element.css('color')).toEqual('red');
+  describe('ng:style', function(){
+    it('should set', function(){
+      var scope = compile('<div ng:style="{color:\'red\'}"></div>');
+      scope.$eval();
+      expect(element.css('color')).toEqual('red');
+    });
+
+    it('should silently ignore undefined style', function() {
+      var scope = compile('<div ng:style="myStyle"></div>');
+      scope.$eval();
+      expect(element.hasClass('ng-exception')).toBeFalsy();
+    });
+
+    it('should preserve and remove previous style', function(){
+      var scope = compile('<div style="color:red;" ng:style="myStyle"></div>');
+      scope.$eval();
+      expect(getStyle(element)).toEqual({color:'red'});
+      scope.myStyle = {color:'blue', width:'10px'};
+      scope.$eval();
+      expect(getStyle(element)).toEqual({color:'blue', width:'10px'});
+      scope.myStyle = {};
+      scope.$eval();
+      expect(getStyle(element)).toEqual({color:'red'});
+    });
   });
 
-  it('should ng-show', function(){
-    var scope = compile('<div ng-hide="hide"></div>');
+  it('should ng:show', function(){
+    var scope = compile('<div ng:hide="hide"></div>');
     scope.$eval();
     expect(isCssVisible(scope.$element)).toEqual(true);
     scope.$set('hide', true);
@@ -181,8 +223,8 @@ describe("directives", function(){
     expect(isCssVisible(scope.$element)).toEqual(false);
   });
 
-  it('should ng-hide', function(){
-    var scope = compile('<div ng-show="show"></div>');
+  it('should ng:hide', function(){
+    var scope = compile('<div ng:show="show"></div>');
     scope.$eval();
     expect(isCssVisible(scope.$element)).toEqual(false);
     scope.$set('show', true);
@@ -190,7 +232,7 @@ describe("directives", function(){
     expect(isCssVisible(scope.$element)).toEqual(true);
   });
 
-  describe('ng-controller', function(){
+  describe('ng:controller', function(){
     it('should bind', function(){
       window.Greeter = function(){
         this.greeting = 'hello';
@@ -203,18 +245,18 @@ describe("directives", function(){
           return this.greeting + ' ' + name + this.suffix;
         }
       };
-      var scope = compile('<div ng-controller="Greeter"></div>');
+      var scope = compile('<div ng:controller="Greeter"></div>');
       expect(scope.greeting).toEqual('hello');
       expect(scope.greet('misko')).toEqual('hello misko!');
       window.Greeter = undefined;
     });
   });
 
-  it('should eval things according to ng-eval-order', function(){
+  it('should eval things according to ng:eval-order', function(){
     var scope = compile(
-          '<div ng-init="log=\'\'">' +
+          '<div ng:init="log=\'\'">' +
             '{{log = log + \'e\'}}' +
-            '<span ng-eval-order="first" ng-eval="log = log + \'a\'">' +
+            '<span ng:eval-order="first" ng:eval="log = log + \'a\'">' +
               '{{log = log + \'b\'}}' +
               '<span src="{{log = log + \'c\'}}"></span>' +
               '<span bind-template="{{log = log + \'d\'}}"></span>' +