Dan-nl has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165690
Change subject: jquery.json deprecation
......................................................................
jquery.json deprecation
* made adjustments in order to handle the jquery.json deprecation
Change-Id: I481855416710064e1ce1c659ffa1cfe9198285a5
---
M GWToolset.php
M resources/js/ext.gwtoolset.js
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset
refs/changes/90/165690/1
diff --git a/GWToolset.php b/GWToolset.php
index 570a839..f85c748 100644
--- a/GWToolset.php
+++ b/GWToolset.php
@@ -128,7 +128,7 @@
'gwtoolset-step-2-heading'
),
'dependencies' => array(
- 'jquery.json',
+ 'json',
'jquery.spinner',
'jquery.ui.widget',
'jquery.ui.button',
diff --git a/resources/js/ext.gwtoolset.js b/resources/js/ext.gwtoolset.js
index 1adac74..7351e52 100644
--- a/resources/js/ext.gwtoolset.js
+++ b/resources/js/ext.gwtoolset.js
@@ -239,7 +239,7 @@
$.cookie(
options.name,
- ( typeof options.value === 'object' ) ?
$.toJSON( options.value ) : options.value,
+ ( typeof options.value === 'object' ) ?
JSON.stringify( options.value ) : options.value,
options.options
);
},
@@ -478,7 +478,7 @@
}
fieldsOnForm = this.getFieldsOnForm();
- fieldsInCookie = $.secureEvalJSON( $.cookie(
this.cookieName ) );
+ fieldsInCookie = JSON.parse( $.cookie( this.cookieName
) );
if ( !fieldsInCookie ) {
return;
@@ -575,7 +575,7 @@
{
action: 'edit',
summary: summary,
- text: $.toJSON( metadataMappings ),
+ text: JSON.stringify( metadataMappings
),
title: title,
token: wpEditToken
},
--
To view, visit https://gerrit.wikimedia.org/r/165690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I481855416710064e1ce1c659ffa1cfe9198285a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Dan-nl <d_ent...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
