Netbrain has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65971
Change subject: changed json output ever so slightly
......................................................................
changed json output ever so slightly
Change-Id: I356f854686decdddd02f0237f7c5c822386dd7c1
---
M includes/writer/JSON.php
M lib/spreadsheet-js
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Spreadsheet
refs/changes/71/65971/1
diff --git a/includes/writer/JSON.php b/includes/writer/JSON.php
index 263a4a6..2f56aec 100644
--- a/includes/writer/JSON.php
+++ b/includes/writer/JSON.php
@@ -218,7 +218,7 @@
}
private function getDataValidation ( PHPExcel_Cell_DataValidation
$validation ) {
- return array(
+ $out = array(
'type' => $validation->getType(),
'operator' => $validation->getOperator() === ''
? 'between' : $validation->getOperator(),
'args' => array(
@@ -237,6 +237,12 @@
'showInputMessage' =>
$validation->getShowInputMessage(),
),
);
+
+ if($out['type'] === 'list'){
+ $out['args'][0] = trim($out['args'][0],'"');
+ }
+
+ return $out;
}
}
\ No newline at end of file
diff --git a/lib/spreadsheet-js b/lib/spreadsheet-js
index 28c7897..b27d7f9 160000
--- a/lib/spreadsheet-js
+++ b/lib/spreadsheet-js
-Subproject commit 28c7897851515e97ef572dfa3f4e1e94a95cf493
+Subproject commit b27d7f901c6430b71cb0cbd7849f13371c639654
--
To view, visit https://gerrit.wikimedia.org/r/65971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I356f854686decdddd02f0237f7c5c822386dd7c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Spreadsheet
Gerrit-Branch: master
Gerrit-Owner: Netbrain <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
