ampproject · imobiletmp · Dec 4, 2015 · Feb 29, 2016 · Feb 29, 2016 · Feb 25, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -43,6 +43,7 @@ branches:
     - master
     - release
     - canary
+    - /^amp-release-.*$/
 env:
   global:
     - NPM_CONFIG_PROGRESS="false"
diff --git a/3p/environment.js b/3p/environment.js
@@ -64,6 +64,7 @@ function manageWin_(win) {
   installObserver(win);
   // Existing iframes.
   maybeInstrumentsNodes(win, win.document.querySelectorAll('iframe'));
+  blockSyncPopups(win);
 }
 
 
@@ -237,6 +238,33 @@ function instrumentEntryPoints(win) {
   }
 }
 
+/**
+ * Blackhole the legacy popups since they should never be used for anything.
+ * @param {!Window} win
+ */
+function blockSyncPopups(win) {
+  let count = 0;
+  function maybeThrow() {
+    // Prevent deep recursion.
+    if (count++ > 2) {
+      throw new Error('security error');
+    }
+  }
+  try {
+    win.alert = maybeThrow;
+    win.prompt = function() {
+      maybeThrow();
+      return '';
+    };
+    win.confirm = function() {
+      maybeThrow();
+      return false;
+    };
+  } catch (e) {
+    console./*OK*/error(e.message, e.stack);
+  }
+}
+
 /**
  * Run when we just became visible again. Runs all the queued up rafs.
  * @visibleForTesting

diff --git a/3p/integration.js b/3p/integration.js
@@ -30,6 +30,7 @@ import {adreactor} from '../ads/adreactor';
 import {adsense} from '../ads/adsense';
 import {adtech} from '../ads/adtech';
 import {plista} from '../ads/plista';
+import {criteo} from '../ads/criteo';
 import {doubleclick} from '../ads/doubleclick';
 import {dotandads} from '../ads/dotandads';
 import {endsWith} from '../src/string';
@@ -47,6 +48,10 @@ import {taboola} from '../ads/taboola';
 import {smartadserver} from '../ads/smartadserver';
 import {revcontent} from '../ads/revcontent';
 import {openadstream} from '../ads/openadstream';
+import {triplelift} from '../ads/triplelift';
+import {teads} from '../ads/teads';
+import {rubicon} from '../ads/rubicon';
+import {imobile} from '../ads/imobile';
 
 /**
  * Whether the embed type may be used with amp-embed tag.
@@ -62,6 +67,7 @@ register('adreactor', adreactor);
 register('adsense', adsense);
 register('adtech', adtech);
 register('plista', plista);
+register('criteo', criteo);
 register('doubleclick', doubleclick);
 register('flite', flite);
 register('taboola', taboola);
@@ -76,6 +82,10 @@ register('smartadserver', smartadserver);
 register('mediaimpact', mediaimpact);
 register('revcontent', revcontent);
 register('openadstream', openadstream);
+register('triplelift', triplelift);
+register('teads', teads);
+register('rubicon', rubicon);
+register('imobile', imobile);
 
 // For backward compat, we always allow these types without the iframe
 // opting in.

diff --git a/3p/remote.html b/3p/remote.html
@@ -16,7 +16,7 @@
   <script>
     draw3p(undefined,
       // List of expected amp-ad types.
-      ['allowed-ad-type1', 'allowed-ad-type2']
+      ['allowed-ad-type1', 'allowed-ad-type2'],
       // List of hostnames that are allowed to embed this change.
       // Please also use ALLOW-FROM X-Frame-Options to get security in
       // browsers that do not support location.ancestorOrigins.

diff --git a/3p/twitter.js b/3p/twitter.js
@@ -49,13 +49,17 @@ export function twitter(global, data) {
     delete data.height;
     twttr.widgets.createTweet(data.tweetid, tweet, data)./*OK*/then(() => {
       const iframe = global.document.querySelector('#c iframe');
-      // Unfortunately the tweet isn't really done at this time.
-      // We listen for resize to learn when things are
-      // really done.
-      iframe.contentWindow.addEventListener('resize', function() {
+      // There is no iframe if the tweet was deleted. Thanks for resolving
+      // the promise, though :)
+      if (iframe && iframe.contentWindow) {
+        // Unfortunately the tweet isn't really done at this time.
+        // We listen for resize to learn when things are
+        // really done.
+        iframe.contentWindow.addEventListener('resize', function() {
+          render();
+        }, true);
         render();
-      }, true);
-      render();
+      }
     });
   });
 

