Merge branch 'master' into canary

ampproject · Jan 12, 2016 · be17ec3 · be17ec3
2 parents b8452b0 + 299b587
commit be17ec3
Show file tree

Hide file tree

Showing 9 changed files with 1,826 additions and 1,789 deletions.
diff --git a/build-system/internal-version.js b/build-system/internal-version.js
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+var argv = require('minimist')(process.argv.slice(2));
+var suffix = argv.type == 'canary' ? '-canary' : '';
+
 // Used to e.g. references the ads binary from the runtime to get
 // version lock.
-exports.VERSION = new Date().getTime();
+exports.VERSION = new Date().getTime() + suffix;
diff --git a/build-system/tasks/changelog.js b/build-system/tasks/changelog.js
@@ -31,6 +31,7 @@ var git = require('gulp-git');
 var gulp = require('gulp-help')(require('gulp'));
 var request = BBPromise.promisify(require('request'));
 var util = require('gulp-util');
+var version = require('../internal-version').VERSION;
 
 var GITHUB_ACCESS_TOKEN = process.env.GITHUB_ACCESS_TOKEN;
 var exec = BBPromise.promisify(child_process.exec);
@@ -56,13 +57,6 @@ function changelog() {
 }
 
 function getGitMetadata() {
-  var version = argv.version;
-  var versionErrMsg = 'No version option passed';
-
-  if (!version) {
-    util.log(util.colors.red(versionErrMsg));
-    throw new Error(versionErrMsg);
-  }
 
   var gitMetadata = {};
   return getLastGitTag()
@@ -82,9 +76,7 @@ function getGitMetadata() {
 }
 
 function submitReleaseNotes(version, changelog) {
-  assert(typeof version == 'number', 'version should be a number. ' + version);
-
-  var name = String(version) + suffix;
+  var name = String(version);
   var options = {
     url: 'https://api.github.com/repos/ampproject/amphtml/releases',
     method: 'POST',
@@ -95,7 +87,7 @@ function submitReleaseNotes(version, changelog) {
     json: true,
     body: {
       'tag_name': name,
-      'target_commitish': 'release',
+      'target_commitish': branch,
       'name': name,
       'body': changelog,
       'draft': true,
@@ -260,6 +252,5 @@ gulp.task('changelog', 'Create github release draft', changelog, {
   options: {
     dryrun: '  Generate changelog but dont push it out',
     type: '  Pass in "canary" to generate a canary changelog',
-    version: '  Label to be used for this tag release',
   }
 });
diff --git a/build-system/tasks/presubmit-checks.js b/build-system/tasks/presubmit-checks.js
@@ -76,6 +76,7 @@ var forbiddenTerms = {
     whitelist: [
       'src/amp-core-service.js',
       'src/service/history-impl.js',
+      'src/service/resources-impl.js',
       'src/service/viewer-impl.js',
       'src/service/viewport-impl.js',
       'src/service/vsync-impl.js',
@@ -85,17 +86,26 @@ var forbiddenTerms = {
     message: privateServiceFactory,
     whitelist: [
       'src/amp-core-service.js',
+      'src/service/resources-impl.js',
       'src/service/viewport-impl.js',
     ],
   },
   'installVsyncService': {
     message: privateServiceFactory,
     whitelist: [
       'src/amp-core-service.js',
+      'src/service/resources-impl.js',
       'src/service/viewport-impl.js',
       'src/service/vsync-impl.js',
     ],
   },
+  'installResourcesService': {
+    message: privateServiceFactory,
+    whitelist: [
+      'src/amp-core-service.js',
+      'src/service/resources-impl.js',
+    ],
+  },
   // Privacy sensitive
   'cidFor': {
     message: requiresReviewPrivacy,

diff --git a/extensions/amp-iframe/0.1/test/test-amp-iframe.js b/extensions/amp-iframe/0.1/test/test-amp-iframe.js
@@ -20,6 +20,7 @@ import {adopt} from '../../../../src/runtime';
 import {createIframePromise, pollForLayout, poll}
     from '../../../../testing/iframe';
 import {loadPromise} from '../../../../src/event-helper';
+import {viewportFor} from '../../../../src/viewport';
 import * as sinon from 'sinon';
 
 adopt(window);
@@ -58,6 +59,7 @@ describe('amp-iframe', () => {
       if (opt_height) {
         iframe.iframe.style.height = opt_height;
       }
+      viewportFor(iframe.win).resize_();
       const top = opt_top || '600px';
       i.style.position = 'absolute';
       i.style.top = top;

diff --git a/src/amp-core-service.js b/src/amp-core-service.js
@@ -16,6 +16,7 @@
 
 import {installActionService} from './service/action-impl';
 import {installHistoryService} from './service/history-impl';
+import {installResourcesService} from './service/resources-impl';
 import {installViewerService} from './service/viewer-impl';
 import {installViewportService} from './service/viewport-impl';
 import {installVsyncService} from './service/vsync-impl';
@@ -32,4 +33,5 @@ export function installCoreServices(window) {
   installHistoryService(window);
   installVsyncService(window);
   installActionService(window);
+  installResourcesService(window);
 }