TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200478
Change subject: Only block for errors when saving
......................................................................
Only block for errors when saving
Bug: T70765
Change-Id: I947f7f5bda4272677dd8d090e155b1010a66795d
---
M modules/jquery.codeEditor.js
1 file changed, 14 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/78/200478/1
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index af1aa5a..11cc2d0 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -46,6 +46,7 @@
$.wikiEditor.extensions.codeEditor = function ( context ) {
var saveAndExtend,
textSelectionFn,
+ hasErrorsOnSave = false,
returnFalse = function () { return false; };
/*
@@ -66,17 +67,19 @@
'ready': returnFalse,
'codeEditorSubmit': function () {
context.evt.codeEditorSync();
+ if ( hasErrorsOnSave ) {
+ hasErrorsOnSave = false;
+ return confirm( mw.msg(
'codeeditor-save-with-errors' ) );
+ }
+ },
+ 'codeEditorSave' : function () {
var i,
- hasError = false,
annotations =
context.codeEditor.getSession().getAnnotations();
for ( i = 0; i < annotations.length; i++ ) {
if ( annotations[i].type === 'error' ) {
- hasError = true;
+ hasErrorsOnSave = true;
break;
}
- }
- if ( hasError ) {
- return confirm( mw.msg(
'codeeditor-save-with-errors' ) );
}
},
'codeEditorSync': function () {
@@ -214,7 +217,9 @@
enableSnippets: true
} );
- box.closest( 'form' ).submit(
context.evt.codeEditorSubmit );
+ box.closest( 'form' )
+ .submit(
context.evt.codeEditorSubmit )
+ .find( '#wpSave' ).click(
context.evt.codeEditorSave );
session =
context.codeEditor.getSession();
// Use proper tabs
@@ -257,7 +262,9 @@
*/
'disableCodeEditor': function () {
// Kills it!
- context.$textarea.closest( 'form' ).unbind(
'submit', context.evt.codeEditorSubmit );
+ context.$textarea.closest( 'form' )
+ .off( 'submit',
context.evt.codeEditorSubmit )
+ .find( '#wpSave' ).off( 'click',
context.evt.codeEditorSave );
// Save contents
context.$textarea.textSelection( 'unregister' );
--
To view, visit https://gerrit.wikimedia.org/r/200478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I947f7f5bda4272677dd8d090e155b1010a66795d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
