Merge pull request #59 from angular/master

Update upstream

Author: GulajavaMinistudio

Gruntfile.js

@@ -162,7 +162,8 @@ module.exports = function(grunt) {
 
     clean: {
       build: ['build'],
-      tmp: ['tmp']
+      tmp: ['tmp'],
+      deploy: ['uploadDocs', 'uploadCode']
     },
 
     eslint: {
@@ -326,7 +327,7 @@ module.exports = function(grunt) {
         files: [
           // The source files are needed by the embedded examples in the docs app.
           {
-            src: 'build/angular*.{js,js.map,min.js}',
+            src: ['build/angular*.{js,js.map,min.js}', 'build/sitemap.xml'],
             dest: 'uploadDocs/',
             expand: true,
             flatten: true
@@ -363,10 +364,6 @@ module.exports = function(grunt) {
     },
 
     shell: {
-      // Travis expects the firebase.json in the repository root, but we have it in a sub-folder
-      'symlink-firebase-docs': {
-        command: 'ln -s ./scripts/docs.angularjs.org-firebase/firebase.json ./firebase.json'
-      },
       'install-node-dependencies': {
         command: 'yarn'
       },
@@ -466,7 +463,7 @@ module.exports = function(grunt) {
     'package',
     'compress:deployFirebaseCode',
     'copy:deployFirebaseCode',
-    'shell:symlink-firebase-docs',
+    'firebaseDocsJsonForTravis',
     'copy:deployFirebaseDocs'
   ]);
   grunt.registerTask('default', ['package']);

lib/grunt/plugins.js

@@ -62,4 +62,9 @@ module.exports = function(grunt) {
   grunt.registerTask('collect-errors', 'Combine stripped error files', function() {
     util.collectErrors();
   });
+
+  grunt.registerTask('firebaseDocsJsonForTravis', function() {
+    util.firebaseDocsJsonForTravis();
+  });
+
 };

lib/grunt/utils.js

@@ -292,5 +292,16 @@ module.exports = {
       }
       next();
     };
+  },
+
+  // Our Firebase projects are in subfolders, but Travis expects them in the root,
+  // so we need to modify the upload folder path and copy the file into the root
+  firebaseDocsJsonForTravis: function() {
+    var fileName = 'scripts/docs.angularjs.org-firebase/firebase.json';
+    var json = grunt.file.readJSON(fileName);
+
+    json.hosting.public = 'uploadDocs';
+
+    grunt.file.write('firebase.json', JSON.stringify(json));
   }
 };

scripts/code.angularjs.org-firebase/functions/index.js

@@ -6,8 +6,8 @@ const path = require('path');
 
 const gcsBucketId = `${process.env.GCLOUD_PROJECT}.appspot.com`;
 
-const BROWSER_CACHE_DURATION = 300;
-const CDN_CACHE_DURATION = 600;
+const BROWSER_CACHE_DURATION = 60 * 10;
+const CDN_CACHE_DURATION = 60 * 60 * 12;
 
 function sendStoredFile(request, response) {
   let filePathSegments = request.path.split('/').filter((segment) => {

scripts/docs.angularjs.org-firebase/firebase.json

@@ -23,7 +23,7 @@
         "destination": "/index-production.html"
       },
       {
-        "source": "**/*!(.jpg|.jpeg|.gif|.png|.html|.js|.map|.json|.css|.svg|.ttf|.txt|.woff|.woff2|.eot)",
+        "source": "**/*!(.jpg|.jpeg|.gif|.png|.html|.js|.map|.json|.css|.svg|.ttf|.txt|.woff|.woff2|.eot|.xml)",
         "destination": "/index-production.html"
       }
     ]

src/ng/directive/input.js

@@ -1248,6 +1248,16 @@ function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
       composing = true;
     });
 
+    // Support: IE9+
+    element.on('compositionupdate', function(ev) {
+      // End composition when ev.data is empty string on 'compositionupdate' event.
+      // When the input de-focusses (e.g. by clicking away), IE triggers 'compositionupdate'
+      // instead of 'compositionend'.
+      if (isUndefined(ev.data) || ev.data === '') {
+        composing = false;
+      }
+    });
+
     element.on('compositionend', function() {
       composing = false;
       listener();

src/ngMock/browserTrigger.js

@@ -132,6 +132,24 @@
       evnt.keyCode = eventData.keyCode;
       evnt.charCode = eventData.charCode;
       evnt.which = eventData.which;
+    } else if (/composition/.test(eventType)) {
+      try {
+        evnt = new window.CompositionEvent(eventType, {
+          data: eventData.data
+        });
+      } catch (e) {
+        // Support: IE9+
+        evnt = window.document.createEvent('CompositionEvent', {});
+        evnt.initCompositionEvent(
+          eventType,
+          eventData.bubbles,
+          eventData.cancelable,
+          window,
+          eventData.data,
+          null
+        );
+      }
+
     } else {
       evnt = window.document.createEvent('MouseEvents');
       x = x || 0;

test/ng/directive/inputSpec.js

@@ -134,6 +134,20 @@ describe('input', function() {
       browserTrigger(inputElm, 'compositionend');
       expect($rootScope.name).toEqual('caitp');
     });
+
+
+    it('should end composition on "compositionupdate" when event.data is ""', function() {
+      // This tests a bug workaround for IE9-11
+      // During composition, when an input is de-focussed by clicking away from it,
+      // the compositionupdate event is called with '', followed by a change event.
+      var inputElm = helper.compileInput('<input type="text" ng-model="name" name="alias" />');
+      browserTrigger(inputElm, 'compositionstart');
+      helper.changeInputValueTo('caitp');
+      expect($rootScope.name).toBeUndefined();
+      browserTrigger(inputElm, 'compositionupdate', {data: ''});
+      browserTrigger(inputElm, 'change');
+      expect($rootScope.name).toEqual('caitp');
+    });
   });