TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/139760
Change subject: [WIP] Try to split out wikiEditor vs codeEditor toolbar
......................................................................
[WIP] Try to split out wikiEditor vs codeEditor toolbar
This is far from done, will return to this later.
Bug: 45850
Change-Id: I166570a296b9612e9f0abac7eef69857840d11a2
---
M CodeEditor.hooks.php
M CodeEditor.php
A modules/ext.codeEditor.toolbar.js
A modules/jquery.codeEditor.toolbar.config.js
4 files changed, 73 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/60/139760/1
diff --git a/CodeEditor.hooks.php b/CodeEditor.hooks.php
index d367be2..296cbd2 100644
--- a/CodeEditor.hooks.php
+++ b/CodeEditor.hooks.php
@@ -35,8 +35,13 @@
public static function editPageShowEditFormInitial( $editpage, $output
) {
$lang = self::getPageLanguage( $editpage->getContextTitle() );
- if ( $lang && $output->getUser()->getOption( 'usebetatoolbar' )
) {
- $output->addModules( 'ext.codeEditor' );
+ if ( $lang ) {
+ $output->addModuleStyles(
'ext.wikiEditor.toolbar.styles' );
+ if ( $output->getUser()->getOption( 'usebetatoolbar' )
) {
+ $output->addModules(
'ext.codeEditor.WikiEditorToolbar' );
+ } else {
+ $output->addModules( 'ext.codeEditor' );
+ }
}
return true;
}
diff --git a/CodeEditor.php b/CodeEditor.php
index 4b38fc4..12deb72 100644
--- a/CodeEditor.php
+++ b/CodeEditor.php
@@ -36,13 +36,25 @@
);
$wgResourceModules['ext.codeEditor'] = array(
- 'scripts' => 'ext.codeEditor.js',
+ 'scripts' => array(
+ 'jquery.codeEditor.toolbar.config.js',
+ 'ext.codeEditor.toolbar.js',
+ 'ext.codeEditor.js',
+ ),
'dependencies' => array(
- 'ext.wikiEditor.toolbar',
- 'jquery.codeEditor'
+ 'jquery.codeEditor',
+ 'jquery.wikiEditor.toolbar',
),
) + $tpl;
+$wgResourceModules['ext.codeEditor.wikiEditorToolbar'] = array(
+ 'dependencies' => array(
+ 'ext.wikiEditor.toolbar',
+ 'jquery.codeEditor',
+ ),
+) + $tpl;
+
+
$wgResourceModules['jquery.codeEditor'] = array(
'scripts' => 'jquery.codeEditor.js',
'styles' => 'jquery.codeEditor.css',
diff --git a/modules/ext.codeEditor.toolbar.js
b/modules/ext.codeEditor.toolbar.js
new file mode 100644
index 0000000..3f30c0c
--- /dev/null
+++ b/modules/ext.codeEditor.toolbar.js
@@ -0,0 +1,16 @@
+/*
+ * JavaScript for WikiEditor Toolbar
+ */
+jQuery( document ).ready( function ( $ ) {
+ if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.toolbar ) ) {
+ $( '.wikiEditor-oldToolbar' ).show();
+ return;
+ }
+ // The old toolbar is still in place and needs to be removed so there
aren't two toolbars
+ $( '#toolbar' ).remove();
+ // Add toolbar module
+ // TODO: Implement .wikiEditor( 'remove' )
+ $( '#wpTextbox1' ).wikiEditor(
+ 'addModule',
$.wikiEditor.modules.toolbar.config.getDefaultConfig()
+ );
+} );
diff --git a/modules/jquery.codeEditor.toolbar.config.js
b/modules/jquery.codeEditor.toolbar.config.js
new file mode 100644
index 0000000..1284804
--- /dev/null
+++ b/modules/jquery.codeEditor.toolbar.config.js
@@ -0,0 +1,35 @@
+/**
+ * Configuration of Toolbar module for CodeEditor
+ */
+ /*jshint camelcase:false, quotmark:false */
+( function ( $, mw ) {
+ var callback = function() {
+ window.alert( 'Test' );
+ };
+$.wikiEditor.modules.toolbar.config = {
+ getDefaultConfig: function () {
+ return { 'toolbar': {
+ // Main section
+ 'main': {
+ 'type': 'toolbar',
+ 'groups': {
+ 'format': {
+ 'tools': {
+ 'codeEditor': {
+ 'labelMsg':
'codeeditor-toolbar-toggle',
+ 'type':
'button',
+ 'icon':
'format-bold.png',
+ // 'icon':
context.fn.codeEditorToolbarIcon(),
+ 'action': {
+ 'type':
'callback',
+
'execute': callback
+ }
+ }
+ }
+ }
+ }
+ }
+ } };
+ }
+}; }
+) ( jQuery, mediaWiki );
--
To view, visit https://gerrit.wikimedia.org/r/139760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I166570a296b9612e9f0abac7eef69857840d11a2
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
