Merge branch 'inabox-lightbox' of github.com:alanorozco/amphtml into …

…inabox-lightbox

.eslintrc

@@ -69,6 +69,8 @@
     "amphtml-internal/no-export-side-effect": 2,
     "amphtml-internal/no-for-of-statement": 2,
     "amphtml-internal/no-global": 0,
+    "amphtml-internal/no-has-own-property-method": 1,
+    "amphtml-internal/no-mixed-operators": 2,
     "amphtml-internal/no-spread": 2,
     "amphtml-internal/no-style-property-setting": 2,
     "amphtml-internal/no-swallow-return-from-allow-console-error": 2,
@@ -118,7 +120,6 @@
     "no-implied-eval": 2,
     "no-iterator": 2,
     "no-lone-blocks": 2,
-    "no-mixed-operators": 1,
     "no-multi-spaces": 2,
     "no-native-reassign": 2,
     "no-redeclare": 2,

.lgtm.yml

@@ -1,4 +1,11 @@
 path_classifiers:
+  docs:
+    - "**/*.md"
+  test:
+    - "**/test/**/*.js"
+    - "**/testing/**/*.js"
+  third_party:
+    - "third_party/**/*.*"
   externs:
     - "**/*.extern.js"
 extraction:

3p/3p.js

@@ -23,8 +23,8 @@
 
 
 import {dev, user} from '../src/log';
+import {hasOwn, map} from '../src/utils/object';
 import {isArray} from '../src/types';
-import {map} from '../src/utils/object';
 import {rethrowAsync} from '../src/log';
 
 
@@ -280,7 +280,7 @@ function validateAllowedFields(data, allowedFields) {
   };
 
   for (const field in data) {
-    if (!data.hasOwnProperty(field) || field in defaultAvailableFields) {
+    if (!hasOwn(data, field) || field in defaultAvailableFields) {
       continue;
     }
     if (allowedFields.indexOf(field) < 0) {

3p/ampcontext-integration.js

@@ -31,10 +31,10 @@ import {dict} from '../src/utils/object';
  */
 export function masterSelection(win, type) {
   type = type.toLowerCase();
+  const configType = adConfig[type] &&
+      adConfig[type]['masterFrameAccessibleType'];
   // The master has a special name.
-  const masterName = 'frame_' +
-      (adConfig[type] && adConfig[type]['masterFrameAccessibleType'] || type) +
-      '_master';
+  const masterName = 'frame_' + (configType || type) + '_master';
   let master;
   try {
     // Try to get the master from the parent. If it does not

3p/embedly.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import {hasOwn} from '../src/utils/object';
 import {loadScript} from './3p';
 import {setStyle} from '../src/style';
 
@@ -84,7 +85,7 @@ export function embedly(global, data) {
   // when these are provided by component.
   for (const key in CardOptions) {
     if (
-      CardOptions.hasOwnProperty(key) &&
+      hasOwn(CardOptions, key) &&
       typeof data[key] !== 'undefined'
     ) {
       card.setAttribute(`data-${CardOptions[key]}`, data[key]);

3p/integration.js

@@ -169,6 +169,7 @@ import {mediavine} from '../ads/mediavine';
 import {medyanet} from '../ads/medyanet';
 import {meg} from '../ads/meg';
 import {microad} from '../ads/microad';
+import {miximedia} from '../ads/miximedia';
 import {mixpo} from '../ads/mixpo';
 import {monetizer101} from '../ads/monetizer101';
 import {mytarget} from '../ads/mytarget';
@@ -256,6 +257,7 @@ const AMP_EMBED_ALLOWED = {
   epeex: true,
   kuadio: true,
   'mantis-recommend': true,
+  miximedia: true,
   mywidget: true,
   outbrain: true,
   plista: true,
@@ -382,6 +384,7 @@ register('mediavine', mediavine);
 register('medyanet', medyanet);
 register('meg', meg);
 register('microad', microad);
+register('miximedia', miximedia);
 register('mixpo', mixpo);
 register('monetizer101', monetizer101);
 register('mytarget', mytarget);