Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94498
Change subject: Fix edit source switch in Firefox
......................................................................
Fix edit source switch in Firefox
Previously was failing for two reasons:
1. FF requires the form to be attached before submitting
2. options.watch failed because of FF's annoying Object.prototype.watch
Bug: 56767
Change-Id: I7b3d349f057f5b87f823ce788b4143f817af5303
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/98/94498/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index a2b94db..832dd0e 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -855,12 +855,13 @@
this.serialize(
ve.dm.converter.getDomFromData( doc.getFullData(),
doc.getStore(), doc.getInternalList() ),
ve.bind( function ( wikitext ) {
- var options = this.getSaveOptions(),
+ var form,
+ options = this.getSaveOptions(),
action = new mw.Uri( mw.util.wikiScript()
).extend( { title: this.pageName, action: 'edit' } ).toString();
this.submitting = true;
- $( '<form method="post"
enctype="multipart/form-data"></form>' )
+ form = $( '<form method="post"
enctype="multipart/form-data"></form>' )
.attr( 'action', action )
.append( $( '<textarea
name="wpTextbox1"></textarea>' ).val( wikitext ) )
.append( $( '<input type="checkbox"
name="wpMinoredit" value="1">' ).prop( 'checked', options.minor ) )
@@ -872,8 +873,10 @@
.append( $( '<input type="hidden" name="model"
value="wikitext">' ) )
.append( $( '<input type="hidden" name="format"
value="text/x-wiki">' ) )
.append( $( '<input type="hidden"
name="wpEdittime">' ) )
- .submit()
;
+ // Firefox requires the form to be attached
+ $( 'body' ).append( form );
+ form.submit();
}, this )
);
};
@@ -914,6 +917,9 @@
}
if ( this.saveDialog.$saveOptions.find( '#wpWatchthis' ).prop(
'checked' ) ) {
options.watch = 1;
+ } else {
+ // Firefox has Object.prototype.watch
+ options.watch = undefined;
}
this.saveDialog.$saveOptions
.find( '.ve-ui-mwSaveDialog-checkboxes' )
--
To view, visit https://gerrit.wikimedia.org/r/94498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b3d349f057f5b87f823ce788b4143f817af5303
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
