jenkins-bot has submitted this change and it was merged.
Change subject: Improve the CodeEditor toolbar
......................................................................
Improve the CodeEditor toolbar
There isn't much in it yet, but it's a start.
Also needs a patch in WikiEditor, which is forcing some elements to be
visible for no apparent reason.
Change-Id: I6b57e5c11066a104a89bef3b7c8efd2129a80a8f
---
M modules/jquery.codeEditor.css
M modules/jquery.codeEditor.js
2 files changed, 37 insertions(+), 9 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/jquery.codeEditor.css b/modules/jquery.codeEditor.css
index 73f89a8..50c56d5 100644
--- a/modules/jquery.codeEditor.css
+++ b/modules/jquery.codeEditor.css
@@ -1,3 +1,17 @@
+.group-codeeditor-tools,
+.codeEditor-ui-toolbar .group-insert,
+.codeEditor-ui-toolbar .group-format,
+.codeEditor-ui-toolbar .tabs span.tab-advanced,
+.codeEditor-ui-toolbar .tabs span.tab-characters,
+.codeEditor-ui-toolbar .tabs span.tab-help,
+.codeEditor-ui-toolbar .sections {
+ display: none;
+}
+
+.codeEditor-ui-toolbar .group-codeeditor-tools {
+ display: block;
+}
+
.codeEditor-status {
clear: both;
width: 100%;
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 4d074b5..e488334 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -93,6 +93,7 @@
},
'setupCodeEditorToolbar': function () {
// Drop out some formatting that isn't relevant
on these pages...
+ /*
context.api.removeFromToolbar( context, {
'section': 'main',
'group': 'format',
@@ -103,6 +104,7 @@
'group': 'format',
'tool': 'italic'
} );
+ */
var callback = function ( context ) {
context.codeEditorActive =
!context.codeEditorActive;
@@ -118,19 +120,28 @@
};
context.api.addToToolbar( context, {
'section': 'main',
- 'group': 'format',
- 'tools': {
- 'codeEditor': {
- 'labelMsg':
'codeeditor-toolbar-toggle',
- 'type': 'button',
- 'icon':
context.fn.codeEditorToolbarIcon(),
- 'action': {
- 'type':
'callback',
- 'execute':
callback
+ 'groups' : {
+ 'codeeditor-main' : {
+ 'tools': {
+ 'codeEditor': {
+
'labelMsg': 'codeeditor-toolbar-toggle',
+ 'type':
'button',
+ 'icon':
context.fn.codeEditorToolbarIcon(),
+
'action': {
+
'type': 'callback',
+
'execute': callback
+ }
+ }
+ }
+ },
+ 'codeeditor-tools' : {
+ 'tools' : {
}
}
}
} );
+ $( '.group-codeeditor-tools' ).prependTo(
'.section-main' );
+ $( '.group-codeeditor-main' ).prependTo(
'.section-main' );
},
'toggleCodeEditorToolbar': function () {
var target, $img;
@@ -231,6 +242,7 @@
context.codeEditor.resize();
}
} );
+ $( '.wikiEditor-ui-toolbar' ).addClass(
'codeEditor-ui-toolbar' );
context.fn.setupStatusBar();
@@ -262,6 +274,8 @@
// Restore textarea
context.$textarea.show();
+ // Restore toolbar
+ $( '.wikiEditor-ui-toolbar' ).removeClass(
'codeEditor-ui-toolbar' );
// @todo restore cursor, scroll position
},
--
To view, visit https://gerrit.wikimedia.org/r/118993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b57e5c11066a104a89bef3b7c8efd2129a80a8f
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Mwalker <mwal...@khaosdev.com>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
