Merge branch 'master' of github.com:ampproject/amphtml

.travis.yml

@@ -64,7 +64,7 @@ jobs:
       script:
         - node build-system/pr-check/dist-tests.js
     - stage: test
-      name: "[NON-BLOCKING] Visual Diff Tests"
+      name: "Visual Diff Tests"
       script:
         - node build-system/pr-check/visual-diff-tests.js
     - stage: test
@@ -87,8 +87,6 @@ jobs:
   allow_failures:
     - script:
       - node build-system/pr-check/e2e-tests.js
-    - script:
-      - node build-system/pr-check/visual-diff-tests.js
 cache:
   directories:
     - node_modules

3p/integration.js

@@ -44,6 +44,7 @@ import {
   userAssert,
 } from '../src/log';
 import {installEmbedStateListener, manageWin} from './environment';
+import {internalRuntimeVersion} from '../src/internal-version';
 import {parseJson} from '../src/json';
 import {
   register,
@@ -52,10 +53,7 @@ import {
 } from './3p';
 import {startsWith} from '../src/string.js';
 import {urls} from '../src/config';
-import {version} from '../src/internal-version';
 
-// Disable auto-sorting of imports from here on.
-/* eslint-disable sort-imports-es6-autofix/sort-imports-es6 */
 
 // 3P - please keep in alphabetic order
 import {beopinion} from './beopinion';
@@ -153,6 +151,7 @@ import {gmossp} from '../ads/gmossp';
 import {gumgum} from '../ads/gumgum';
 import {holder} from '../ads/holder';
 import {ibillboard} from '../ads/ibillboard';
+import {idealmedia} from '../ads/idealmedia';
 import {imaVideo} from '../ads/google/imaVideo';
 import {imedia} from '../ads/imedia';
 import {imobile} from '../ads/imobile';
@@ -166,6 +165,7 @@ import {kargo} from '../ads/kargo';
 import {kiosked} from '../ads/kiosked';
 import {kixer} from '../ads/kixer';
 import {kuadio} from '../ads/kuadio';
+import {lentainform} from '../ads/lentainform';
 import {ligatus} from '../ads/ligatus';
 import {lockerdome} from '../ads/lockerdome';
 import {loka} from '../ads/loka';
@@ -176,6 +176,7 @@ import {medianet} from '../ads/medianet';
 import {mediavine} from '../ads/mediavine';
 import {medyanet} from '../ads/medyanet';
 import {meg} from '../ads/meg';
+import {mgid} from '../ads/mgid';
 import {microad} from '../ads/microad';
 import {miximedia} from '../ads/miximedia';
 import {mixpo} from '../ads/mixpo';
@@ -228,6 +229,7 @@ import {smi2} from '../ads/smi2';
 import {sogouad} from '../ads/sogouad';
 import {sortable} from '../ads/sortable';
 import {sovrn} from '../ads/sovrn';
+import {speakol} from '../ads/speakol';
 import {spotx} from '../ads/spotx';
 import {sunmedia} from '../ads/sunmedia';
 import {svknative} from '../ads/svknative';
@@ -265,8 +267,6 @@ import {zedo} from '../ads/zedo';
 import {zen} from '../ads/zen';
 import {zergnet} from '../ads/zergnet';
 import {zucks} from '../ads/zucks';
-import {speakol} from '../ads/speakol';
-
 
 /**
  * Whether the embed type may be used with amp-embed tag.
@@ -393,6 +393,7 @@ register('gmossp', gmossp);
 register('gumgum', gumgum);
 register('holder', holder);
 register('ibillboard', ibillboard);
+register('idealmedia', idealmedia);
 register('ima-video', imaVideo);
 register('imedia', imedia);
 register('imobile', imobile);
@@ -407,6 +408,7 @@ register('kargo', kargo);
 register('kiosked', kiosked);
 register('kixer', kixer);
 register('kuadio', kuadio);
+register('lentainform', lentainform);
 register('ligatus', ligatus);
 register('lockerdome', lockerdome);
 register('loka', loka);
@@ -419,6 +421,7 @@ register('medianet', medianet);
 register('mediavine', mediavine);
 register('medyanet', medyanet);
 register('meg', meg);
+register('mgid', mgid);
 register('microad', microad);
 register('miximedia', miximedia);
 register('mixpo', mixpo);
@@ -769,7 +772,7 @@ export function isTagNameAllowed(type, tagName) {
  */
 function lightweightErrorReport(e, isCanary) {
   new Image().src = urls.errorReporting +
-      '?3p=1&v=' + encodeURIComponent(version()) +
+      '?3p=1&v=' + encodeURIComponent(internalRuntimeVersion()) +
       '&m=' + encodeURIComponent(e.message) +
       '&ca=' + (isCanary ? 1 : 0) +
       '&r=' + encodeURIComponent(document.referrer) +

ads/_config.js

@@ -271,6 +271,13 @@ export const adConfig = {
   },
 
   'aja': {
+    prefetch: [
+      'https://cdn.as.amanad.adtdp.com/sdk/asot-amp.js',
+      'https://cdn.as.amanad.adtdp.com/sdk/asot-v2.js',
+    ],
+    preconnect: [
+      'https://ad.as.amanad.adtdp.com',
+    ],
   },
 
   'appvador': {
@@ -498,6 +505,10 @@ export const adConfig = {
 
   'ibillboard': {},
 
+  'idealmedia': {
+    renderStartImplemented: false,
+  },
+
   'imedia': {
     prefetch: 'https://i.imedia.cz/js/im3.js',
     renderStartImplemented: true,
@@ -555,6 +566,10 @@ export const adConfig = {
 
   'kuadio': {},
 
+  'lentainform': {
+    renderStartImplemented: false,
+  },
+
   'ligatus': {
     prefetch: 'https://ssl.ligatus.com/render/ligrend.js',
     renderStartImplemented: true,
@@ -628,6 +643,10 @@ export const adConfig = {
     renderStartImplemented: true,
   },
 
+  'mgid': {
+    renderStartImplemented: false,
+  },
+
   'microad': {
     prefetch: 'https://j.microad.net/js/camp.js',
     preconnect: [

ads/aja.js

@@ -14,30 +14,24 @@
  * limitations under the License.
  */
 
-import {validateData} from '../3p/3p';
+import {loadScript, validateData} from '../3p/3p';
 
 /**
  * @param {!Window} global
  * @param {!Object} data
  */
 export function aja(global, data) {
 
-  validateData(data, ['sspCode']);
+  validateData(data, ['asi']);
 
-  (global._aja = global._aja || {
-    sspCode: data['sspCode'],
-  });
+  const {document} = global;
+  const asi = data['asi'];
 
-  const elStyle = global.document.createElement('iframe');
-  elStyle.setAttribute('id', 'adframe');
-  elStyle.setAttribute('width', data.width);
-  elStyle.setAttribute('height', data.height);
-  elStyle.setAttribute('frameborder', '0');
-  elStyle.setAttribute('marginheight', '0');
-  elStyle.setAttribute('marginwidth', '0');
-  elStyle.setAttribute('allowfullscreen', 'true');
-  elStyle.setAttribute('scrolling', 'no');
-  elStyle.src = 'https://static.aja-recommend.com/html/amp.html?ssp_code=' + encodeURIComponent(data['sspCode']);
-  global.document.body.appendChild(elStyle);
+  const d = document.createElement('div');
+  d.dataset['ajaAd'] = '';
+  d.dataset['ajaAsi'] = asi;
+  document.getElementById('c').appendChild(d);
+
+  loadScript(global, 'https://cdn.as.amanad.adtdp.com/sdk/asot-amp.js');
 
 }

ads/aja.md

@@ -14,27 +14,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-# Aja
+# AJA
 
-## Example installation of the Aja widget
+The AJA Ads for AMP supports Banner, Native, Video, and Recommendation Widget.
+You have to contact our account manager to create ad spot at first.
+
+## Examples
 
 ### Basic
 
 ```html
-  <amp-ad width="100" height="100"
+  <amp-ad width="300" height="250"
              type="aja"
              layout="responsive"
-             data-ssp-code="ZZZZZ">
+             data-asi="ZZZZZ">
   </amp-ad>
 ```
 
-The above code must be accompanied by AMP-enabled widgets delivered by Aja’s Account Management Team,
-do not directly install this code with existing widgets.
-
-
 ## Configuration
 
-Supported parameters:
+Required parameters:
 
-- SSPCODE
-  - `data-ssp-code`
+- asi
+  - `data-asi`

ads/google/a4a/utils.js

@@ -31,8 +31,8 @@ import {getConsentPolicyState} from '../../../src/consent';
 import {getMode} from '../../../src/mode';
 import {getOrCreateAdCid} from '../../../src/ad-cid';
 import {getTimingDataSync} from '../../../src/service/variable-source';
+import {internalRuntimeVersion} from '../../../src/internal-version';
 import {parseJson} from '../../../src/json';
-import {version} from '../../../src/internal-version';
 import {whenUpgradedToCustomElement} from '../../../src/dom';
 
 /** @type {string}  */
@@ -289,7 +289,7 @@ export function googlePageParameters(a4a, startTime) {
           'is_amp': a4a.isXhrAllowed() ?
             AmpAdImplementation.AMP_AD_XHR_TO_IFRAME_OR_AMP :
             AmpAdImplementation.AMP_AD_IFRAME_GET,
-          'amp_v': version(),
+          'amp_v': internalRuntimeVersion(),
           'd_imp': '1',
           'c': getCorrelator(win, ampDoc, clientId),
           'ga_cid': win.gaGlobal.cid || null,
@@ -721,7 +721,7 @@ export function addCsiSignalsToAmpAnalyticsConfig(
       `&c=${correlator}&slotId=${slotId}&qqid.${slotId}=${qqid}` +
       `&dt=${initTime}` +
       (eids != 'null' ? `&e.${slotId}=${eids}` : '') +
-      `&rls=${version()}&adt.${slotId}=${adType}`;
+      `&rls=${internalRuntimeVersion()}&adt.${slotId}=${adType}`;
   const isAmpSuffix = isVerifiedAmpCreative ? 'Friendly' : 'CrossDomain';
   config['triggers']['continuousVisibleIniLoad'] = {
     'on': 'ini-load',