jenkins-bot has submitted this change and it was merged.
Change subject: Finish updates for Schema:Edit
......................................................................
Finish updates for Schema:Edit
Follows-up Ib5fc6004
Bug: T111421
Change-Id: I3f1148ed7ec424875d73b0eb6571c8f38180685f
---
M modules/ext.wikiEditor.js
1 file changed, 14 insertions(+), 8 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikiEditor.js b/modules/ext.wikiEditor.js
index 6c8b29c..6bcdd9d 100644
--- a/modules/ext.wikiEditor.js
+++ b/modules/ext.wikiEditor.js
@@ -28,7 +28,6 @@
'page.title': mw.config.get( 'wgPageName' ),
'page.ns': mw.config.get( 'wgNamespaceNumber' ),
'page.revid': mw.config.get( 'wgRevisionId' ),
- 'page.length': -1, // FIXME
'user.id': mw.user.getId(),
'user.editCount': mw.config.get(
'wgUserEditCount', 0 ),
'mediawiki.version': mw.config.get( 'wgVersion'
)
@@ -70,25 +69,32 @@
} );
onUnloadFallback = window.onunload;
window.onunload = function () {
- var fallbackResult,
+ var fallbackResult, abortType,
caVeEdit = $( '#ca-ve-edit' )[0],
switchingToVE = caVeEdit && (
document.activeElement ===
caVeEdit ||
$.contains( caVeEdit,
document.activeElement )
- );
+ ),
+ unmodified = mw.config.get( 'wgAction'
) !== 'submit' && origText === $textarea.val();
if ( onUnloadFallback ) {
fallbackResult = onUnloadFallback();
}
+ if ( switchingToVE && unmodified ) {
+ abortType = 'switchnochange';
+ } else if ( switchingToVE ) {
+ abortType = 'switchwithout';
+ } else if ( unmodified ) {
+ abortType = 'nochange';
+ } else {
+ abortType = 'abandon';
+ }
+
if ( !submitting ) {
logEditEvent( 'abort', {
editingSessionId:
editingSessionId,
- type: switchingToVE ?
'switchwithout' :
- ( mw.config.get(
'wgAction' ) !== 'submit' && origText === $textarea.val() ?
- 'nochange' :
- 'abandon'
- )
+ type: abortType
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/236105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f1148ed7ec424875d73b0eb6571c8f38180685f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
