[MediaWiki-commits] [Gerrit] Minor cleanup. - change (mediawiki...parsoid)

2014-03-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Minor cleanup.
..


Minor cleanup.

Change-Id: I7aa911f65187d8dd7fee1961f442fb31359b1279
---
M lib/wts.SerializerState.js
1 file changed, 5 insertions(+), 12 deletions(-)

Approvals:
  Marcoil: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/wts.SerializerState.js b/lib/wts.SerializerState.js
index aa3a044..22596ef 100644
--- a/lib/wts.SerializerState.js
+++ b/lib/wts.SerializerState.js
@@ -60,13 +60,7 @@
inPHPBlock: false,
wteHandlerStack: [],
// XXX: replace with output buffering per line
-   currLine: {
-   text: '',
-   firstNode: null,
-   processed: false,
-   hasOpenHeadingChar: false,
-   hasOpenBrackets: false
-   }
+   currLine: null
 };
 
 // Make sure the initialState is never modified
@@ -75,11 +69,10 @@
 function SerializerState(serializer, options) {
this.env = serializer.env;
this.serializer = serializer;
-   Util.extendProps(this,
-   // Make sure these two are cloned, so we don't alter the initial
-   // state for later serializer runs.
-   Util.clone(options),
-   Util.clone(initialState));
+   // Make sure options and initialState are cloned,
+   // so we don't alter the initial state for later serializer runs.
+   Util.extendProps(this, Util.clone(options), Util.clone(initialState));
+   this.resetCurrLine(null);
 }
 
 var SSP = SerializerState.prototype;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7aa911f65187d8dd7fee1961f442fb31359b1279
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Marcoil 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] Minor cleanup. - change (mediawiki...parsoid)

2014-03-14 Thread Subramanya Sastry (Code Review)
Subramanya Sastry has uploaded a new change for review.

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

Change subject: Minor cleanup.
..

Minor cleanup.

Change-Id: I7aa911f65187d8dd7fee1961f442fb31359b1279
---
M lib/wts.SerializerState.js
1 file changed, 5 insertions(+), 12 deletions(-)


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

diff --git a/lib/wts.SerializerState.js b/lib/wts.SerializerState.js
index aa3a044..22596ef 100644
--- a/lib/wts.SerializerState.js
+++ b/lib/wts.SerializerState.js
@@ -60,13 +60,7 @@
inPHPBlock: false,
wteHandlerStack: [],
// XXX: replace with output buffering per line
-   currLine: {
-   text: '',
-   firstNode: null,
-   processed: false,
-   hasOpenHeadingChar: false,
-   hasOpenBrackets: false
-   }
+   currLine: null
 };
 
 // Make sure the initialState is never modified
@@ -75,11 +69,10 @@
 function SerializerState(serializer, options) {
this.env = serializer.env;
this.serializer = serializer;
-   Util.extendProps(this,
-   // Make sure these two are cloned, so we don't alter the initial
-   // state for later serializer runs.
-   Util.clone(options),
-   Util.clone(initialState));
+   // Make sure options and initialState are cloned,
+   // so we don't alter the initial state for later serializer runs.
+   Util.extendProps(this, Util.clone(options), Util.clone(initialState));
+   this.resetCurrLine(null);
 }
 
 var SSP = SerializerState.prototype;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aa911f65187d8dd7fee1961f442fb31359b1279
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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