jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/334508 )
Change subject: Use saveOption from core module mediawiki.api.options ...................................................................... Use saveOption from core module mediawiki.api.options Change-Id: Ibef342f1ff77c38f594cfeff691e55db8f798d4a --- M repo/resources/Resources.php M repo/resources/wikibase.ui.entityViewInit.js M view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js M view/resources/jquery/wikibase/resources.php 4 files changed, 8 insertions(+), 15 deletions(-) Approvals: Jonas Kress (WMDE): Looks good to me, approved Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, but someone else must approve diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index f6a73a9..6a7b938 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -72,6 +72,7 @@ 'wikibase.ui.entityViewInit.js', ), 'dependencies' => array( + 'mediawiki.api.options', 'mediawiki.page.watch.ajax', 'mediawiki.user', 'mw.config.values.wbEntityTypes', diff --git a/repo/resources/wikibase.ui.entityViewInit.js b/repo/resources/wikibase.ui.entityViewInit.js index 14de579..cb6de46 100644 --- a/repo/resources/wikibase.ui.entityViewInit.js +++ b/repo/resources/wikibase.ui.entityViewInit.js @@ -246,11 +246,7 @@ $.cookie( cookieKey, copyRightVersion, { expires: 365 * 3, path: '/' } ); } else { var api = new mw.Api(); - api.postWithToken( 'csrf', { - action: 'options', - optionname: optionsKey, - optionvalue: copyRightVersion - } ); + api.saveOption( optionsKey, copyRightVersion ); } } ); return; @@ -284,11 +280,7 @@ $.cookie( cookieKey, copyRightVersion, { expires: 365 * 3, path: '/' } ); } else { var api = new mw.Api(); - api.postWithToken( 'csrf', { - action: 'options', - optionname: optionsKey, - optionvalue: copyRightVersion - } ); + api.saveOption( optionsKey, copyRightVersion ); } } ); diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js index 9a1e700..1830270 100644 --- a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js +++ b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js @@ -226,11 +226,10 @@ { expires: 365, path: '/' } ); } else { - api.postWithToken( 'csrf', { - action: 'options', - optionname: 'wikibase-entitytermsview-showEntitytermslistview', - optionvalue: params.visible ? '1' : '0' - } ) + api.saveOption( + 'wikibase-entitytermsview-showEntitytermslistview', + params.visible ? '1' : '0' + ) .done( function() { mw.user.options.set( 'wikibase-entitytermsview-showEntitytermslistview', diff --git a/view/resources/jquery/wikibase/resources.php b/view/resources/jquery/wikibase/resources.php index 3bda4f2..f633381 100644 --- a/view/resources/jquery/wikibase/resources.php +++ b/view/resources/jquery/wikibase/resources.php @@ -173,6 +173,7 @@ 'jquery.ui.toggler', 'jquery.wikibase.entitytermsforlanguagelistview', 'mediawiki.api', + 'mediawiki.api.options', 'mediawiki.user', ), 'messages' => array( -- To view, visit https://gerrit.wikimedia.org/r/334508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibef342f1ff77c38f594cfeff691e55db8f798d4a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Fomafix <foma...@googlemail.com> Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <aleksey.bekh-iva...@wikimedia.de> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits