[MediaWiki-commits] [Gerrit] Test conf.parsoid.apiURI instead of conf.wiki.apiURI - change (mediawiki...Parsoid)

2013-02-26 Thread Subramanya Sastry (Code Review) 
Subramanya Sastry has uploaded a new change for review.

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


Change subject: Test conf.parsoid.apiURI instead of conf.wiki.apiURI
..

Test conf.parsoid.apiURI instead of conf.wiki.apiURI

* echo 'math3/math' | node parse was not parsing extension
  output whereas ... | node parse --fetchConfig was doing this.

* Turned out that the extension and template handlers were still
  testing the wrong URI before making api requests.

* Fixes commandline parser tests.

Change-Id: I0703fe39dafba4c9a5a4db3c9f4ccf00ffa876a3
---
M js/lib/ext.core.TemplateHandler.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/28/50928/1

diff --git a/js/lib/ext.core.TemplateHandler.js 
b/js/lib/ext.core.TemplateHandler.js
index 1368f65..6d2a076 100644
--- a/js/lib/ext.core.TemplateHandler.js
+++ b/js/lib/ext.core.TemplateHandler.js
@@ -66,7 +66,7 @@
}
 
if ( this.manager.env.conf.parsoid.usePHPPreProcessor 
-   this.manager.env.conf.wiki.apiURI !== null ) {
+   this.manager.env.conf.parsoid.apiURI !== null ) {
if ( this.options.wrapTemplates ) {
// Use MediaWiki's action=expandtemplates preprocessor
// We'll never get to frame depth beyond 1 in this 
scenario
@@ -687,7 +687,7 @@
 TemplateHandler.prototype.onExtension = function ( token, frame, cb ) {
var extensionName = token.getAttribute('name');
if ( this.manager.env.conf.parsoid.usePHPPreProcessor 
-   this.manager.env.conf.wiki.apiURI !== null ) {
+   this.manager.env.conf.parsoid.apiURI !== null ) {
// Use MediaWiki's action=parse preprocessor
this.fetchExpandedTplOrExtension(
extensionName,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0703fe39dafba4c9a5a4db3c9f4ccf00ffa876a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Test conf.parsoid.apiURI instead of conf.wiki.apiURI - change (mediawiki...Parsoid)

2013-02-26 Thread GWicke (Code Review) 
GWicke has submitted this change and it was merged.

Change subject: Test conf.parsoid.apiURI instead of conf.wiki.apiURI
..


Test conf.parsoid.apiURI instead of conf.wiki.apiURI

* echo 'math3/math' | node parse was not parsing extension
  output whereas ... | node parse --fetchConfig was doing this.

* Turned out that the extension and template handlers were still
  testing the wrong URI before making api requests.

* Fixes commandline parser tests.

Change-Id: I0703fe39dafba4c9a5a4db3c9f4ccf00ffa876a3
---
M js/lib/ext.core.TemplateHandler.js
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  GWicke: Verified; Looks good to me, approved



diff --git a/js/lib/ext.core.TemplateHandler.js 
b/js/lib/ext.core.TemplateHandler.js
index 1368f65..6d2a076 100644
--- a/js/lib/ext.core.TemplateHandler.js
+++ b/js/lib/ext.core.TemplateHandler.js
@@ -66,7 +66,7 @@
}
 
if ( this.manager.env.conf.parsoid.usePHPPreProcessor 
-   this.manager.env.conf.wiki.apiURI !== null ) {
+   this.manager.env.conf.parsoid.apiURI !== null ) {
if ( this.options.wrapTemplates ) {
// Use MediaWiki's action=expandtemplates preprocessor
// We'll never get to frame depth beyond 1 in this 
scenario
@@ -687,7 +687,7 @@
 TemplateHandler.prototype.onExtension = function ( token, frame, cb ) {
var extensionName = token.getAttribute('name');
if ( this.manager.env.conf.parsoid.usePHPPreProcessor 
-   this.manager.env.conf.wiki.apiURI !== null ) {
+   this.manager.env.conf.parsoid.apiURI !== null ) {
// Use MediaWiki's action=parse preprocessor
this.fetchExpandedTplOrExtension(
extensionName,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0703fe39dafba4c9a5a4db3c9f4ccf00ffa876a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot

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