Merge pull request #120 from angular/master

Views should be disposed when not visible

Author: GulajavaMinistudio

docs/config/templates/ngdoc/lib/methods.template.html

@@ -17,7 +17,7 @@ <h4>Parameters</h4>
     {% endif %}
 
     {% if method.this %}
-    <h4>Method's {% code %}this{% endcode %}</h4>
+    <h4>Method's `this`</h4>
     {$ method.this | marked $}
     {% endif %}
 

docs/config/templates/ngdoc/lib/this.template.html

@@ -1,4 +1,4 @@
 {% if doc.this %}
-<h3>Method's {% code %}this{% endcode %}</h3>
+<h3>Method's `this`</h3>
 {$ doc.this | marked $}
-{% endif %}
+{% endif %}

i18n/ucd/src/extract.js

@@ -20,7 +20,7 @@ function main() {
     } catch (e) {
       fs.mkdirSync(__dirname + '/../../../src/ngParseExt');
     }
-    fs.writeFile(__dirname + '/../../../src/ngParseExt/ucd.js', code);
+    fs.writeFileSync(__dirname + '/../../../src/ngParseExt/ucd.js', code);
   }
 }
 

package.json

@@ -99,6 +99,11 @@
     "stringmap": "^0.2.2"
   },
   "dependencies": {},
+  "resolutions": {
+    "//1": "`[email protected]` does not work with Node.js 10.x on Windows 10",
+    "//2": "(E.g. see https://github.com/gulpjs/gulp/issues/2162.)",
+    "natives": "1.1.3"
+  },
   "commitplease": {
     "style": "angular",
     "nohook": true

test/ng/compileSpec.js

@@ -11703,37 +11703,37 @@ describe('$compile', function() {
       // All interpolations are disallowed.
       $rootScope.onClickJs = '';
       expect(function() {
-          $compile('<button onclick="{{onClickJs}}"></script>');
+          $compile('<button onclick="{{onClickJs}}"></button>');
         }).toThrowMinErr(
           '$compile', 'nodomevents', 'Interpolations for HTML DOM event attributes are disallowed');
       expect(function() {
-          $compile('<button ONCLICK="{{onClickJs}}"></script>');
+          $compile('<button ONCLICK="{{onClickJs}}"></button>');
         }).toThrowMinErr(
           '$compile', 'nodomevents', 'Interpolations for HTML DOM event attributes are disallowed');
       expect(function() {
-          $compile('<button ng-attr-onclick="{{onClickJs}}"></script>');
+          $compile('<button ng-attr-onclick="{{onClickJs}}"></button>');
         }).toThrowMinErr(
           '$compile', 'nodomevents', 'Interpolations for HTML DOM event attributes are disallowed');
       expect(function() {
-          $compile('<button ng-attr-ONCLICK="{{onClickJs}}"></script>');
+          $compile('<button ng-attr-ONCLICK="{{onClickJs}}"></button>');
         }).toThrowMinErr(
           '$compile', 'nodomevents', 'Interpolations for HTML DOM event attributes are disallowed');
     }));
 
     it('should pass through arbitrary values on onXYZ event attributes that contain a hyphen', inject(function($compile, $rootScope) {
-      element = $compile('<button on-click="{{onClickJs}}"></script>')($rootScope);
+      element = $compile('<button on-click="{{onClickJs}}"></button>')($rootScope);
       $rootScope.onClickJs = 'javascript:doSomething()';
       $rootScope.$apply();
       expect(element.attr('on-click')).toEqual('javascript:doSomething()');
     }));
 
     it('should pass through arbitrary values on "on" and "data-on" attributes', inject(function($compile, $rootScope) {
-      element = $compile('<button data-on="{{dataOnVar}}"></script>')($rootScope);
+      element = $compile('<button data-on="{{dataOnVar}}"></button>')($rootScope);
       $rootScope.dataOnVar = 'data-on text';
       $rootScope.$apply();
       expect(element.attr('data-on')).toEqual('data-on text');
 
-      element = $compile('<button on="{{onVar}}"></script>')($rootScope);
+      element = $compile('<button on="{{onVar}}"></button>')($rootScope);
       $rootScope.onVar = 'on text';
       $rootScope.$apply();
       expect(element.attr('on')).toEqual('on text');

test/ng/ngOnSpec.js

@@ -155,4 +155,34 @@ describe('ngOn* event binding', function() {
       expect(attrs.$attr.ngOnTitle).toBe('ng-on-title');
     });
   });
+
+  it('should correctly bind to kebab-cased event names', inject(function($compile, $rootScope) {
+    var element = $compile('<span ng-on-foo-bar="cb()"></span>')($rootScope);
+    var cb = $rootScope.cb = jasmine.createSpy('ng-on cb');
+    $rootScope.$digest();
+
+    element.triggerHandler('foobar');
+    element.triggerHandler('fooBar');
+    element.triggerHandler('foo_bar');
+    element.triggerHandler('foo:bar');
+    expect(cb).not.toHaveBeenCalled();
+
+    element.triggerHandler('foo-bar');
+    expect(cb).toHaveBeenCalled();
+  }));
+
+  it('should correctly bind to camelCased event names', inject(function($compile, $rootScope) {
+    var element = $compile('<span ng-on-foo_bar="cb()"></span>')($rootScope);
+    var cb = $rootScope.cb = jasmine.createSpy('ng-on cb');
+    $rootScope.$digest();
+
+    element.triggerHandler('foobar');
+    element.triggerHandler('foo-bar');
+    element.triggerHandler('foo_bar');
+    element.triggerHandler('foo:bar');
+    expect(cb).not.toHaveBeenCalled();
+
+    element.triggerHandler('fooBar');
+    expect(cb).toHaveBeenCalled();
+  }));
 });

test/ng/ngPropSpec.js

@@ -147,11 +147,11 @@ describe('ngProp*', function() {
   it('should disallow property binding to onclick', inject(function($compile, $rootScope) {
     // All event prop bindings are disallowed.
     expect(function() {
-        $compile('<button ng-prop-onclick="onClickJs"></script>');
+        $compile('<button ng-prop-onclick="onClickJs"></button>');
       }).toThrowMinErr(
         '$compile', 'nodomevents', 'Property bindings for HTML DOM event properties are disallowed');
     expect(function() {
-        $compile('<button ng-prop-ONCLICK="onClickJs"></script>');
+        $compile('<button ng-prop-ONCLICK="onClickJs"></button>');
       }).toThrowMinErr(
         '$compile', 'nodomevents', 'Property bindings for HTML DOM event properties are disallowed');
   }));

yarn.lock

@@ -5750,10 +5750,10 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-natives@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
-  integrity sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=
+natives@1.1.3, natives@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.3.tgz#44a579be64507ea2d6ed1ca04a9415915cf75558"
+  integrity sha512-BZGSYV4YOLxzoTK73l0/s/0sH9l8SHs2ocReMH1f8JYSh5FUWu4ZrKCpJdRkWXV6HFR/pZDz7bwWOVAY07q77g==
 
 natural-compare@^1.4.0:
   version "1.4.0"