Subramanya Sastry has submitted this change and it was merged.
Change subject: Nuke InternalTk
......................................................................
Nuke InternalTk
InternalTk is no longer used for extension handling, so its definition and
related handling code can be removed.
Change-Id: I89c38cd7551e7994438e1526ad64c08d67620311
---
M js/lib/ext.core.ParagraphWrapper.js
M js/lib/ext.core.Sanitizer.js
M js/lib/mediawiki.TokenTransformManager.js
M js/lib/mediawiki.parser.defines.js
4 files changed, 2 insertions(+), 48 deletions(-)
Approvals:
Subramanya Sastry: Verified; Looks good to me, approved
diff --git a/js/lib/ext.core.ParagraphWrapper.js
b/js/lib/ext.core.ParagraphWrapper.js
index 5f50a1a..da1f0fe 100644
--- a/js/lib/ext.core.ParagraphWrapper.js
+++ b/js/lib/ext.core.ParagraphWrapper.js
@@ -279,21 +279,7 @@
names[token.name];
};
- if (tc === defines.InternalTk) {
- // Unwrap the internal token so paragraph-wrapping considers
- // fully expanded content from extensions in the context of
- // current p-wrapping state.
- var buf = [],
- wrappedTks = token.getAttribute("tokens"),
- n = wrappedTks.length;
- for (var j = 0; j < n; j++) {
- var ret = this.onAny(wrappedTks[j], frame);
- if (ret.tokens) {
- buf = buf.concat(ret.tokens);
- }
- }
- return { tokens: buf };
- } else if (tc === TagTk && token.name === 'pre') {
+ if (tc === TagTk && token.name === 'pre') {
if (this.hasOpenHTMLPTag) {
// No pre-tokens inside html-p-tags -- replace it with
a ' '
this.currLine.tokens.push(' ');
diff --git a/js/lib/ext.core.Sanitizer.js b/js/lib/ext.core.Sanitizer.js
index d6ea1a0..3ee01da 100644
--- a/js/lib/ext.core.Sanitizer.js
+++ b/js/lib/ext.core.Sanitizer.js
@@ -662,10 +662,6 @@
* attribute in the DOM).
*/
Sanitizer.prototype.onAny = function ( token ) {
- if (token.constructor === defines.InternalTk) {
- return { token: token };
- }
-
// XXX: validate token type according to whitelist and convert non-ok
ones
// back to text.
diff --git a/js/lib/mediawiki.TokenTransformManager.js
b/js/lib/mediawiki.TokenTransformManager.js
index eeb3439..9f0f0cc 100644
--- a/js/lib/mediawiki.TokenTransformManager.js
+++ b/js/lib/mediawiki.TokenTransformManager.js
@@ -80,8 +80,7 @@
"EOFTk" : "end",
"TagTk" : "tag",
"EndTagTk" : "tag",
- "SelfclosingTagTk" : "tag",
- "InternalTk" : "internal"
+ "SelfclosingTagTk" : "tag"
};
// Inherit from EventEmitter
diff --git a/js/lib/mediawiki.parser.defines.js
b/js/lib/mediawiki.parser.defines.js
index d993319..f9afebe 100644
--- a/js/lib/mediawiki.parser.defines.js
+++ b/js/lib/mediawiki.parser.defines.js
@@ -743,32 +743,6 @@
}
};
-/* -------------------- InternalTk ----------------------
- * An internal token to pass around collections of tokens
- * and letting handlers take action on the entire collection
- * en masse -- for example, not processing them and passing
- * them through unchanged.
- * ------------------------------------------------------ */
-function InternalTk( attribs, dataAttribs ) {
- this.name = "Internal";
- this.attribs = attribs || [];
- this.dataAttribs = dataAttribs || {};
-}
-
-InternalTk.prototype = {};
-
-InternalTk.prototype.constructor = InternalTk;
-
-InternalTk.prototype.toJSON = function () {
- return $.extend( { type: 'InternalTk' }, this );
-};
-
-InternalTk.prototype.defaultToString = function(t) {
- return JSON.stringify(this);
-};
-
-// add in generic token methods
-$.extend( InternalTk.prototype, genericTokenMethods );
/* -------------------- Params -------------------- */
/**
@@ -957,7 +931,6 @@
if (typeof module === "object") {
module.exports = {
TagTk: TagTk,
- InternalTk: InternalTk,
EndTagTk: EndTagTk,
SelfclosingTagTk: SelfclosingTagTk,
NlTk: NlTk,
--
To view, visit https://gerrit.wikimedia.org/r/67285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89c38cd7551e7994438e1526ad64c08d67620311
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
