[MediaWiki-commits] [Gerrit] Simplify by using mw.util.getUrl() - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Simplify by using mw.util.getUrl() .. Simplify by using mw.util.getUrl() Change-Id: I88d7e5f1dcda5506624d09d15db136d78b742e23 --- M Resources.php M resources/js/ext.translate.editor.helpers.js M resources/js/ext.translate.editor.js M resources/js/ext.translate.messagetable.js M resources/js/ext.translate.pagetranslation.uls.js M resources/js/ext.translate.quickedit.js 6 files changed, 22 insertions(+), 36 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 301b85c..cde5140 100644 --- a/Resources.php +++ b/Resources.php @@ -236,7 +236,6 @@ 'scripts' => 'resources/js/ext.translate.pagetranslation.uls.js', 'dependencies' => array( 'ext.uls.mediawiki', - 'mediawiki.Uri', 'mediawiki.util', ), ) + $resourcePaths; diff --git a/resources/js/ext.translate.editor.helpers.js b/resources/js/ext.translate.editor.helpers.js index 55f5672..28762ac 100644 --- a/resources/js/ext.translate.editor.helpers.js +++ b/resources/js/ext.translate.editor.helpers.js @@ -534,15 +534,10 @@ * @return {string} URL for editing the documentation */ getDocumentationEditURL: function ( title ) { - var descUri = new mw.Uri( window.location.href ); - - descUri.path = mw.config.get( 'wgScript' ); - descUri.query = { - action: 'edit', - title: title + '/' + mw.config.get( 'wgTranslateDocumentationLanguageCode' ) - }; - - return descUri.toString(); + return mw.util.getUrl( + title + '/' + mw.config.get( 'wgTranslateDocumentationLanguageCode' ), + { action: 'edit' } + ); } } ); diff --git a/resources/js/ext.translate.editor.js b/resources/js/ext.translate.editor.js index 139365d..47038ec 100644 --- a/resources/js/ext.translate.editor.js +++ b/resources/js/ext.translate.editor.js @@ -823,18 +823,17 @@ */ validateTranslation: function () { var translateEditor = this, - url = new mw.Uri( mw.config.get( 'wgScript' ) ), + url, $textarea = translateEditor.$editor.find( '.tux-textarea-translation' ); // TODO: We need a better API for this - url.extend( { - title: 'Special:Translate/editpage', + url = mw.util.getUrl( 'Special:Translate/editpage', { suggestions: 'checks', page: translateEditor.message.title, loadgroup: translateEditor.message.group } ); - $.post( url.toString(), { + $.post( url, { translation: $textarea.val() }, function ( data ) { var warningIndex, diff --git a/resources/js/ext.translate.messagetable.js b/resources/js/ext.translate.messagetable.js index 4d4dac3..ff8405d 100644 --- a/resources/js/ext.translate.messagetable.js +++ b/resources/js/ext.translate.messagetable.js @@ -259,8 +259,7 @@ $( '' ) .attr( { title: mw.msg( 'translate-edit-title', message.key ), - href: ( new mw.Uri( mw.util.getUrl( message.title ) ) ) - .extend( { action: 'edit' } ) + href: mw.util.getUrl( message.title, { action: 'edit' } ) } ) .text( mw.msg( 'tux-edit' ) ) ) @@ -378,8 +377,7 @@ .find( '.advanced-search' ) .text( mw.msg( 'tux-message-filter-result', resultCount, query ) ); $result.find( 'button' ).on( 'click', function () { - window.location.href = new mw.Uri( mw.util.getUrl( 'Special:SearchTranslations' ) ) - .extend( { query: query
[MediaWiki-commits] [Gerrit] Simplify by using mw.util.getUrl() - change (mediawiki...Translate)
Gerrit Patch Uploader has uploaded a new change for review. https://gerrit.wikimedia.org/r/283245 Change subject: Simplify by using mw.util.getUrl() .. Simplify by using mw.util.getUrl() Change-Id: I88d7e5f1dcda5506624d09d15db136d78b742e23 --- M Resources.php M resources/js/ext.translate.editor.helpers.js M resources/js/ext.translate.editor.js M resources/js/ext.translate.messagetable.js M resources/js/ext.translate.pagetranslation.uls.js M resources/js/ext.translate.quickedit.js 6 files changed, 18 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/45/283245/1 diff --git a/Resources.php b/Resources.php index 301b85c..cde5140 100644 --- a/Resources.php +++ b/Resources.php @@ -236,7 +236,6 @@ 'scripts' => 'resources/js/ext.translate.pagetranslation.uls.js', 'dependencies' => array( 'ext.uls.mediawiki', - 'mediawiki.Uri', 'mediawiki.util', ), ) + $resourcePaths; diff --git a/resources/js/ext.translate.editor.helpers.js b/resources/js/ext.translate.editor.helpers.js index 55f5672..28762ac 100644 --- a/resources/js/ext.translate.editor.helpers.js +++ b/resources/js/ext.translate.editor.helpers.js @@ -534,15 +534,10 @@ * @return {string} URL for editing the documentation */ getDocumentationEditURL: function ( title ) { - var descUri = new mw.Uri( window.location.href ); - - descUri.path = mw.config.get( 'wgScript' ); - descUri.query = { - action: 'edit', - title: title + '/' + mw.config.get( 'wgTranslateDocumentationLanguageCode' ) - }; - - return descUri.toString(); + return mw.util.getUrl( + title + '/' + mw.config.get( 'wgTranslateDocumentationLanguageCode' ), + { action: 'edit' } + ); } } ); diff --git a/resources/js/ext.translate.editor.js b/resources/js/ext.translate.editor.js index 139365d..47038ec 100644 --- a/resources/js/ext.translate.editor.js +++ b/resources/js/ext.translate.editor.js @@ -823,18 +823,17 @@ */ validateTranslation: function () { var translateEditor = this, - url = new mw.Uri( mw.config.get( 'wgScript' ) ), + url, $textarea = translateEditor.$editor.find( '.tux-textarea-translation' ); // TODO: We need a better API for this - url.extend( { - title: 'Special:Translate/editpage', + url = mw.util.getUrl( 'Special:Translate/editpage', { suggestions: 'checks', page: translateEditor.message.title, loadgroup: translateEditor.message.group } ); - $.post( url.toString(), { + $.post( url, { translation: $textarea.val() }, function ( data ) { var warningIndex, diff --git a/resources/js/ext.translate.messagetable.js b/resources/js/ext.translate.messagetable.js index 4d4dac3..0623d65 100644 --- a/resources/js/ext.translate.messagetable.js +++ b/resources/js/ext.translate.messagetable.js @@ -259,8 +259,7 @@ $( '' ) .attr( { title: mw.msg( 'translate-edit-title', message.key ), - href: ( new mw.Uri( mw.util.getUrl( message.title ) ) ) - .extend( { action: 'edit' } ) + href: mw.util.getUrl( message.title, { action: 'edit' } ) } ) .text( mw.msg( 'tux-edit' ) ) ) @@ -378,8 +377,7 @@ .find( '.advanced-search' ) .text( mw.msg( 'tux-message-filter-result', resultCount, query ) ); $result.find( 'button' ).on( 'click', function () { - window.location.href = new mw.Uri( mw.util.getUrl( 'Special:SearchTranslations' ) ) -