diff --git a/DEVELOPING.md b/DEVELOPING.md
@@ -44,8 +44,9 @@ If you have any questions, feel free to ask on the issue or join us on [Slack](h
 
 | Command                       | Description                                                           |
 | ----------------------------- | --------------------------------------------------------------------- |
-| `gulp`                        | Runs "watch" and "serve".                                             |
+| **`gulp`**                    | Runs "watch" and "serve". Use this for standard local dev.            |
 | `gulp dist`                   | Builds production binaries.                                           |
+| `gulp dist --fortesting`      | Indicates the production binaries are used for local testing. Without this ads, tweets and similar use cases are expected to break locally when using minified sources.|
 | `gulp lint`                   | Validates against Google Closure Linter.                              |
 | `gulp lint --watch`           | Watches for changes in files, Validates against Google Closure Linter.|
 | `gulp lint --fix`             | Fixes simple lint warnings/errors automatically.                      |
@@ -61,13 +62,8 @@ If you have any questions, feel free to ask on the issue or join us on [Slack](h
 | `gulp test --saucelabs`       | Runs test on saucelabs (requires [setup](#saucelabs)).                |
 | `gulp test --safari`          | Runs tests in Safari.                                                 |
 | `gulp test --firefox`         | Runs tests in Firefox.                                                |
-| `gulp serve`                  | Serves content in repo root dir over http://localhost:8000/.          |
-|-------------------------------|-----------------------------------------------------------------------|
+| `gulp serve`                  | Serves content in repo root dir over http://localhost:8000/. Examples live in http://localhost:8000/examples.build/          |
 
-To fix issues with Safari test runner launching multiple instances of the test, run:
-<pre>
-  defaults write com.apple.Safari ApplePersistenceIgnoreState YES
-</pre>
 
 #### Saucelabs
 
@@ -86,6 +82,17 @@ If a test flaked on a pull request you can ask for a retry by sending the commen
 
 ### Manual testing
 
+#### Examples
+
+The content in the `examples` directory can be reached at: http://localhost:8000/examples.build/
+
+For each example there are 3 files:
+
+- Original name: This points to prod. This file would not reflect your local changes.
+- `.max.html` points to your local unminified AMP. You want to use this during normal dev.
+- `.min.html` points to a local minified AMP. This is closer to the prod setup. Only available after running `gulp dist`.
+
+
 #### Document proxy
 
 AMP ships with a local proxy for testing production AMP documents with the local JS version.

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,24 @@
+Please walk through the following steps for reporting an issue about AMP:
+
+- Please ask general questions about AMP over on stackoverflow under the AMP HTML tag: http://stackoverflow.com/questions/tagged/amp-html
+- Please ask/post questions/problems related to Google Search in Google's AMP forum: https://goo.gl/utQ1KZ
+
+## Short description of your issue:
+
+Start by deleting everything above this including this sentence :)
+
+## How do we reproduce the issue?
+
+Please post a public URL and ideally post a reduced test case. E.g. on jsbin.com that exhibits only your issue and nothing else.
+
+1. Step 1 to reproduce
+2. Step 2 to reproduce
+3. …
+
+## What browsers are affected?
+
+All browsers? Some specific browser? What device type?
+
+## Which AMP version is affected?
+
+Is this a new issue? Or was it always broken? Paste your AMP version. You can find it in the browser dev tools.
diff --git a/README.md b/README.md
@@ -52,14 +52,16 @@ This allows the AMP library to include:
 
 Get started [creating your first AMP page](https://www.ampproject.org/docs/get_started/create_page.html).
 
+[Full docs and reference.](https://www.ampproject.org/docs/get_started/about-amp.html)
+
 ## The AMP JS library
 
 The AMP JS library provides [builtin](builtins/README.md) AMP Components, manages the loading of external resources, and ensures a reliably fast time-to-paint.
 
 ## The AMP Validator
 
 The AMP Validator allows a web developer to easily identify if the web page
-doesn't meet the [AMP HTML specification](spec/amp-html-format.md).
+doesn't meet the [AMP HTML specification](https://www.ampproject.org/docs/reference/spec.html).
 
 Adding "#development=1" to the URL of the page instructs the AMP Runtime to run
 a series of assertions confirming the page's markup meets the AMP HTML
@@ -81,23 +83,21 @@ or replace functionality of core HTML5 elements to allow the runtime to ensure
 it is solely responsible for loading external assets and to provide for shared
 best practices in implementation.
 
-These components can:
-* Replace HTML5 elements that are not directly permitted in the specification
-  such as [amp-img](builtins/amp-img.md) and [amp-video](builtins/amp-video.md).
-* Implement embedded third-party content, such as
-[amp-ad](builtins/amp-ad.md),
-[amp-pinterest](extensions/amp-pinterest/amp-pinterest.md),
-[amp-twitter](extensions/amp-twitter/amp-twitter.md),
-and [amp-youtube](extensions/amp-youtube/amp-youtube.md).
-* Provide for common patterns in web pages,
-such as [amp-lightbox](extensions/amp-lightbox/amp-lightbox.md)
-and [amp-carousel](extensions/amp-carousel/amp-carousel.md).
-* Make advanced performance techniques easy,
-such as [amp-anim](extensions/amp-anim/amp-anim.md),
-which allows web developers to dynamically serve animated images
-as either image files (GIF) or video files (WebM or MP4) based on browser compatibility.
-
-# AMP Dev Channel
+See our [docs and reference](https://www.ampproject.org/docs/get_started/about-amp.html) for more info.
+
+# Releases
+
+We push a new release of AMP to all AMP pages every week on Thursday. The more detailed schedule is as follows:
+
+- Every Thursday we cut a green release from our `master` branch.
+- This is then pushed to users of AMP who opted into the [AMP Dev Channel](#amp-dev-channel).
+- On Monday we check error rates for opt-in users and bug reports and if everything looks fine, we push this new release to 1% of AMP pages.
+- We then continue to monitor error rates and bug reports throughout the week.
+- On Thursday the "Dev Channel" release from last Thursday is then pushed to all users.
+
+You can always follow the current release state of AMP on our [releases page](https://github.com/ampproject/amphtml/releases). The release used by most users is marked as `Latest release` and the current Dev Channel release is marked as `Pre-release`.
+
+## AMP Dev Channel
 
 AMP Dev Channel is a way to opt a browser into using a newer version of the AMP JS libraries.
 

diff --git a/ads/README.md b/ads/README.md
@@ -113,7 +113,7 @@ var unlisten = window.context.onResizeDenied(function(requestedHeight) {
 });
 ```
 
-Here are some factors that affect how fast the resize will be executed:
+Here are some factors that affect whether the resize will be executed:
 
 - Whether the resize is triggered by the user action;
 - Whether the resize is requested for a currently active ad;

diff --git a/ads/_config.js b/ads/_config.js
@@ -28,11 +28,14 @@ export const adPrefetch = {
   ],
   a9: 'https://c.amazon-adsystem.com/aax2/assoc.js',
   adsense: 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
+  criteo: 'https://static.criteo.net/js/ld/publishertag.js',
   dotandads: 'https://amp.ad.dotandad.com/dotandadsAmp.js',
   mediaimpact: 'https://ec-ns.sascdn.com/diff/251/divscripte/amp.js',
   smartadserver: 'https://ec-ns.sascdn.com/diff/js/smart.js',
   yieldmo: 'https://static.yieldmo.com/ym.amp1.js',
   revcontent: 'https://labs-cdn.revcontent.com/build/amphtml/revcontent.amp.min.js',
+  teads: 'https://cdn.teads.tv/media/format/v3/teads-format.min.js',
+  imobile: 'https://spamp.i-mobile.co.jp/script/amp.js',
 };
 
 /**
@@ -51,6 +54,15 @@ export const adPreconnect = {
     'https://trc.taboola.com',
     'https://images.taboola.com',
   ],
+  teads: [
+    'https://cdn.teads.tv',
+    'https://cdn2.teads.tv',
+    'https://a.teads.tv',
+    'https://t.teads.tv',
+  ],
+  criteo: [
+    'https://cas.criteo.com',
+  ],
   doubleclick: [
     'https://partner.googleadservices.com',
     'https://securepubads.g.doubleclick.net',
@@ -62,11 +74,22 @@ export const adPreconnect = {
     'https://s.yieldmo.com',
     'https://ads.yieldmo.com',
   ],
+  triplelift: [
+    'https://ib.3lift.com',
+    'https://dynamic.3lift.com',
+    'https://img.3lift.com',
+    'https://eb2.3lift.com',
+  ],
   revcontent: [
     'https://trends.revcontent.com',
     'https://cdn.revcontent.com',
     'https://img.revcontent.com',
   ],
+  rubicon: [
+    'https://ads.rubiconproject.com',
+    'https://optimized-by.rubiconproject.com',
+  ],
+  imobile: 'https://spad.i-mobile.co.jp',
 };
 
 /**

diff --git a/ads/adform.js b/ads/adform.js
@@ -18,8 +18,12 @@ import {writeScript, validateSrcPrefix, validateExactlyOne} from '../src/3p';
 
 // Valid adform ad source hosts
 const hosts = {
-  track: 'https://track.adform.net/',
-  adx: 'https://adx.adform.net/',
+  track: 'https://track.adform.net',
+  adx: 'https://adx.adform.net',
+  a2: 'https://a2.adform.net',
+  adx2: 'https://adx2.adform.net',
+  asia: 'https://asia.adform.net',
+  adx3: 'https://adx3.adform.net',
 };
 
 /**
@@ -42,11 +46,11 @@ export function adform(global, data) {
   }
   // Ad tag using "data-bn" attribute
   else if (bn) {
-    url = hosts.track + 'adfscript/?bn=' + encodeURIComponent(bn) + ';msrc=1';
+    url = hosts.track + '/adfscript/?bn=' + encodeURIComponent(bn) + ';msrc=1';
   }
   // Ad placement using "data-mid" attribute
   else if (mid) {
-    url = hosts.adx + 'adx/?mid=' + encodeURIComponent(mid);
+    url = hosts.adx + '/adx/?mid=' + encodeURIComponent(mid);
   }
 
   writeScript(global, url);

diff --git a/ads/adform.md b/ads/adform.md
@@ -57,7 +57,4 @@ information on how to get required ad tag or placement IDs.
 Only one of the mentioned parameters should be used at the same time.
 
 The `src` parameter must use **https** protocol and must be from one of the
-allowed hosts:
-
-- `https://track.adform.net/...`
-- `https://adx.adform.net/...`
+allowed Adform hosts.
diff --git a/ads/criteo.js b/ads/criteo.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2015 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {loadScript} from '../src/3p';
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function criteo(global, data) {
+  loadScript(global, 'https://static.criteo.net/js/ld/publishertag.js', () => {
+    Criteo.DisplayAd({'zoneid': data.zone});
+  });
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ branches: @@
         - master
         - release
         - canary
+        - /^amp-release-.*$/
     env:
       global:
         - NPM_CONFIG_PROGRESS="false"