Skip to content

Commit

Permalink
Remove @nocollapse annotation which was closure-specific. (#37630)
Browse files Browse the repository at this point in the history
* Remove @nocollapse annotation which was closure-specific.

* lint

* remove validator change which may actually still use closure
  • Loading branch information
samouri authored Feb 10, 2022
1 parent 0f8357b commit 058ef73
Show file tree
Hide file tree
Showing 39 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion extensions/amp-accordion/0.1/amp-accordion.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const EXPAND_CURVE_ = bezierCurve(0.47, 0, 0.745, 0.715);
const COLLAPSE_CURVE_ = bezierCurve(0.39, 0.575, 0.565, 1);

class AmpAccordion extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-base-carousel/0.1/amp-base-carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function isSizer(el) {
}

export class AmpCarousel extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-brightcove/1.0/amp-brightcove.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {AmpVideoBaseElement} from '../../amp-video/1.0/video-base-element';
const TAG = 'amp-brightcove';

class AmpBrightcove extends setSuperClass(BaseElement, AmpVideoBaseElement) {
/** @override @nocollapse */
/** @override */
static getPreconnects() {
return ['https://players.brightcove.net'];
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-carousel/0.2/amp-carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const CarouselType = {
};

class AmpCarousel extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-experiment/0.1/amp-experiment.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const TAG = 'amp-experiment';
const ATTR_PREFIX = 'amp-x-';

export class AmpExperiment extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
/*
* Prerender is allowed because the client_id is only used to calculate
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-experiment/1.0/amp-experiment.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {getServicePromiseForDoc} from '../../../src/service-helpers';
const TAG = 'amp-experiment';

export class AmpExperiment extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
/*
* Prerender is allowed because the client_id is only used to calculate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {createLoaderLogo} from '../../amp-facebook/0.1/facebook-loader';
const TYPE = 'facebook';

class AmpFacebookComments extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static createLoaderLogoCallback(element) {
return createLoaderLogo(element);
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-facebook-page/0.1/amp-facebook-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {createLoaderLogo} from '../../amp-facebook/0.1/facebook-loader';
const TYPE = 'facebook';

class AmpFacebookPage extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static createLoaderLogoCallback(element) {
return createLoaderLogo(element);
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-facebook/0.1/amp-facebook.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {getMode} from '../../../src/mode';
const TYPE = 'facebook';

class AmpFacebook extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static createLoaderLogoCallback(element) {
return createLoaderLogo(element);
}
Expand Down
4 changes: 2 additions & 2 deletions extensions/amp-facebook/1.0/amp-facebook.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ const PAGE_TAG = 'amp-facebook-page';
const TYPE = 'facebook';

class AmpFacebookBase extends setSuperClass(BaseElement, AmpPreactBaseElement) {
/** @override @nocollapse */
/** @override */
static createLoaderLogoCallback(element) {
return createLoaderLogo(element);
}

/** @override @nocollapse */
/** @override */
static getPreconnects(element) {
const ampdoc = element.getAmpDoc();
const {win} = ampdoc;
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-fit-text/0.1/amp-fit-text.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const TAG = 'amp-fit-text';
const LINE_HEIGHT_EM_ = 1.15; // WARNING: when updating this ensure you also update the css values for line-height.
const RESIZE_THROTTLE_MS = 100;
export class AmpFitText extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-font/0.1/amp-font.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const DEFAULT_SIZE_ = 'medium';
const CACHED_FONT_LOAD_TIME_ = 100;

export class AmpFont extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-geo/0.1/amp-geo.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const mode = {
export let GeoDef;

export class AmpGeo extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function exponentialFalloff(percentage, power) {
}

export class AmpInlineGalleryPagination extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
* the next arrow works properly for that case.
*/
export class AmpInlineGalleryThumbnails extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-inline-gallery/0.1/amp-inline-gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const CAROUSEL_SELECTOR =
'> amp-base-carousel, :not(amp-inline-gallery-thumbnails) > amp-base-carousel';

class AmpInlineGallery extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-mathml/1.0/amp-mathml.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {getBootstrapBaseUrl, getBootstrapUrl} from '../../../src/3p-frame';
const TAG = 'amp-mathml';

class AmpMathml extends setSuperClass(BaseElement, AmpPreactBaseElement) {
/** @override @nocollapse */
/** @override */
static getPreconnects(element) {
const ampdoc = element.getAmpDoc();
const {win} = ampdoc;
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-mega-menu/0.1/amp-mega-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const ARIA_LABEL_CLOSE = 'Close the menu';
* template rendering via dynamically fetched data.
*/
export class AmpMegaMenu extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-nested-menu/0.1/amp-nested-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const Side = {
const ANIMATION_TIMEOUT = 350;

export class AmpNestedMenu extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-pinterest/0.1/amp-pinterest.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import {CSS} from '../../../build/amp-pinterest-0.1.css';
* - buttonFollow: User follow button
*/
class AmpPinterest extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static createLoaderLogoCallback(element) {
const type = element.getAttribute('data-do');
if (type != 'embedPin') {
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-selector/0.1/amp-selector.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const KEYBOARD_SELECT_MODES = {
};

export class AmpSelector extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-sidebar/0.2/amp-sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const SidebarEvents = {
* @extends {AMP.BaseElement}
*/
export class AmpSidebar extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-social-share/0.1/amp-social-share.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {addParamsToUrl} from '../../../src/url';
const TAG = 'amp-social-share';

class AmpSocialShare extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const buildLogMessageTemplate = (element) => {
};

export class AmpStoryDevToolsTabDebug extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const renderHeaderElement = () => {
* @abstract
*/
export class DraggableDrawer extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-story-player/0.1/amp-story-player.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {cssText} from '../../../build/amp-story-player.css';
import {AmpStoryPlayer} from '../../../src/amp-story-player/amp-story-player-impl';

class AmpStoryPlayerWrapper extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-story/1.0/amp-story-grid-layer.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export let PresetDetails;
* Grid layer template templating system.
*/
export class AmpStoryGridLayer extends AmpStoryBaseLayer {
/** @override @nocollapse */
/** @override */
static prerenderAllowed(element) {
return isPrerenderActivePage(element.parentElement);
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-story/1.0/amp-story-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const NavigationDirection = {
* an <amp-story>.
*/
export class AmpStoryPage extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed(element) {
return isPrerenderActivePage(element);
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-story/1.0/amp-story.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ const DEFAULT_THEME_COLOR = '#202125';
* @implements {./media-pool.MediaPoolRoot}
*/
export class AmpStory extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-stream-gallery/0.1/amp-stream-gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const TAG = 'amp-stream-gallery';
* - Does not support autoplay
*/
class AmpStreamGallery extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static prerenderAllowed() {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-tiktok/0.1/amp-tiktok.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export class AmpTiktok extends AMP.BaseElement {
);
}

/** @override @nocollapse */
/** @override */
static createLoaderLogoCallback(element) {
const html = htmlFor(element);
const placeholder = childElementByAttr(element, 'placeholder');
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-twitter/0.1/amp-twitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {listenFor} from '../../../src/iframe-helper';
const TYPE = 'twitter';

class AmpTwitter extends AMP.BaseElement {
/** @override @nocollapse */
/** @override */
static createLoaderLogoCallback(element) {
const html = htmlFor(element);
return {
Expand Down
4 changes: 2 additions & 2 deletions extensions/amp-twitter/1.0/amp-twitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class AmpTwitter extends setSuperClass(BaseElement, AmpPreactBaseElement) {
super(element);
}

/** @override @nocollapse */
/** @override */
static createLoaderLogoCallback(element) {
const html = htmlFor(element);
return {
Expand All @@ -40,7 +40,7 @@ class AmpTwitter extends setSuperClass(BaseElement, AmpPreactBaseElement) {
};
}

/** @override @nocollapse */
/** @override */
static getPreconnects(element) {
const ampdoc = element.getAmpDoc();
const {win} = ampdoc;
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-video/0.1/amp-video.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export class AmpVideo extends AMP.BaseElement {
* dependent on the value of `prerenderAllowed()`.
*
* @override
* @nocollapse
*
*/
static prerenderAllowed(element) {
// Only allow prerender if video sources are cached on CDN or remote video
Expand Down
16 changes: 8 additions & 8 deletions src/base-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export class BaseElement {
* independently handle each of these states internally.
*
* @return {boolean}
* @nocollapse
*
*/
static R1() {
return false;
Expand All @@ -122,7 +122,7 @@ export class BaseElement {
*
* @param {!AmpElement} unusedElement
* @return {boolean}
* @nocollapse
*
*/
static deferredMount(unusedElement) {
return true;
Expand All @@ -138,7 +138,7 @@ export class BaseElement {
*
* @param {!AmpElement} unusedElement
* @return {boolean}
* @nocollapse
*
*/
static prerenderAllowed(unusedElement) {
return false;
Expand All @@ -152,7 +152,7 @@ export class BaseElement {
*
* @param {!AmpElement} unusedElement
* @return {boolean}
* @nocollapse
*
*/
static usesLoading(unusedElement) {
return false;
Expand All @@ -167,7 +167,7 @@ export class BaseElement {
* content: (!Element|undefined),
* color: (string|undefined),
* }}
* @nocollapse
*
*/
static createLoaderLogoCallback(unusedElement) {
return {};
Expand All @@ -182,7 +182,7 @@ export class BaseElement {
*
* @param {!AmpElement} unusedElement
* @return {number}
* @nocollapse
*
*/
static getBuildPriority(unusedElement) {
return LayoutPriority_Enum.CONTENT;
Expand All @@ -197,7 +197,7 @@ export class BaseElement {
*
* @param {!AmpElement} unusedElement
* @return {?Array<string>}
* @nocollapse
*
*/
static getPreconnects(unusedElement) {
return null;
Expand All @@ -209,7 +209,7 @@ export class BaseElement {
* installed before upgrading and building this class.
*
* @return {boolean}
* @nocollapse
*
*/
static requiresShadowDom() {
return false;
Expand Down
Loading

0 comments on commit 058ef73

Please sign in to comment.