jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Using #/ for MoreInfo overlay per mobile coding conventions ......................................................................
Hygiene: Using #/ for MoreInfo overlay per mobile coding conventions Also updating documentation in OverlayManager Change-Id: Id8d0674f9f64ac9ef858ad66a1a714908a751136 --- M javascripts/common/OverlayManager.js M javascripts/modules/wikigrok/WikiGrokDialog.js 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/javascripts/common/OverlayManager.js b/javascripts/common/OverlayManager.js index 30799e7..64e99d8 100644 --- a/javascripts/common/OverlayManager.js +++ b/javascripts/common/OverlayManager.js @@ -155,10 +155,10 @@ * Add an overlay that should be shown for a specific fragment identifier. * * The following code will display an overlay whenever a user visits a URL that - * end with '#hi/<name>'. The value of <name> will be passed to the overlay. + * end with '#/hi/<name>'. The value of <name> will be passed to the overlay. * * @example - * overlayManager.add( /hi\/(.*)/, function( name ) { + * overlayManager.add( /\/hi\/(.*)/, function( name ) { * var factoryResult = $.Deferred(); * * mw.using( 'mobile.HiOverlay', function() { diff --git a/javascripts/modules/wikigrok/WikiGrokDialog.js b/javascripts/modules/wikigrok/WikiGrokDialog.js index c99c165..cbeb6db 100644 --- a/javascripts/modules/wikigrok/WikiGrokDialog.js +++ b/javascripts/modules/wikigrok/WikiGrokDialog.js @@ -28,7 +28,7 @@ { classes: 'cancel inline mw-ui-button', label: 'No, thanks' }, { classes: 'proceed inline mw-ui-button mw-ui-progressive', label: 'Okay!' } ], - noticeMsg: '<a class="wg-notice-link" href="#moreinfo">Tell me more</a>' + noticeMsg: '<a class="wg-notice-link" href="#/moreinfo">Tell me more</a>' }, template: M.template.get( 'modules/wikigrok/WikiGrokDialog.hogan' ), @@ -87,7 +87,7 @@ { classes: 'not-sure inline mw-ui-button', label: 'Not Sure' }, { classes: 'no inline mw-ui-button mw-ui-progressive', label: 'No' } ]; - options.noticeMsg = 'All submissions are <a class="wg-notice-link" href="#moreinfo">released freely</a>'; + options.noticeMsg = 'All submissions are <a class="wg-notice-link" href="#/moreinfo">released freely</a>'; self.render( options ); } } @@ -135,7 +135,7 @@ { classes: 'quit inline mw-ui-button mw-ui-progressive', label: 'Done' } ]; } - options.noticeMsg = '<a class="wg-notice-link" href="#moreinfo">Tell me more</a>'; + options.noticeMsg = '<a class="wg-notice-link" href="#/moreinfo">Tell me more</a>'; // Re-render with new content for 'Thanks' step this.render( options ); }, @@ -190,9 +190,9 @@ // Proceed with asking the user a metadata question. self.askWikidataQuestion( options ); } ); - // Make OverlayManager handle '#moreinfo' links. We only need to do + // Make OverlayManager handle '#/moreinfo' links. We only need to do // this once. - M.overlayManager.add( /^moreinfo$/, function() { + M.overlayManager.add( /^\/moreinfo$/, function() { // Load the More Info overlay when the link is clicked. return new WikiGrokMoreInfo(); } ); -- To view, visit https://gerrit.wikimedia.org/r/160861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8d0674f9f64ac9ef858ad66a1a714908a751136 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Kaldari <rkald...@wikimedia.org> Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org> Gerrit-Reviewer: JGonera <jgon...@wikimedia.org> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits