[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Show HTTP status alongside 'Unknown error' when it's not 200

2016-12-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327719 )

Change subject: Show HTTP status alongside 'Unknown error' when it's not 200
..


Show HTTP status alongside 'Unknown error' when it's not 200

Change-Id: If14dc14f2cc43a1f12c1314342d5028ec524c31e
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 33a4d8f..1628812 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -785,13 +785,18 @@
  */
 ve.init.mw.ArticleTarget.prototype.saveErrorUnknown = function ( editApi, data 
) {
var errorMsg = ( editApi && editApi.info ) || ( data && data.error && 
data.error.info ),
-   errorCode = ( editApi && editApi.code ) || ( data && data.error 
&& data.error.code );
+   errorCode = ( editApi && editApi.code ) || ( data && data.error 
&& data.error.code ),
+   unknown = 'Unknown error';
+
+   if ( data.xhr.status !== 200 ) {
+   unknown += ', HTTP status ' + data.xhr.status;
+   }
 
this.showSaveError(
-   $( document.createTextNode( errorMsg || errorCode || 'Unknown 
error' ) ),
+   $( document.createTextNode( errorMsg || errorCode || unknown ) 
),
false // prevents reapply
);
-   this.emit( 'saveErrorUnknown', errorCode || errorMsg || 'Unknown error' 
);
+   this.emit( 'saveErrorUnknown', errorCode || errorMsg || unknown );
 };
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If14dc14f2cc43a1f12c1314342d5028ec524c31e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Show HTTP status alongside 'Unknown error' when it's not 200

2016-12-16 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327719 )

Change subject: Show HTTP status alongside 'Unknown error' when it's not 200
..

Show HTTP status alongside 'Unknown error' when it's not 200

Change-Id: If14dc14f2cc43a1f12c1314342d5028ec524c31e
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/19/327719/1

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 33a4d8f..1628812 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -785,13 +785,18 @@
  */
 ve.init.mw.ArticleTarget.prototype.saveErrorUnknown = function ( editApi, data 
) {
var errorMsg = ( editApi && editApi.info ) || ( data && data.error && 
data.error.info ),
-   errorCode = ( editApi && editApi.code ) || ( data && data.error 
&& data.error.code );
+   errorCode = ( editApi && editApi.code ) || ( data && data.error 
&& data.error.code ),
+   unknown = 'Unknown error';
+
+   if ( data.xhr.status !== 200 ) {
+   unknown += ', HTTP status ' + data.xhr.status;
+   }
 
this.showSaveError(
-   $( document.createTextNode( errorMsg || errorCode || 'Unknown 
error' ) ),
+   $( document.createTextNode( errorMsg || errorCode || unknown ) 
),
false // prevents reapply
);
-   this.emit( 'saveErrorUnknown', errorCode || errorMsg || 'Unknown error' 
);
+   this.emit( 'saveErrorUnknown', errorCode || errorMsg || unknown );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If14dc14f2cc43a1f12c1314342d5028ec524c31e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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