Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/307019
Change subject: Use tagWidths for content in Util.getArgInfo ...................................................................... Use tagWidths for content in Util.getArgInfo * Instead of the regexps in Util.extractExtBody * Pulled out of https://gerrit.wikimedia.org/r/#/c/264026/ Change-Id: I4602594e468322c8b6b8653eee33047ef9af9ebc --- M lib/utils/Util.js 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/19/307019/1 diff --git a/lib/utils/Util.js b/lib/utils/Util.js index 92f4257..e70b832 100644 --- a/lib/utils/Util.js +++ b/lib/utils/Util.js @@ -1414,9 +1414,8 @@ // Helper function to process extension source Util.processExtSource = function(manager, extToken, opts) { - var extSrc = extToken.getAttribute('source'); + var argDict = Util.getArgInfo(extToken).dict; var tagWidths = extToken.dataAttribs.tagWidths; - var content = extSrc.substring(tagWidths[0], extSrc.length - tagWidths[1]); // FIXME: Should this be specific to the extension // Or is it okay to do this unconditionally for all? @@ -1427,11 +1426,11 @@ // FIXME: SSS: This stripping maybe be unnecessary after all. // // Strip all leading white-space - var wsMatch = content.match(/^(\s*)([^]*)$/); + var wsMatch = argDict.body.extsrc.match(/^(\s*)([^]*)$/); var leadingWS = wsMatch[1]; // Update content to normalized form - content = wsMatch[2]; + var content = wsMatch[2]; if (!content || content.length === 0) { opts.emptyContentCB(opts.res); @@ -1454,11 +1453,13 @@ var name = extToken.getAttribute('name'); var options = extToken.getAttribute('options'); var src = extToken.getAttribute('source'); + var tagWidths = extToken.dataAttribs.tagWidths; + var content = src.substring(tagWidths[0], src.length - tagWidths[1]); return { dict: { name: name, attrs: Util.KVtoHash(options, true), - body: { extsrc: Util.extractExtBody(name, src) }, + body: { extsrc: content }, }, }; }; -- To view, visit https://gerrit.wikimedia.org/r/307019 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4602594e468322c8b6b8653eee33047ef9af9ebc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
