wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 08:10:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistent parameter lists for loadError and saveError events

Browse source 
Change-Id: I7d195793f05f98ff3218f494ef78f9981f6b716f
This commit is contained in:
Catrope 2012-06-18 23:07:54 -07:00
parent c15b9d04a0
commit 6a48f2b829
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/ve2/init/ve.init.Target.js
View file

@ -36,16 +36,16 @@ ve.init.Target = function( pageName ) {
* @method * @method
* @param {Object} response XHR Response object * @param {Object} response XHR Response object
* @param {String} status Text status message * @param {String} status Text status message
* @emits loadError (message) * @emits loadError (null, message, null)
*/ */
ve.init.Target.onLoad = function( response, status ) { ve.init.Target.onLoad = function( response, status ) {
var data = response['ve-parsoid']; var data = response['ve-parsoid'];
if ( !data ) { if ( !data ) {
this.loading = false; this.loading = false;
this.emit( 'loadError', 'Invalid response from server' ); this.emit( 'loadError', null, 'Invalid response from server', null );
} else if ( typeof data.parsed !== 'string' ) { } else if ( typeof data.parsed !== 'string' ) {
this.loading = false; this.loading = false;
this.emit( 'loadError', 'Invalid HTML content in response from server' ); this.emit( 'loadError', null, 'Invalid HTML content in response from server', null );
} else { } else {
this.dom = $( '<div></div>' ).html( data.parsed )[0]; this.dom = $( '<div></div>' ).html( data.parsed )[0];
// Everything worked, the page was loaded, continue as soon as the module is ready // Everything worked, the page was loaded, continue as soon as the module is ready
@ -80,7 +80,7 @@ ve.init.Target.onReady = function() {
* @param {Object} response XHR Response object * @param {Object} response XHR Response object
* @param {String} status Text status message * @param {String} status Text status message
* @param {Mixed} error Thrown exception or HTTP error string * @param {Mixed} error Thrown exception or HTTP error string
* @emits load (dom) * @emits loadError (response, text, exception)
*/ */
ve.init.Target.onLoadError = function( response, text, exception ) { ve.init.Target.onLoadError = function( response, text, exception ) {
this.loading = false; this.loading = false;
@ -97,16 +97,17 @@ ve.init.Target.onLoadError = function( response, text, exception ) {
* @param {Object} response XHR Response object * @param {Object} response XHR Response object
* @param {String} status Text status message * @param {String} status Text status message
* @emits save (html) * @emits save (html)
* @emits saveError (null, message, null)
*/ */
ve.init.Target.onSave = function( response, status ) { ve.init.Target.onSave = function( response, status ) {
this.saving = false; this.saving = false;
var data = response['ve-parsoid']; var data = response['ve-parsoid'];
if ( !data ) { if ( !data ) {
this.emit( 'saveError', 'Invalid response from server' ); this.emit( 'saveError', null, 'Invalid response from server', null );
} else if ( data.result !== 'success' ) { } else if ( data.result !== 'success' ) {
this.emit( 'saveError', 'Unsuccessful request: ' + data.result ); this.emit( 'saveError', null, 'Unsuccessful request: ' + data.result, null );
} else if ( typeof data.content !== 'string' ) { } else if ( typeof data.content !== 'string' ) {
this.emit( 'saveError', 'Invalid HTML content in response from server' ); this.emit( 'saveError', null, 'Invalid HTML content in response from server', null );
} else { } else {
this.emit( 'save', data.content ); this.emit( 'save', data.content );
} }
@ -122,7 +123,7 @@ ve.init.Target.onSave = function( response, status ) {
* @param {Object} data HTTP Response object * @param {Object} data HTTP Response object
* @param {String} status Text status message * @param {String} status Text status message
* @param {Mixed} error Thrown exception or HTTP error string * @param {Mixed} error Thrown exception or HTTP error string
* @emits save (html) * @emits saveError (response, status, error)
*/ */
ve.init.Target.onSaveError = function( response, status, error ) { ve.init.Target.onSaveError = function( response, status, error ) {
this.saving = false; this.saving = false;