From eeebb8627092fdbf8f1aba232a7e16dccf059c18 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Fri, 15 Feb 2019 19:04:11 +0000 Subject: [PATCH] Avoid deprecated View.$ Replace with View.$el.find. Bug: T216264 Change-Id: I78045c410c168bf458ab8f5537036711fc5b577c --- resources/skins.minerva.scripts/menu/MainMenu.js | 2 +- .../skins.minerva.scripts/page-issues/overlay/IssueNotice.js | 2 +- .../page-issues/overlay/pageIssuesOverlay.js | 2 +- resources/skins.minerva.scripts/pageIssues.js | 4 ++-- resources/skins.minerva.scripts/preInit.js | 2 +- resources/skins.minerva.scripts/references.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/skins.minerva.scripts/menu/MainMenu.js b/resources/skins.minerva.scripts/menu/MainMenu.js index af0954e..446849f 100644 --- a/resources/skins.minerva.scripts/menu/MainMenu.js +++ b/resources/skins.minerva.scripts/menu/MainMenu.js @@ -40,7 +40,7 @@ * @instance */ enableLogging: function () { - this.$( 'a' ).on( 'click', function () { + this.$el.find( 'a' ).on( 'click', function () { var $link = $( this ), eventName = $link.data( 'event-name' ); if ( eventName ) { diff --git a/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js b/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js index a863faa..9b0fca7 100644 --- a/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js +++ b/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js @@ -19,7 +19,7 @@ template: mw.template.get( 'skins.minerva.scripts', 'IssueNotice.hogan' ), postRender: function () { View.prototype.postRender.apply( this, arguments ); - this.$( '.issue-notice' ).prepend( this.options.issue.icon.$el ); + this.$el.find( '.issue-notice' ).prepend( this.options.issue.icon.$el ); } } ); M.define( 'skins.minerva.scripts/IssueNotice', IssueNotice ); diff --git a/resources/skins.minerva.scripts/page-issues/overlay/pageIssuesOverlay.js b/resources/skins.minerva.scripts/page-issues/overlay/pageIssuesOverlay.js index 6bfa06d..cc8da63 100644 --- a/resources/skins.minerva.scripts/page-issues/overlay/pageIssuesOverlay.js +++ b/resources/skins.minerva.scripts/page-issues/overlay/pageIssuesOverlay.js @@ -29,7 +29,7 @@ heading: '' + headingText + '' } ); - overlay.$( '.overlay-content' ).append( + overlay.$el.find( '.overlay-content' ).append( new IssueList( issues ).$el ); return overlay; diff --git a/resources/skins.minerva.scripts/pageIssues.js b/resources/skins.minerva.scripts/pageIssues.js index 02abc3c..224353e 100644 --- a/resources/skins.minerva.scripts/pageIssues.js +++ b/resources/skins.minerva.scripts/pageIssues.js @@ -44,7 +44,7 @@ issueSummaries = []; if ( section === KEYWORD_ALL_SECTIONS ) { - $metadata = page.$( selector ); + $metadata = page.$el.find( selector ); } else { // find heading associated with the section $metadata = page.findChildInSectionLead( parseInt( section, 10 ), selector ); @@ -163,7 +163,7 @@ if ( newTreatmentEnabled ) { // parse other sections but only in group B. In treatment A no issues are shown // for sections. - page.$( Page.HEADING_SELECTOR ).each( function ( i, headingEl ) { + page.$el.find( Page.HEADING_SELECTOR ).each( function ( i, headingEl ) { var $headingEl = $( headingEl ), sectionNum = $headingEl.find( '.edit-page' ).data( 'section' ); diff --git a/resources/skins.minerva.scripts/preInit.js b/resources/skins.minerva.scripts/preInit.js index d4d52e9..f500365 100644 --- a/resources/skins.minerva.scripts/preInit.js +++ b/resources/skins.minerva.scripts/preInit.js @@ -19,7 +19,7 @@ * @private */ function onSkinClick( ev ) { - var $target = this.$( ev.target ); + var $target = $( ev.target ); // Make sure the menu is open and we are not clicking on the menu button if ( diff --git a/resources/skins.minerva.scripts/references.js b/resources/skins.minerva.scripts/references.js index 8ecaa7a..8b5c551 100644 --- a/resources/skins.minerva.scripts/references.js +++ b/resources/skins.minerva.scripts/references.js @@ -94,7 +94,7 @@ * @param {Page} page */ function setup( page ) { - var $refs = page.$( 'sup.reference a' ); + var $refs = page.$el.find( 'sup.reference a' ); if ( $refs.length ) { $refs