Linting

ampproject · Jan 31, 2017 · dcf0a09 · dcf0a09
1 parent 00fd0ed
commit dcf0a09
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/ads/google/a4a/test/test-performance.js b/ads/google/a4a/test/test-performance.js
@@ -18,7 +18,6 @@ import {
   GoogleAdLifecycleReporter,
   BaseLifecycleReporter,
 } from '../performance';
-import {childElements} from '../../../../src/dom';
 import {createIframePromise} from '../../../../testing/iframe';
 import {viewerForDoc} from '../../../../src/viewer';
 import * as sinon from 'sinon';
@@ -43,7 +42,7 @@ function expectMatchesAll(address, matchList) {
  * @param {!Array<!RegExp>} matchList
  */
 function expectHasSiblingImgMatchingAll(element, matchList) {
-  const imgSiblings = scopedQuerySelectorAll(element.parentElement, 'img');
+  const imgSiblings = element.parentElement.querySelectorAll('img');
   expect(imgSiblings).to.not.be.empty;
   const result = imgSiblings.some(e => {
     const src = e.getAttribute('src');

diff --git a/extensions/amp-ad/0.1/test/test-amp-ad.js b/extensions/amp-ad/0.1/test/test-amp-ad.js
@@ -18,7 +18,6 @@ import {createIframePromise} from '../../../../testing/iframe';
 import {a4aRegistry} from '../../../../ads/_a4a-config';
 import {AmpAd} from '../amp-ad';
 import {AmpAd3PImpl} from '../amp-ad-3p-impl';
-import {childElement} from '../../../../src/dom';
 import {extensionsFor} from '../../../../src/extensions';
 import {stubService} from '../../../../testing/test-helper';
 import * as sinon from 'sinon';

diff --git a/extensions/amp-analytics/0.1/analytics-root.js b/extensions/amp-analytics/0.1/analytics-root.js
@@ -17,7 +17,7 @@
 import {
   closestBySelector,
   matches,
-  scopedQuerySelector
+  scopedQuerySelector,
 } from '../../../src/dom';
 import {dev, user} from '../../../src/log';
 import {map} from '../../../src/utils/object';

diff --git a/extensions/amp-analytics/0.1/visibility-impl.js b/extensions/amp-analytics/0.1/visibility-impl.js
@@ -17,7 +17,7 @@
 import {
   closestByTag,
   closestBySelector,
-  scopedQuerySelector
+  scopedQuerySelector,
 } from '../../../src/dom';
 import {dev, user} from '../../../src/log';
 import {resourcesForDoc} from '../../../src/resources';

diff --git a/src/dom.js b/src/dom.js
@@ -456,9 +456,9 @@ export function scopedQuerySelectorAll(root, selector) {
   // Only IE.
   const unique = `i-amphtml-scoped-${Date.now()}`;
   root.classList.add(unique);
-  const elements = toArray(root./*OK*/querySelectorAll(`.${unique} ${selector}`));
+  const elements = root./*OK*/querySelectorAll(`.${unique} ${selector}`);
   root.classList.remove(unique);
-  return elements;
+  return toArray(elements);
 }
 
 

diff --git a/test/functional/test-dom.js b/test/functional/test-dom.js
@@ -437,9 +437,10 @@ describe('DOM', () => {
         [element1, element2]);
   }
 
-  it('scopedQuerySelectorAll should find first match', testScopedQuerySelectorAll);
+  it('scopedQuerySelectorAll should find all matches',
+      testScopedQuerySelectorAll);
 
-  it('scopedQuerySelectorAll should find first match (polyfill)', () => {
+  it('scopedQuerySelectorAll should find all matches (polyfill)', () => {
     dom.setScopeSelectorSupportedForTesting(false);
     testScopedQuerySelectorAll();
   });