jenkins-bot has submitted this change and it was merged.

Change subject: Be more consistent with errors in TemplateRequest.
......................................................................


Be more consistent with errors in TemplateRequest.

If the 'error' parameter for the callback is non-null, ensure that the
src parameter is null.

Change-Id: I5b9105ebbf77d6a2030e955e9df46e33f6571814
---
M js/lib/mediawiki.ApiRequest.js
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/js/lib/mediawiki.ApiRequest.js b/js/lib/mediawiki.ApiRequest.js
index f156db6..c507db9 100644
--- a/js/lib/mediawiki.ApiRequest.js
+++ b/js/lib/mediawiki.ApiRequest.js
@@ -219,7 +219,7 @@
        var metadata = { title: self.title };
 
        if ( error ) {
-               this._processListeners( error, '' );
+               this._processListeners( error, null );
                return;
        }
 
@@ -241,7 +241,7 @@
                                        self.title +
                                        ' can be found at a different location: 
'
                                        + location );
-                       this._processListeners( err, '' );
+                       this._processListeners( err, null );
                        return;
                }
                console.log( data );
@@ -298,7 +298,7 @@
        // (both original title as well as possible redirected title)
        this.env.pageCache[this.queueKey] = this.env.pageCache[this.title] = 
src;
 
-       this._processListeners( error, metadata );
+       this._processListeners( error, error ? null : metadata );
 };
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b9105ebbf77d6a2030e955e9df46e33f6571814
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[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

Reply via email to