[MediaWiki-commits] [Gerrit] Get rid of FauxHTML5 namespace - change (mediawiki...parsoid)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/153267

Change subject: Get rid of FauxHTML5 namespace
......................................................................

Get rid of FauxHTML5 namespace

Change-Id: I50829a9297ccbf383c7a6d4007ad1def7e24d816
---
M lib/mediawiki.HTML5TreeBuilder.node.js
M lib/mediawiki.parser.js
2 files changed, 12 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/67/153267/1

diff --git a/lib/mediawiki.HTML5TreeBuilder.node.js 
b/lib/mediawiki.HTML5TreeBuilder.node.js
index 6fdb640..02e5d67 100644
--- a/lib/mediawiki.HTML5TreeBuilder.node.js
+++ b/lib/mediawiki.HTML5TreeBuilder.node.js
@@ -20,25 +20,22 @@
     SelfclosingTagTk = defines.SelfclosingTagTk,
     EndTagTk = defines.EndTagTk;
 
-var FauxHTML5 = {};
-
-FauxHTML5.TreeBuilder = function ( env ) {
+function TreeBuilder( env ) {
        events.EventEmitter.call(this);
-
        this.env = env;
 
        // Reset variable state and set up the parser
        this.resetState();
-};
+}
 
 // Inherit from EventEmitter
-util.inherits(FauxHTML5.TreeBuilder, events.EventEmitter);
+util.inherits(TreeBuilder, events.EventEmitter);
 
 /**
  * Register for (token) 'chunk' and 'end' events from a token emitter,
  * normally the TokenTransformDispatcher.
  */
-FauxHTML5.TreeBuilder.prototype.addListenersOn = function ( emitter ) {
+TreeBuilder.prototype.addListenersOn = function ( emitter ) {
        emitter.addListener('chunk', this.onChunk.bind( this ) );
        emitter.addListener('end', this.onEnd.bind( this ) );
 };
@@ -46,11 +43,11 @@
 /**
  * Debugging aid: set pipeline id
  */
-FauxHTML5.TreeBuilder.prototype.setPipelineId = function(id) {
+TreeBuilder.prototype.setPipelineId = function(id) {
        this.pipelineId = id;
 };
 
-FauxHTML5.TreeBuilder.prototype.resetState = function() {
+TreeBuilder.prototype.resetState = function() {
        // Reset vars
        this.tagId = 1;  // Assigned to start/self-closing tags
        this.inTransclusion = false;
@@ -70,14 +67,14 @@
        this.processToken( new TagTk('body') );
 };
 
-FauxHTML5.TreeBuilder.prototype.onChunk = function( tokens ) {
+TreeBuilder.prototype.onChunk = function( tokens ) {
        var n = tokens.length;
        for (var i = 0; i < n; i++) {
                this.processToken(tokens[i]);
        }
 };
 
-FauxHTML5.TreeBuilder.prototype.onEnd = function() {
+TreeBuilder.prototype.onEnd = function() {
        // Check if the EOFTk actually made it all the way through, and flag the
        // page where it did not!
        if ( this.lastToken && this.lastToken.constructor !== EOFTk ) {
@@ -88,7 +85,7 @@
        this.resetState();
 };
 
-FauxHTML5.TreeBuilder.prototype._att = function (maybeAttribs) {
+TreeBuilder.prototype._att = function (maybeAttribs) {
        return maybeAttribs.map(function ( attr ) {
                return { nodeName: attr.k, nodeValue: attr.v };
        });
@@ -96,7 +93,7 @@
 
 // Adapt the token format to internal HTML tree builder format, call the actual
 // html tree builder by emitting the token.
-FauxHTML5.TreeBuilder.prototype.processToken = function(token) {
+TreeBuilder.prototype.processToken = function(token) {
        //console.warn( 'processToken: ' + JSON.stringify( token ));
 
        var attribs = token.attribs || [],
@@ -286,5 +283,5 @@
 
 
 if (typeof module === "object") {
-       module.exports.FauxHTML5 = FauxHTML5;
+       module.exports.TreeBuilder = TreeBuilder;
 }
diff --git a/lib/mediawiki.parser.js b/lib/mediawiki.parser.js
index 21a05bb..26bc09b 100644
--- a/lib/mediawiki.parser.js
+++ b/lib/mediawiki.parser.js
@@ -36,7 +36,7 @@
        BehaviorSwitchHandler = BehaviorSwitch.BehaviorSwitchHandler,
        BehaviorSwitchPreprocessor = BehaviorSwitch.BehaviorSwitchPreprocessor,
        DOMFragmentBuilder = 
require('./ext.core.DOMFragmentBuilder.js').DOMFragmentBuilder,
-       TreeBuilder = 
require('./mediawiki.HTML5TreeBuilder.node.js').FauxHTML5.TreeBuilder,
+       TreeBuilder = 
require('./mediawiki.HTML5TreeBuilder.node.js').TreeBuilder,
        DOMPostProcessor = 
require('./mediawiki.DOMPostProcessor.js').DOMPostProcessor;
 
 var ParserPipeline; // forward declaration

-- 
To view, visit https://gerrit.wikimedia.org/r/153267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50829a9297ccbf383c7a6d4007ad1def7e24d816
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits