Subramanya Sastry has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395096 )
Change subject: lib/parse.js: Move env initializations to relevant parsing paths
......................................................................
lib/parse.js: Move env initializations to relevant parsing paths
Change-Id: Ibb71ac279e8f3e67f487ee738ce9cfe92853e07a
---
M lib/parse.js
1 file changed, 29 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/96/395096/1
diff --git a/lib/parse.js b/lib/parse.js
index 3128834..b045dab 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -145,45 +145,43 @@
return ParserEnv.getParserEnv(parsoidConfig, obj.envOptions)
.then(function(env) {
env.startTime = start;
-
- // The content version to output
- if (obj.contentVersion) {
- env.setContentVersion(obj.contentVersion);
- }
-
- if (obj.reuseExpansions) {
- env.cacheReusableExpansions(obj.reuseExpansions);
- }
+ var s1 = Date.now();
+ env.bumpTimeUse("Setup Environment", s1 - start);
if (obj.oldid) {
env.page.meta.revision.revid = obj.oldid;
}
- // Selser
- var selser = obj.selser;
- if (selser !== undefined) {
- if (selser.oldtext !== null) {
- env.setPageSrcInfo(selser.oldtext);
- }
- if (selser.oldhtml) {
- env.page.dom =
DU.parseHTML(selser.oldhtml).body;
- }
- if (selser.domdiff) {
- // FIXME: need to load diff markers from
attributes
- env.page.domdiff = {
- isEmpty: false,
- dom: DU.ppToDOM(selser.domdiff),
- };
- throw new Error('this is broken');
- }
- }
-
- var s1 = Date.now();
- env.bumpTimeUse("Setup Environment", s1 - start);
-
if (['html2wt', 'html2html', 'selser'].includes(obj.mode)) {
+ // Selser
+ var selser = obj.selser;
+ if (selser !== undefined) {
+ if (selser.oldtext !== null) {
+ env.setPageSrcInfo(selser.oldtext);
+ }
+ if (selser.oldhtml) {
+ env.page.dom =
DU.parseHTML(selser.oldhtml).body;
+ }
+ if (selser.domdiff) {
+ // FIXME: need to load diff markers
from attributes
+ env.page.domdiff = {
+ isEmpty: false,
+ dom: DU.ppToDOM(selser.domdiff),
+ };
+ throw new Error('this is broken');
+ }
+ }
return html2wt(obj, env, obj.input, obj.pb);
} else {
+ // The content version to output
+ if (obj.contentVersion) {
+ env.setContentVersion(obj.contentVersion);
+ }
+
+ if (obj.reuseExpansions) {
+
env.cacheReusableExpansions(obj.reuseExpansions);
+ }
+
var p;
if (obj.input === undefined) {
var target = env.normalizeAndResolvePageTitle();
--
To view, visit https://gerrit.wikimedia.org/r/395096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb71ac279e8f3e67f487ee738ce9cfe92853e07a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
