jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 46470) Added support for defaultsort editing
......................................................................
(Bug 46470) Added support for defaultsort editing
Change-Id: I827a37603e95b33f5e913097b9f8c0844d540110
---
M js/lib/mediawiki.WikitextSerializer.js
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/mediawiki.WikitextSerializer.js
b/js/lib/mediawiki.WikitextSerializer.js
index 3458f57..0bd542f 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -1879,17 +1879,19 @@
} else if ( property ) {
var switchType = property.match(
/^mw\:PageProp\/(.*)$/ );
if ( switchType ) {
- switchType = switchType[1];
- if (switchType ===
'categorydefaultsort') {
+ var out = switchType[1];
+ if (out === 'categorydefaultsort') {
if (node.data.parsoid.src) {
- switchType =
node.data.parsoid.src;
+ // Use content so that
VE modifications are preserved
+ out =
node.data.parsoid.src.replace(/^([^:]+:)(.*)$/, "$1" + content + "}}");
} else {
-
console.warn('defaultsort is missing source');
+
console.warn('defaultsort is missing source. Rendering as DEFAULTSORT
magicword');
+ out = "{{DEFAULTSORT:"
+ content + "}}";
}
} else if ( node.data.parsoid.magicSrc
) {
- switchType =
node.data.parsoid.magicSrc;
+ out =
node.data.parsoid.magicSrc;
}
- cb(switchType, node);
+ cb(out, node);
}
} else {
state.serializer._htmlElementHandler(node,
state, cb);
--
To view, visit https://gerrit.wikimedia.org/r/65274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I827a37603e95b33f5e913097b9f8c0844d540110
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
