Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/317079 )
Change subject: [WIP] Remove old "bulletin board style toolbar" from core
......................................................................
[WIP] Remove old "bulletin board style toolbar" from core
With this change MediaWiki will no longer have a 'JavaScript-powered' wikitext
toolbar, and instead sysadmins will be required to choose one (or more) of the
extensions available for this purpose. MediaWiki has shipped with the 2010-era
replacement for this, WikiEditor, for half a decade now. With the new 2017-era
wikitext editor around the corner, and the visual editor alongside it, as well
as more specialised editors like CodeEditor.
Beyond this, this core editor is very old, un-loved, & used only exceptionally
rarely. It is not appropriate for MediaWiki to implicitly favour it as primary
editor when it is not a very good experience for any kind of user, and has not
received the attention that users deserve to be worth retaining in core.
The code here deleted can be moved to an extension for the (very few) users of
MediaWiki who might want to keep using it. The core preference on whether this
toolbar should be shown, which has mutated into whether the edit toolbar hook,
which is used by some extensions to provide toolbars other than this one, thus
is also removed. This has been in practice a very confusing preference for our
users, who also interact with (quite similar) preferences to toggle their real
editor which sit next to this one.
TODO: Discuss, decide, merge.
Bug: T30856
Bug: T32795
Change-Id: I2b05f0ca25873ad8e0b33a5e4938bef52c4e9347
---
M includes/DefaultSettings.php
M includes/EditPage.php
M includes/Preferences.php
M jsduck.json
M languages/i18n/en.json
M languages/i18n/qqq.json
M maintenance/dictionary/mediawiki.dic
M maintenance/jsduck/categories.json
M resources/Resources.php
M resources/src/mediawiki.legacy/wikibits.js
D resources/src/mediawiki.toolbar/images/ar/button_bold.png
D resources/src/mediawiki.toolbar/images/ar/button_headline.png
D resources/src/mediawiki.toolbar/images/ar/button_italic.png
D resources/src/mediawiki.toolbar/images/ar/button_link.png
D resources/src/mediawiki.toolbar/images/ar/button_nowiki.png
D resources/src/mediawiki.toolbar/images/be-tarask/button_bold.png
D resources/src/mediawiki.toolbar/images/be-tarask/button_italic.png
D resources/src/mediawiki.toolbar/images/be-tarask/button_link.png
D resources/src/mediawiki.toolbar/images/de/button_bold.png
D resources/src/mediawiki.toolbar/images/de/button_italic.png
D resources/src/mediawiki.toolbar/images/en/button_bold.png
D resources/src/mediawiki.toolbar/images/en/button_extlink.png
D resources/src/mediawiki.toolbar/images/en/button_headline.png
D resources/src/mediawiki.toolbar/images/en/button_hr.png
D resources/src/mediawiki.toolbar/images/en/button_image.png
D resources/src/mediawiki.toolbar/images/en/button_italic.png
D resources/src/mediawiki.toolbar/images/en/button_link.png
D resources/src/mediawiki.toolbar/images/en/button_media.png
D resources/src/mediawiki.toolbar/images/en/button_nowiki.png
D resources/src/mediawiki.toolbar/images/en/button_sig.png
D resources/src/mediawiki.toolbar/images/fa/button_bold.png
D resources/src/mediawiki.toolbar/images/fa/button_headline.png
D resources/src/mediawiki.toolbar/images/fa/button_italic.png
D resources/src/mediawiki.toolbar/images/fa/button_link.png
D resources/src/mediawiki.toolbar/images/fa/button_nowiki.png
D resources/src/mediawiki.toolbar/images/ksh/LICENSE
D resources/src/mediawiki.toolbar/images/ksh/button_italic.png
D resources/src/mediawiki.toolbar/images/ru/LICENSE
D resources/src/mediawiki.toolbar/images/ru/button_bold.png
D resources/src/mediawiki.toolbar/images/ru/button_italic.png
D resources/src/mediawiki.toolbar/images/ru/button_link.png
D resources/src/mediawiki.toolbar/toolbar.js
D resources/src/mediawiki.toolbar/toolbar.less
M tests/browser/features/step_definitions/preferences_editing_steps.rb
M tests/browser/features/support/pages/preferences_editing_page.rb
45 files changed, 9 insertions(+), 446 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/317079/3
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 32717f1..81fc51f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4827,7 +4827,6 @@
'rows' => 25,
'showhiddencats' => 0,
'shownumberswatching' => 1,
- 'showtoolbar' => 1,
'skin' => false,
'stubthreshold' => 0,
'thumbsize' => 5,
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 745f8de..1081a10 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2334,14 +2334,6 @@
}
$wgOut->addModuleStyles( 'mediawiki.action.edit.styles' );
- if ( $wgUser->getOption( 'showtoolbar' ) ) {
- // The addition of default buttons is handled by
getEditToolbar() which
- // has its own dependency on this module. The call here
ensures the module
- // is loaded in time (it has position "top") for other
modules to register
- // buttons (e.g. extensions, gadgets, user scripts).
- $wgOut->addModules( 'mediawiki.toolbar' );
- }
-
if ( $wgUser->getOption( 'uselivepreview' ) ) {
$wgOut->addModules( 'mediawiki.action.edit.preview' );
}
@@ -2624,13 +2616,8 @@
$wgOut->addHTML( $this->editFormTextTop );
- $showToolbar = true;
if ( $this->wasDeletedSinceLastEdit() ) {
- if ( $this->formtype == 'save' ) {
- // Hide the toolbar and edit area, user can
click preview to get it back
- // Add an confirmation checkbox and explanation.
- $showToolbar = false;
- } else {
+ if ( $this->formtype !== 'save' ) {
$wgOut->wrapWikiMsg( "<div class='error
mw-deleted-while-editing'>\n$1\n</div>",
'deletedwhileediting' );
}
@@ -2745,7 +2732,10 @@
$wgOut->addHTML( $this->editFormTextBeforeContent );
- if ( !$this->isCssJsSubpage && $showToolbar &&
$wgUser->getOption( 'showtoolbar' ) ) {
+ if (
+ !$this->isCssJsSubpage &&
+ !( $this->wasDeletedSinceLastEdit() && $this->formtype
== 'save' )
+ ) {
$wgOut->addHTML( EditPage::getEditToolbar(
$this->mTitle ) );
}
@@ -3868,139 +3858,18 @@
}
/**
- * Shows a bulletin board style toolbar for common editing functions.
- * It can be disabled in the user preferences.
+ * Allow extensions to provide a toolbar.
*
* @param Title $title Title object for the page being edited (optional)
* @return string
*/
static function getEditToolbar( $title = null ) {
- global $wgContLang, $wgOut;
- global $wgEnableUploads, $wgForeignFileRepos;
-
- $imagesAvailable = $wgEnableUploads || count(
$wgForeignFileRepos );
- $showSignature = true;
- if ( $title ) {
- $showSignature = MWNamespace::wantSignatures(
$title->getNamespace() );
- }
-
- /**
- * $toolarray is an array of arrays each of which includes the
- * opening tag, the closing tag, optionally a sample text that
is
- * inserted between the two when no selection is highlighted
- * and. The tip text is shown when the user moves the mouse
- * over the button.
- *
- * Images are defined in ResourceLoaderEditToolbarModule.
- */
- $toolarray = [
- [
- 'id' => 'mw-editbutton-bold',
- 'open' => '\'\'\'',
- 'close' => '\'\'\'',
- 'sample' => wfMessage( 'bold_sample' )->text(),
- 'tip' => wfMessage( 'bold_tip' )->text(),
- ],
- [
- 'id' => 'mw-editbutton-italic',
- 'open' => '\'\'',
- 'close' => '\'\'',
- 'sample' => wfMessage( 'italic_sample'
)->text(),
- 'tip' => wfMessage( 'italic_tip' )->text(),
- ],
- [
- 'id' => 'mw-editbutton-link',
- 'open' => '[[',
- 'close' => ']]',
- 'sample' => wfMessage( 'link_sample' )->text(),
- 'tip' => wfMessage( 'link_tip' )->text(),
- ],
- [
- 'id' => 'mw-editbutton-extlink',
- 'open' => '[',
- 'close' => ']',
- 'sample' => wfMessage( 'extlink_sample'
)->text(),
- 'tip' => wfMessage( 'extlink_tip' )->text(),
- ],
- [
- 'id' => 'mw-editbutton-headline',
- 'open' => "\n== ",
- 'close' => " ==\n",
- 'sample' => wfMessage( 'headline_sample'
)->text(),
- 'tip' => wfMessage( 'headline_tip' )->text(),
- ],
- $imagesAvailable ? [
- 'id' => 'mw-editbutton-image',
- 'open' => '[[' . $wgContLang->getNsText(
NS_FILE ) . ':',
- 'close' => ']]',
- 'sample' => wfMessage( 'image_sample' )->text(),
- 'tip' => wfMessage( 'image_tip' )->text(),
- ] : false,
- $imagesAvailable ? [
- 'id' => 'mw-editbutton-media',
- 'open' => '[[' . $wgContLang->getNsText(
NS_MEDIA ) . ':',
- 'close' => ']]',
- 'sample' => wfMessage( 'media_sample' )->text(),
- 'tip' => wfMessage( 'media_tip' )->text(),
- ] : false,
- [
- 'id' => 'mw-editbutton-nowiki',
- 'open' => "<nowiki>",
- 'close' => "</nowiki>",
- 'sample' => wfMessage( 'nowiki_sample'
)->text(),
- 'tip' => wfMessage( 'nowiki_tip' )->text(),
- ],
- $showSignature ? [
- 'id' => 'mw-editbutton-signature',
- 'open' => wfMessage( 'sig-text', '~~~~'
)->inContentLanguage()->text(),
- 'close' => '',
- 'sample' => '',
- 'tip' => wfMessage( 'sig_tip' )->text(),
- ] : false,
- [
- 'id' => 'mw-editbutton-hr',
- 'open' => "\n----\n",
- 'close' => '',
- 'sample' => '',
- 'tip' => wfMessage( 'hr_tip' )->text(),
- ]
- ];
-
- $script = 'mw.loader.using("mediawiki.toolbar", function () {';
- foreach ( $toolarray as $tool ) {
- if ( !$tool ) {
- continue;
- }
-
- $params = [
- // Images are defined in
ResourceLoaderEditToolbarModule
- false,
- // Note that we use the tip both for the ALT
tag and the TITLE tag of the image.
- // Older browsers show a "speedtip" type
message only for ALT.
- // Ideally these should be different,
realistically they
- // probably don't need to be.
- $tool['tip'],
- $tool['open'],
- $tool['close'],
- $tool['sample'],
- $tool['id'],
- ];
-
- $script .= Xml::encodeJsCall(
- 'mw.toolbar.addButton',
- $params,
- ResourceLoader::inDebugMode()
- );
- }
-
- $script .= '});';
- $wgOut->addScript( ResourceLoader::makeInlineScript( $script )
);
-
- $toolbar = '<div id="toolbar"></div>';
+ $startingToolbar = '<div id="toolbar"></div>';
+ $toolbar = $startingToolbar;
Hooks::run( 'EditPageBeforeEditToolbar', [ &$toolbar ] );
- return $toolbar;
+ return ( $toolbar !== $startingToolbar ) ? $toolbar : null;
}
/**
diff --git a/includes/Preferences.php b/includes/Preferences.php
index d86b19a..92e6e31 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -840,11 +840,6 @@
'section' => 'editing/editor',
'label-message' => 'tog-useeditwarning',
];
- $defaultPreferences['showtoolbar'] = [
- 'type' => 'toggle',
- 'section' => 'editing/editor',
- 'label-message' => 'tog-showtoolbar',
- ];
$defaultPreferences['previewonfirst'] = [
'type' => 'toggle',
diff --git a/jsduck.json b/jsduck.json
index 5b18365..0ab152e 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -16,7 +16,6 @@
"resources/src/mediawiki.language",
"resources/src/mediawiki.messagePoster",
"resources/src/mediawiki.special",
- "resources/src/mediawiki.toolbar",
"resources/src/mediawiki.widgets",
"resources/src/jquery/jquery.accessKeyLabel.js",
"resources/src/jquery/jquery.arrowSteps.js",
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 28ccbf3..a31236d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -11,7 +11,6 @@
"tog-extendwatchlist": "Expand watchlist to show all changes, not just
the most recent",
"tog-usenewrc": "Group changes by page in recent changes and watchlist",
"tog-numberheadings": "Auto-number headings",
- "tog-showtoolbar": "Show edit toolbar",
"tog-editondblclick": "Edit pages on double click",
"tog-editsectiononrightclick": "Enable section editing by right
clicking on section titles",
"tog-watchcreations": "Add pages I create and files I upload to my
watchlist",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index e1b6c9b..f7e9668 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -195,7 +195,6 @@
"tog-extendwatchlist": "[[Special:Preferences]], tab 'Watchlist'.
Offers user to show all applicable changes in watchlist (by default only the
last change to a page on the watchlist is shown). {{Gender}}",
"tog-usenewrc": "{{Gender}}\nUsed as label for the checkbox in
[[Special:Preferences]], tab \"Recent changes\".\n\nOffers user to use
alternative representation of [[Special:RecentChanges]] and watchlist.",
"tog-numberheadings": "[[Special:Preferences]], tab 'Misc'. Offers
numbered headings on content pages to user. {{Gender}}",
- "tog-showtoolbar": "{{Gender}}\n[[Special:Preferences]], tab 'Edit'.
Offers user to show edit toolbar in page edit screen.\n\nThis is the toolbar:
[[Image:Toolbar.png]]",
"tog-editondblclick": "{{Gender}}\n[[Special:Preferences]], tab 'Edit'.
Offers user to open edit page on double click.",
"tog-editsectiononrightclick": "{{Gender}}\n[[Special:Preferences]],
tab 'Edit'. Offers user to edit a section by clicking on a section title.",
"tog-watchcreations": "[[Special:Preferences]], tab 'Watchlist'. Offers
user to add created pages to watchlist. {{Gender}}",
diff --git a/maintenance/dictionary/mediawiki.dic
b/maintenance/dictionary/mediawiki.dic
index 914336f..58deed7 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -3701,7 +3701,6 @@
showreviewed
showsizediff
showtoc
-showtoolbar
showunreviewed
shtml
si
diff --git a/maintenance/jsduck/categories.json
b/maintenance/jsduck/categories.json
index aad85da..42576ca 100644
--- a/maintenance/jsduck/categories.json
+++ b/maintenance/jsduck/categories.json
@@ -36,10 +36,6 @@
]
},
{
- "name": "Actions",
- "classes": ["mw.toolbar"]
- },
- {
"name": "API",
"classes": ["mw.Api*", "mw.ForeignApi*"]
},
diff --git a/resources/Resources.php b/resources/Resources.php
index e619771..6c1f80d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1431,12 +1431,6 @@
'dependencies' => 'jquery.cookie',
'targets' => [ 'desktop', 'mobile' ],
],
- 'mediawiki.toolbar' => [
- 'class' => 'ResourceLoaderEditToolbarModule',
- 'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js',
- 'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
- 'dependencies' => 'jquery.textSelection',
- ],
'mediawiki.experiments' => [
'scripts' => 'resources/src/mediawiki/mediawiki.experiments.js',
'targets' => [ 'desktop', 'mobile' ],
diff --git a/resources/src/mediawiki.legacy/wikibits.js
b/resources/src/mediawiki.legacy/wikibits.js
index 8062849..e22b2f0 100644
--- a/resources/src/mediawiki.legacy/wikibits.js
+++ b/resources/src/mediawiki.legacy/wikibits.js
@@ -102,14 +102,6 @@
mw.log.deprecate( win, 'checkboxClickHandler', $.noop, msg );
/**
- * Add a button to the default editor toolbar
- *
- * @deprecated since 1.17 Use mw.toolbar instead
- */
- mw.log.deprecate( win, 'mwEditButtons', [], 'Use mw.toolbar instead.' );
- mw.log.deprecate( win, 'mwCustomEditButtons', [], 'Use mw.toolbar
instead.' );
-
- /**
* Spinner creation, injection and removal
*
* @deprecated since 1.18 Use jquery.spinner instead
diff --git a/resources/src/mediawiki.toolbar/images/ar/button_bold.png
b/resources/src/mediawiki.toolbar/images/ar/button_bold.png
deleted file mode 100644
index 50e2ff0..0000000
--- a/resources/src/mediawiki.toolbar/images/ar/button_bold.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/ar/button_headline.png
b/resources/src/mediawiki.toolbar/images/ar/button_headline.png
deleted file mode 100644
index 2e3e781..0000000
--- a/resources/src/mediawiki.toolbar/images/ar/button_headline.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/ar/button_italic.png
b/resources/src/mediawiki.toolbar/images/ar/button_italic.png
deleted file mode 100644
index 6b54fb6..0000000
--- a/resources/src/mediawiki.toolbar/images/ar/button_italic.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/ar/button_link.png
b/resources/src/mediawiki.toolbar/images/ar/button_link.png
deleted file mode 100644
index 4434e7f..0000000
--- a/resources/src/mediawiki.toolbar/images/ar/button_link.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/ar/button_nowiki.png
b/resources/src/mediawiki.toolbar/images/ar/button_nowiki.png
deleted file mode 100644
index c9378de..0000000
--- a/resources/src/mediawiki.toolbar/images/ar/button_nowiki.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/be-tarask/button_bold.png
b/resources/src/mediawiki.toolbar/images/be-tarask/button_bold.png
deleted file mode 100644
index df6700d..0000000
--- a/resources/src/mediawiki.toolbar/images/be-tarask/button_bold.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/be-tarask/button_italic.png
b/resources/src/mediawiki.toolbar/images/be-tarask/button_italic.png
deleted file mode 100644
index 872c00f..0000000
--- a/resources/src/mediawiki.toolbar/images/be-tarask/button_italic.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/be-tarask/button_link.png
b/resources/src/mediawiki.toolbar/images/be-tarask/button_link.png
deleted file mode 100644
index d3dd88e..0000000
--- a/resources/src/mediawiki.toolbar/images/be-tarask/button_link.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/de/button_bold.png
b/resources/src/mediawiki.toolbar/images/de/button_bold.png
deleted file mode 100644
index 8e6b389..0000000
--- a/resources/src/mediawiki.toolbar/images/de/button_bold.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/de/button_italic.png
b/resources/src/mediawiki.toolbar/images/de/button_italic.png
deleted file mode 100644
index 5e3cd11..0000000
--- a/resources/src/mediawiki.toolbar/images/de/button_italic.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_bold.png
b/resources/src/mediawiki.toolbar/images/en/button_bold.png
deleted file mode 100644
index e582fb1..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_bold.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_extlink.png
b/resources/src/mediawiki.toolbar/images/en/button_extlink.png
deleted file mode 100644
index 458943c..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_extlink.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_headline.png
b/resources/src/mediawiki.toolbar/images/en/button_headline.png
deleted file mode 100644
index 7d64a16..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_headline.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_hr.png
b/resources/src/mediawiki.toolbar/images/en/button_hr.png
deleted file mode 100644
index 47e1ca4..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_hr.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_image.png
b/resources/src/mediawiki.toolbar/images/en/button_image.png
deleted file mode 100644
index 6919296..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_image.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_italic.png
b/resources/src/mediawiki.toolbar/images/en/button_italic.png
deleted file mode 100644
index 820efe2..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_italic.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_link.png
b/resources/src/mediawiki.toolbar/images/en/button_link.png
deleted file mode 100644
index 5dd362c..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_link.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_media.png
b/resources/src/mediawiki.toolbar/images/en/button_media.png
deleted file mode 100644
index 80c3156..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_media.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_nowiki.png
b/resources/src/mediawiki.toolbar/images/en/button_nowiki.png
deleted file mode 100644
index 05a977a..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_nowiki.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/en/button_sig.png
b/resources/src/mediawiki.toolbar/images/en/button_sig.png
deleted file mode 100644
index 2cbcc0b..0000000
--- a/resources/src/mediawiki.toolbar/images/en/button_sig.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/fa/button_bold.png
b/resources/src/mediawiki.toolbar/images/fa/button_bold.png
deleted file mode 100644
index 5489343..0000000
--- a/resources/src/mediawiki.toolbar/images/fa/button_bold.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/fa/button_headline.png
b/resources/src/mediawiki.toolbar/images/fa/button_headline.png
deleted file mode 100644
index 4d48a5d..0000000
--- a/resources/src/mediawiki.toolbar/images/fa/button_headline.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/fa/button_italic.png
b/resources/src/mediawiki.toolbar/images/fa/button_italic.png
deleted file mode 100644
index 41098c7..0000000
--- a/resources/src/mediawiki.toolbar/images/fa/button_italic.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/fa/button_link.png
b/resources/src/mediawiki.toolbar/images/fa/button_link.png
deleted file mode 100644
index 8c2d85a..0000000
--- a/resources/src/mediawiki.toolbar/images/fa/button_link.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/fa/button_nowiki.png
b/resources/src/mediawiki.toolbar/images/fa/button_nowiki.png
deleted file mode 100644
index c9378de..0000000
--- a/resources/src/mediawiki.toolbar/images/fa/button_nowiki.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/ksh/LICENSE
b/resources/src/mediawiki.toolbar/images/ksh/LICENSE
deleted file mode 100644
index 47ecfe4..0000000
--- a/resources/src/mediawiki.toolbar/images/ksh/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-
-button_italic.png
--------------------
-Source : http://commons.wikimedia.org/wiki/Image:Button_S_italic.png
-License: Public domain
-Author : Purodha Blissenbach, http://ksh.wikipedia.org/wiki/User:Purodha
-
diff --git a/resources/src/mediawiki.toolbar/images/ksh/button_italic.png
b/resources/src/mediawiki.toolbar/images/ksh/button_italic.png
deleted file mode 100644
index 34268d9..0000000
--- a/resources/src/mediawiki.toolbar/images/ksh/button_italic.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/ru/LICENSE
b/resources/src/mediawiki.toolbar/images/ru/LICENSE
deleted file mode 100644
index bedcec6..0000000
--- a/resources/src/mediawiki.toolbar/images/ru/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-button_bold.png
----------------
-Source : http://commons.wikimedia.org/wiki/Image:Button_bold_ukr.png
-License: Public domain
-Author : Alexey Belomoev
-
-button_italic.png
-------------------------
-Source : http://commons.wikimedia.org/wiki/Image:Button_italic_ukr.png
-License: Public domain
-Author : Alexey Belomoev
-
-button_link.png
------------------
-Source : http://commons.wikimedia.org/wiki/Image:Button_internal_link_ukr.png
-License: GPL
-Author : Saproj, Erik Möller
diff --git a/resources/src/mediawiki.toolbar/images/ru/button_bold.png
b/resources/src/mediawiki.toolbar/images/ru/button_bold.png
deleted file mode 100644
index a7dceb1..0000000
--- a/resources/src/mediawiki.toolbar/images/ru/button_bold.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/ru/button_italic.png
b/resources/src/mediawiki.toolbar/images/ru/button_italic.png
deleted file mode 100644
index 44a0a74..0000000
--- a/resources/src/mediawiki.toolbar/images/ru/button_italic.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/images/ru/button_link.png
b/resources/src/mediawiki.toolbar/images/ru/button_link.png
deleted file mode 100644
index 36b9059..0000000
--- a/resources/src/mediawiki.toolbar/images/ru/button_link.png
+++ /dev/null
Binary files differ
diff --git a/resources/src/mediawiki.toolbar/toolbar.js
b/resources/src/mediawiki.toolbar/toolbar.js
deleted file mode 100644
index e9fc024..0000000
--- a/resources/src/mediawiki.toolbar/toolbar.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- * Interface for the classic edit toolbar.
- *
- * @class mw.toolbar
- * @singleton
- */
-( function ( mw, $ ) {
- var toolbar, isReady, $toolbar, queue, slice, $currentFocused;
-
- /**
- * Internal helper that does the actual insertion of the button into
the toolbar.
- *
- * For backwards-compatibility, passing `imageFile`, `speedTip`,
`tagOpen`, `tagClose`,
- * `sampleText` and `imageId` as separate arguments (in this order) is
also supported.
- *
- * @private
- *
- * @param {Object} button Object with the following properties.
- * You are required to provide *either* the `onClick` parameter, or
the three parameters
- * `tagOpen`, `tagClose` and `sampleText`, but not both (they're
mutually exclusive).
- * @param {string} [button.imageFile] Image to use for the button.
- * @param {string} button.speedTip Tooltip displayed when user mouses
over the button.
- * @param {Function} [button.onClick] Function to be executed when the
button is clicked.
- * @param {string} [button.tagOpen]
- * @param {string} [button.tagClose]
- * @param {string} [button.sampleText] Alternative to `onClick`.
`tagOpen`, `tagClose` and
- * `sampleText` together provide the markup that should be inserted
into page text at
- * current cursor position.
- * @param {string} [button.imageId] `id` attribute of the button HTML
element. Can be
- * used to define the image with CSS if it's not provided as
`imageFile`.
- * @param {string} [speedTip]
- * @param {string} [tagOpen]
- * @param {string} [tagClose]
- * @param {string} [sampleText]
- * @param {string} [imageId]
- */
- function insertButton( button, speedTip, tagOpen, tagClose, sampleText,
imageId ) {
- var $button;
-
- // Backwards compatibility
- if ( typeof button !== 'object' ) {
- button = {
- imageFile: button,
- speedTip: speedTip,
- tagOpen: tagOpen,
- tagClose: tagClose,
- sampleText: sampleText,
- imageId: imageId
- };
- }
-
- if ( button.imageFile ) {
- $button = $( '<img>' ).attr( {
- src: button.imageFile,
- alt: button.speedTip,
- title: button.speedTip,
- id: button.imageId || undefined,
- 'class': 'mw-toolbar-editbutton'
- } );
- } else {
- $button = $( '<div>' ).attr( {
- title: button.speedTip,
- id: button.imageId || undefined,
- 'class': 'mw-toolbar-editbutton'
- } );
- }
-
- $button.click( function ( e ) {
- if ( button.onClick !== undefined ) {
- button.onClick( e );
- } else {
- toolbar.insertTags( button.tagOpen,
button.tagClose, button.sampleText );
- }
-
- return false;
- } );
-
- $toolbar.append( $button );
- }
-
- isReady = false;
- $toolbar = false;
-
- /**
- * @private
- * @property {Array}
- * Contains button objects (and for backwards compatibilty, it can
- * also contains an arguments array for insertButton).
- */
- queue = [];
- slice = queue.slice;
-
- toolbar = {
-
- /**
- * Add buttons to the toolbar.
- *
- * Takes care of race conditions and time-based dependencies by
placing buttons in a queue if
- * this method is called before the toolbar is created.
- *
- * For backwards-compatibility, passing `imageFile`,
`speedTip`, `tagOpen`, `tagClose`,
- * `sampleText` and `imageId` as separate arguments (in this
order) is also supported.
- *
- * @inheritdoc #insertButton
- */
- addButton: function () {
- if ( isReady ) {
- insertButton.apply( toolbar, arguments );
- } else {
- // Convert arguments list to array
- queue.push( slice.call( arguments ) );
- }
- },
-
- /**
- * Add multiple buttons to the toolbar (see also #addButton).
- *
- * Example usage:
- *
- * addButtons( [ { .. }, { .. }, { .. } ] );
- * addButtons( { .. }, { .. } );
- *
- * @param {...Object|Array} [buttons] An array of button
objects or the first
- * button object in a list of variadic arguments.
- */
- addButtons: function ( buttons ) {
- if ( !$.isArray( buttons ) ) {
- buttons = slice.call( arguments );
- }
- if ( isReady ) {
- $.each( buttons, function () {
- insertButton( this );
- } );
- } else {
- // Push each button into the queue
- queue.push.apply( queue, buttons );
- }
- },
-
- /**
- * Apply tagOpen/tagClose to selection in currently focused
textarea.
- *
- * Uses `sampleText` if selection is empty.
- *
- * @param {string} tagOpen
- * @param {string} tagClose
- * @param {string} sampleText
- */
- insertTags: function ( tagOpen, tagClose, sampleText ) {
- if ( $currentFocused && $currentFocused.length ) {
- $currentFocused.textSelection(
- 'encapsulateSelection', {
- pre: tagOpen,
- peri: sampleText,
- post: tagClose
- }
- );
- }
- }
- };
-
- // Legacy (for compatibility with the code previously in
skins/common.edit.js)
- mw.log.deprecate( window, 'addButton', toolbar.addButton, 'Use
mw.toolbar.addButton instead.' );
- mw.log.deprecate( window, 'insertTags', toolbar.insertTags, 'Use
mw.toolbar.insertTags instead.' );
-
- // For backwards compatibility. Used to be called from EditPage.php,
maybe other places as well.
- mw.log.deprecate( toolbar, 'init', $.noop );
-
- // Expose API publicly
- mw.toolbar = toolbar;
-
- $( function () {
- var i, button;
-
- // Used to determine where to insert tags
- $currentFocused = $( '#wpTextbox1' );
-
- // Populate the selector cache for $toolbar
- $toolbar = $( '#toolbar' );
-
- for ( i = 0; i < queue.length; i++ ) {
- button = queue[ i ];
- if ( $.isArray( button ) ) {
- // Forwarded arguments array from
mw.toolbar.addButton
- insertButton.apply( toolbar, button );
- } else {
- // Raw object from mw.toolbar.addButtons
- insertButton( button );
- }
- }
-
- // Clear queue
- queue.length = 0;
-
- // This causes further calls to addButton to go to insertion
directly
- // instead of to the queue.
- // It is important that this is after the one and only loop
through
- // the queue
- isReady = true;
-
- // Apply to dynamically created textboxes as well as normal ones
- $( document ).on( 'focus', 'textarea, input:text', function () {
- $currentFocused = $( this );
- } );
- } );
-
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.toolbar/toolbar.less
b/resources/src/mediawiki.toolbar/toolbar.less
deleted file mode 100644
index d65b284..0000000
--- a/resources/src/mediawiki.toolbar/toolbar.less
+++ /dev/null
@@ -1,42 +0,0 @@
-@import "mediawiki.mixins";
-
-#mw-editbutton-bold {
- .background-image("images/@{button-bold}");
-}
-
-#mw-editbutton-italic {
- .background-image("images/@{button-italic}");
-}
-
-#mw-editbutton-link {
- .background-image("images/@{button-link}");
-}
-
-#mw-editbutton-extlink {
- .background-image("images/@{button-extlink}");
-}
-
-#mw-editbutton-headline {
- .background-image("images/@{button-headline}");
-}
-
-#mw-editbutton-image {
- .background-image("images/@{button-image}");
-}
-
-#mw-editbutton-media {
- .background-image("images/@{button-media}");
-}
-
-#mw-editbutton-nowiki {
- .background-image("images/@{button-nowiki}");
-}
-
-// Who decided to make only this single one different than the name of the
data item?
-#mw-editbutton-signature {
- .background-image("images/@{button-sig}");
-}
-
-#mw-editbutton-hr {
- .background-image("images/@{button-hr}");
-}
diff --git
a/tests/browser/features/step_definitions/preferences_editing_steps.rb
b/tests/browser/features/step_definitions/preferences_editing_steps.rb
index f691ffd..c9bb041 100644
--- a/tests/browser/features/step_definitions/preferences_editing_steps.rb
+++ b/tests/browser/features/step_definitions/preferences_editing_steps.rb
@@ -22,10 +22,6 @@
expect(on(PreferencesEditingPage).edit_section_edit_link_element.when_present).to
exist
end
-Then(/^I can select show edit toolbar$/) do
-
expect(on(PreferencesEditingPage).show_edit_toolbar_check_element.when_present).to
exist
-end
-
Then(/^I can select show preview before edit box$/) do
expect(on(PreferencesEditingPage).preview_on_top_check_element.when_present).to
exist
end
diff --git a/tests/browser/features/support/pages/preferences_editing_page.rb
b/tests/browser/features/support/pages/preferences_editing_page.rb
index 3b54d45..25afd41 100644
--- a/tests/browser/features/support/pages/preferences_editing_page.rb
+++ b/tests/browser/features/support/pages/preferences_editing_page.rb
@@ -11,6 +11,5 @@
checkbox(:live_preview_check, id: 'mw-input-wpuselivepreview')
checkbox(:preview_on_first_check, id: 'mw-input-wppreviewonfirst')
checkbox(:preview_on_top_check, id: 'mw-input-wppreviewontop')
- checkbox(:show_edit_toolbar_check, id: 'mw-input-wpshowtoolbar')
checkbox(:unsaved_changes_check, id: 'mw-input-wpuseeditwarning')
end
--
To view, visit https://gerrit.wikimedia.org/r/317079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b05f0ca25873ad8e0b33a5e4938bef52c4e9347
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
