jenkins-bot has submitted this change and it was merged.
Change subject: Remove listeners when resetting the parser.
......................................................................
Remove listeners when resetting the parser.
This gets rid of another diff from the html5 library.
Change-Id: I684d23added4bee1ff8b39e5385064e8036d2c4d
---
M js/lib/html5/parser.js
M js/lib/mediawiki.HTML5TreeBuilder.node.js
2 files changed, 8 insertions(+), 9 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/html5/parser.js b/js/lib/html5/parser.js
index 1e5724c..c6a6f1b 100644
--- a/js/lib/html5/parser.js
+++ b/js/lib/html5/parser.js
@@ -2536,12 +2536,12 @@
};
Parser.prototype.setup = function(container, encoding) {
- // this.tokenizer.addListener('token', function(t) {
- // return function(token) { t.do_token(token); };
- // }(this));
- // this.tokenizer.addListener('end', function(t) {
- // return function() { t.emit('end'); };
- // }(this));
+ this.tokenizer.addListener('token', function(t) {
+ return function(token) { t.do_token(token); };
+ }(this));
+ this.tokenizer.addListener('end', function(t) {
+ return function() { t.emit('end'); };
+ }(this));
this.emit('setup', this);
var inner_html = !!container;
diff --git a/js/lib/mediawiki.HTML5TreeBuilder.node.js
b/js/lib/mediawiki.HTML5TreeBuilder.node.js
index 09f430a..53d5045 100644
--- a/js/lib/mediawiki.HTML5TreeBuilder.node.js
+++ b/js/lib/mediawiki.HTML5TreeBuilder.node.js
@@ -34,9 +34,6 @@
// Sets up the parser
this.parser.tokenizer = this;
- this.addListener( 'token', this.parser.do_token.bind( this.parser ) );
- this.addListener( 'end', this.parser.emit.bind( this.parser, 'end') );
- this.parser.setup();
// implicitly start a new document
this.processToken(new TagTk( 'body' ));
@@ -65,6 +62,8 @@
this.tagId = 1;
// Reset the parser
+ this.removeAllListeners( "token" );
+ this.removeAllListeners( "end" );
this.parser.setup();
this.processToken(new TagTk( 'body' ));
--
To view, visit https://gerrit.wikimedia.org/r/81535
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I684d23added4bee1ff8b39e5385064e8036d2c4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
