From cfa70ea6d003ae69d52aad67a543912449c71e00 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 20 Oct 2016 14:26:22 -0700 Subject: [PATCH] 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 several extensions available for this purpose if they need the functionality. For over half a decade MediaWiki's tarball has included the 2010-era replacement for this feature, WikiEditor. We are now working on replacing even that, with the 2013-era visual editor, a mode of which is the forthcoming 2017-era wikitext editor, and several more specialised editors like CodeEditor. Beyond this, the core editor toolbar is ancient, un-loved, and is used only exceptionally rarely, mostly by accident. It is unhelpful to give implicitly this as the primary editor for MediaWiki just because we've not removed it from core 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 old core preference, which was intended to govern whether this old toolbar should be shown, has since mutated into whether the to run the EditPageBeforeEditToolbar hook. The hook is used by several extensions to provide toolbars in lieu of the core one. This preference has been, in practice, a very confusing preference for MediaWiki users, who have to interact with quite similar preferences to toggle their real editor which sit next to this one on the preferences page. Consequently, this preference is also removed. The code could be made into an extension for those (very few) users of MediaWiki who might want to keep on using it. However, the author will offer their services but not their encouragement in said undertaking. Bug: T30856 Bug: T32795 Change-Id: I2b05f0ca25873ad8e0b33a5e4938bef52c4e9347 --- RELEASE-NOTES-1.32 | 20 ++ autoload.php | 1 - docs/hooks.txt | 9 +- includes/DefaultSettings.php | 1 - includes/EditPage.php | 157 +------------ .../ResourceLoaderEditToolbarModule.php | 44 ---- languages/Language.php | 16 -- languages/i18n/en.json | 1 - languages/i18n/qqq.json | 1 - languages/messages/MessagesAr.php | 8 - languages/messages/MessagesBe_tarask.php | 6 - languages/messages/MessagesDe.php | 5 - languages/messages/MessagesEn.php | 17 -- languages/messages/MessagesFa.php | 8 - languages/messages/MessagesKsh.php | 4 - languages/messages/MessagesRu.php | 6 - maintenance/dictionary/mediawiki.dic | 1 - maintenance/jsduck/categories.json | 4 - resources/Resources.php | 6 - .../images/ar/button_bold.png | Bin 522 -> 0 bytes .../images/ar/button_headline.png | Bin 424 -> 0 bytes .../images/ar/button_italic.png | Bin 474 -> 0 bytes .../images/ar/button_link.png | Bin 523 -> 0 bytes .../images/ar/button_nowiki.png | Bin 842 -> 0 bytes .../images/be-tarask/button_bold.png | Bin 499 -> 0 bytes .../images/be-tarask/button_italic.png | Bin 509 -> 0 bytes .../images/be-tarask/button_link.png | Bin 396 -> 0 bytes .../images/de/button_bold.png | Bin 230 -> 0 bytes .../images/de/button_italic.png | Bin 257 -> 0 bytes .../images/en/button_bold.png | Bin 226 -> 0 bytes .../images/en/button_extlink.png | Bin 435 -> 0 bytes .../images/en/button_headline.png | Bin 430 -> 0 bytes .../mediawiki.toolbar/images/en/button_hr.png | Bin 200 -> 0 bytes .../images/en/button_image.png | Bin 483 -> 0 bytes .../images/en/button_italic.png | Bin 234 -> 0 bytes .../images/en/button_link.png | Bin 275 -> 0 bytes .../images/en/button_media.png | Bin 707 -> 0 bytes .../images/en/button_nowiki.png | Bin 321 -> 0 bytes .../images/en/button_sig.png | Bin 904 -> 0 bytes .../images/fa/button_bold.png | Bin 436 -> 0 bytes .../images/fa/button_headline.png | Bin 374 -> 0 bytes .../images/fa/button_italic.png | Bin 485 -> 0 bytes .../images/fa/button_link.png | Bin 444 -> 0 bytes .../images/fa/button_nowiki.png | Bin 842 -> 0 bytes .../src/mediawiki.toolbar/images/ksh/LICENSE | 7 - .../images/ksh/button_italic.png | Bin 357 -> 0 bytes .../src/mediawiki.toolbar/images/ru/LICENSE | 17 -- .../images/ru/button_bold.png | Bin 242 -> 0 bytes .../images/ru/button_italic.png | Bin 396 -> 0 bytes .../images/ru/button_link.png | Bin 270 -> 0 bytes resources/src/mediawiki.toolbar/toolbar.js | 208 ------------------ resources/src/mediawiki.toolbar/toolbar.less | 42 ---- 52 files changed, 34 insertions(+), 555 deletions(-) delete mode 100644 includes/resourceloader/ResourceLoaderEditToolbarModule.php delete mode 100644 resources/src/mediawiki.toolbar/images/ar/button_bold.png delete mode 100644 resources/src/mediawiki.toolbar/images/ar/button_headline.png delete mode 100644 resources/src/mediawiki.toolbar/images/ar/button_italic.png delete mode 100644 resources/src/mediawiki.toolbar/images/ar/button_link.png delete mode 100644 resources/src/mediawiki.toolbar/images/ar/button_nowiki.png delete mode 100644 resources/src/mediawiki.toolbar/images/be-tarask/button_bold.png delete mode 100644 resources/src/mediawiki.toolbar/images/be-tarask/button_italic.png delete mode 100644 resources/src/mediawiki.toolbar/images/be-tarask/button_link.png delete mode 100644 resources/src/mediawiki.toolbar/images/de/button_bold.png delete mode 100644 resources/src/mediawiki.toolbar/images/de/button_italic.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_bold.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_extlink.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_headline.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_hr.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_image.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_italic.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_link.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_media.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_nowiki.png delete mode 100644 resources/src/mediawiki.toolbar/images/en/button_sig.png delete mode 100644 resources/src/mediawiki.toolbar/images/fa/button_bold.png delete mode 100644 resources/src/mediawiki.toolbar/images/fa/button_headline.png delete mode 100644 resources/src/mediawiki.toolbar/images/fa/button_italic.png delete mode 100644 resources/src/mediawiki.toolbar/images/fa/button_link.png delete mode 100644 resources/src/mediawiki.toolbar/images/fa/button_nowiki.png delete mode 100644 resources/src/mediawiki.toolbar/images/ksh/LICENSE delete mode 100644 resources/src/mediawiki.toolbar/images/ksh/button_italic.png delete mode 100644 resources/src/mediawiki.toolbar/images/ru/LICENSE delete mode 100644 resources/src/mediawiki.toolbar/images/ru/button_bold.png delete mode 100644 resources/src/mediawiki.toolbar/images/ru/button_italic.png delete mode 100644 resources/src/mediawiki.toolbar/images/ru/button_link.png delete mode 100644 resources/src/mediawiki.toolbar/toolbar.js delete mode 100644 resources/src/mediawiki.toolbar/toolbar.less diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32 index 4ae590d215..0d8b4688a4 100644 --- a/RELEASE-NOTES-1.32 +++ b/RELEASE-NOTES-1.32 @@ -392,6 +392,26 @@ because of Phabricator reports. * ApiUsageException::getCodeString() (deprecated in 1.29) * ApiUsageException::getMessageArray() (deprecated in 1.29) * Class UsageException, deprecated in 1.29, has been removed. +* MediaWiki no longer has a 'JavaScript-powered' wikitext toolbar built in. The + old "bulletin board style toolbar", known as "the 2006 wikitext editor", has + been removed, and instead sysadmins will be required to choose one (or more) + of the several extensions available for this purpose if they need the + functionality. The MediaWiki "tarball" releases have included the replacement + extension for this, the WikiEditor extension aka "the 2010 wikitext editor", + for many years now. As part of this, several parts of MediaWiki have been + removed or simplified: + * The user option 'showtoolbar' (shown as "Show edit toolbar") is no longer + available; if an extension adds a toolbar via the EditPageBeforeEditToolbar + hook, it will be shown; extensions should provide a specific user preference + to disable themselves as needed. + * The public methods Language::getImageFile() and ::getImageFiles(), and the + related specification of $imageFiles within individual languages' code file, + as well as the referenced static media assets, all of which were only used + inside MediaWiki itself for providing the icons for the old toolbar, have + been removed without explicit deprecation. + * The internal ResourceLoader module "mediawiki.toolbar", which is unused + except by MediaWiki itself and back-compatibility code, has been removed. + * The internal ResourceLoaderEditToolbarModule class has been removed. === Deprecations in 1.32 === * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit diff --git a/autoload.php b/autoload.php index 3e6b4a20b7..125216b82c 100644 --- a/autoload.php +++ b/autoload.php @@ -1211,7 +1211,6 @@ $wgAutoloadLocalClasses = [ 'ResourceLoader' => __DIR__ . '/includes/resourceloader/ResourceLoader.php', 'ResourceLoaderClientHtml' => __DIR__ . '/includes/resourceloader/ResourceLoaderClientHtml.php', 'ResourceLoaderContext' => __DIR__ . '/includes/resourceloader/ResourceLoaderContext.php', - 'ResourceLoaderEditToolbarModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderEditToolbarModule.php', 'ResourceLoaderFileModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderFileModule.php', 'ResourceLoaderFilePath' => __DIR__ . '/includes/resourceloader/ResourceLoaderFilePath.php', 'ResourceLoaderForeignApiModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderForeignApiModule.php', diff --git a/docs/hooks.txt b/docs/hooks.txt index fd7b3005d7..5105cee78b 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1471,11 +1471,10 @@ textarea in the edit form. &$buttons: Array of edit buttons "Save", "Preview", "Live", and "Diff" &$tabindex: HTML tabindex of the last edit check/button -'EditPageBeforeEditToolbar': Allows modifying the edit toolbar above the -textarea in the edit form. -Hook subscribers can return false to avoid the default toolbar code being -loaded. -&$toolbar: The toolbar HTML +'EditPageBeforeEditToolbar': Allow adding an edit toolbar above the textarea in +the edit form. +&$toolbar: The toolbar HTML, initially an empty `
` +Hook subscribers can return false to have no toolbar HTML be loaded. 'EditPageCopyrightWarning': Allow for site and per-namespace customization of contribution/copyright notice. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 6a1ed925da..443346135d 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4887,7 +4887,6 @@ $wgDefaultUserOptions = [ 'rows' => 25, // @deprecated since 1.29 No longer used in core 'showhiddencats' => 0, 'shownumberswatching' => 1, - 'showtoolbar' => 1, 'skin' => false, 'stubthreshold' => 0, 'thumbsize' => 5, diff --git a/includes/EditPage.php b/includes/EditPage.php index 7143c3f324..bb4243a9ab 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -2479,13 +2479,6 @@ ERROR; $out->addModuleStyles( 'mediawiki.editfont.styles' ); $user = $this->context->getUser(); - if ( $user->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). - $out->addModules( 'mediawiki.toolbar' ); - } if ( $user->getOption( 'uselivepreview' ) ) { $out->addModules( 'mediawiki.action.edit.preview' ); @@ -2788,13 +2781,8 @@ ERROR; $out->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' ) { $out->wrapWikiMsg( "
\n$1\n
", 'deletedwhileediting' ); } @@ -2932,7 +2920,7 @@ ERROR; $out->addHTML( $editConflictHelper->getEditFormHtmlBeforeContent() ); } - if ( !$this->mTitle->isUserConfigPage() && $showToolbar && $user->getOption( 'showtoolbar' ) ) { + if ( !$this->mTitle->isUserConfigPage() ) { $out->addHTML( self::getEditToolbar( $this->mTitle ) ); } @@ -4088,145 +4076,20 @@ ERROR; } /** - * 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|null $title Title object for the page being edited (optional) - * @return string + * @return string|null */ public static function getEditToolbar( $title = null ) { - global $wgOut, $wgEnableUploads, $wgForeignFileRepos; - - $imagesAvailable = $wgEnableUploads || count( $wgForeignFileRepos ); - $showSignature = true; - if ( $title ) { - $showSignature = MWNamespace::wantSignatures( $title->getNamespace() ); - } - - $contLang = MediaWikiServices::getInstance()->getContentLanguage(); - - /** - * $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' => '[[' . $contLang->getNsText( NS_FILE ) . ':', - 'close' => ']]', - 'sample' => wfMessage( 'image_sample' )->text(), - 'tip' => wfMessage( 'image_tip' )->text(), - ] : false, - $imagesAvailable ? [ - 'id' => 'mw-editbutton-media', - 'open' => '[[' . $contLang->getNsText( NS_MEDIA ) . ':', - 'close' => ']]', - 'sample' => wfMessage( 'media_sample' )->text(), - 'tip' => wfMessage( 'media_tip' )->text(), - ] : false, - [ - 'id' => 'mw-editbutton-nowiki', - 'open' => "", - 'close' => "", - '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 = ''; - 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'], - ]; + $startingToolbar = '
'; + $toolbar = $startingToolbar; - $script .= Xml::encodeJsCall( - 'mw.toolbar.addButton', - $params, - ResourceLoader::inDebugMode() - ); - } - - $toolbar = '
'; - - if ( Hooks::run( 'EditPageBeforeEditToolbar', [ &$toolbar ] ) ) { - // Only add the old toolbar cruft to the page payload if the toolbar has not - // been over-written by a hook caller - $nonce = $wgOut->getCSPNonce(); - $wgOut->addScript( Html::inlineScript( - ResourceLoader::makeInlineCodeWithModule( 'mediawiki.toolbar', $script ), - $nonce - ) ); + if ( !Hooks::run( 'EditPageBeforeEditToolbar', [ &$toolbar ] ) ) { + return null; }; - - return $toolbar; + // Don't add a pointless `
` to the page unless a hook caller populated it + return ( $toolbar === $startingToolbar ) ? null : $toolbar; } /** diff --git a/includes/resourceloader/ResourceLoaderEditToolbarModule.php b/includes/resourceloader/ResourceLoaderEditToolbarModule.php deleted file mode 100644 index 2a6af71502..0000000000 --- a/includes/resourceloader/ResourceLoaderEditToolbarModule.php +++ /dev/null @@ -1,44 +0,0 @@ -getLanguage() ); - foreach ( $language->getImageFiles() as $key => $value ) { - $vars[$key] = CSSMin::serializeStringValue( $value ); - } - return $vars; - } -} diff --git a/languages/Language.php b/languages/Language.php index fb78f13fc5..eabd0fef59 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -814,22 +814,6 @@ class Language { return self::$dataCache->getItem( $this->mCode, 'datePreferenceMigrationMap' ); } - /** - * @param string $image - * @return array|null - */ - function getImageFile( $image ) { - return self::$dataCache->getSubitem( $this->mCode, 'imageFiles', $image ); - } - - /** - * @return array - * @since 1.24 - */ - public function getImageFiles() { - return self::$dataCache->getItem( $this->mCode, 'imageFiles' ); - } - /** * @return array */ diff --git a/languages/i18n/en.json b/languages/i18n/en.json index ea6305423b..3929b8d940 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 a17cfca049..9cb4de0788 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -213,7 +213,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/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php index 60be21c105..3a3529ab26 100644 --- a/languages/messages/MessagesAr.php +++ b/languages/messages/MessagesAr.php @@ -439,11 +439,3 @@ $specialPageAliases = [ * Arabic trails too. */ $linkTrail = '/^([a-zء-ي]+)(.*)$/sDu'; - -$imageFiles = [ - 'button-bold' => 'ar/button_bold.png', - 'button-italic' => 'ar/button_italic.png', - 'button-link' => 'ar/button_link.png', - 'button-headline' => 'ar/button_headline.png', - 'button-nowiki' => 'ar/button_nowiki.png', -]; diff --git a/languages/messages/MessagesBe_tarask.php b/languages/messages/MessagesBe_tarask.php index 00295fef87..21bd60c1ac 100644 --- a/languages/messages/MessagesBe_tarask.php +++ b/languages/messages/MessagesBe_tarask.php @@ -239,9 +239,3 @@ $separatorTransformTable = [ $minimumGroupingDigits = 2; $linkTrail = '/^([абвгґджзеёжзійклмнопрстуўфхцчшыьэюяćčłńśšŭźža-z]+)(.*)$/sDu'; - -$imageFiles = [ - 'button-bold' => 'be-tarask/button_bold.png', - 'button-italic' => 'be-tarask/button_italic.png', - 'button-link' => 'be-tarask/button_link.png', -]; diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php index 5227eba842..d3167cc977 100644 --- a/languages/messages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -352,8 +352,3 @@ $bookstoreList = [ $separatorTransformTable = [ ',' => '.', '.' => ',' ]; $linkTrail = '/^([äöüßa-z]+)(.*)$/sDu'; - -$imageFiles = [ - 'button-bold' => 'de/button_bold.png', - 'button-italic' => 'de/button_italic.png', -]; diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 7a7370f81e..4c078a61d6 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -531,23 +531,6 @@ $linkTrail = '/^([a-z]+)(.*)$/sD'; */ $linkPrefixCharset = 'a-zA-Z\\x{80}-\\x{10ffff}'; -/** - * List of filenames for some ui images that can be overridden per language - * basis if needed. - */ -$imageFiles = [ - 'button-bold' => 'en/button_bold.png', - 'button-italic' => 'en/button_italic.png', - 'button-link' => 'en/button_link.png', - 'button-extlink' => 'en/button_extlink.png', - 'button-headline' => 'en/button_headline.png', - 'button-image' => 'en/button_image.png', - 'button-media' => 'en/button_media.png', - 'button-nowiki' => 'en/button_nowiki.png', - 'button-sig' => 'en/button_sig.png', - 'button-hr' => 'en/button_hr.png', -]; - /** * A list of messages to preload for each request. * Here we add messages that are needed for a typical anonymous parser cache hit. diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php index bda468cba4..a78233f439 100644 --- a/languages/messages/MessagesFa.php +++ b/languages/messages/MessagesFa.php @@ -412,11 +412,3 @@ $dateFormats = [ # Harakat are intentionally not included in the linkTrail. Their addition should # take place after enough tests. $linkTrail = "/^([ابپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیآأئؤة‌]+)(.*)$/sDu"; - -$imageFiles = [ - 'button-bold' => 'fa/button_bold.png', - 'button-italic' => 'fa/button_italic.png', - 'button-link' => 'fa/button_link.png', - 'button-headline' => 'fa/button_headline.png', - 'button-nowiki' => 'fa/button_nowiki.png', -]; diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php index c96c94df57..0687a42442 100644 --- a/languages/messages/MessagesKsh.php +++ b/languages/messages/MessagesKsh.php @@ -201,7 +201,3 @@ $magicWords = [ 'language' => [ '0', '#SHPROOCH:', '#SPROCH:', '#SPRACHE:', '#LANGUAGE:' ], 'hiddencat' => [ '1', '__VERSHTOCHE_SAACHJRUPP__', '__VERSTECKTE_KATEGORIE__', '__WARTUNGSKATEGORIE__', '__HIDDENCAT__' ], ]; - -$imageFiles = [ - 'button-italic' => 'ksh/button_italic.png', -]; diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php index b513648810..fbd8096d80 100644 --- a/languages/messages/MessagesRu.php +++ b/languages/messages/MessagesRu.php @@ -425,10 +425,4 @@ $minimumGroupingDigits = 2; $fallback8bitEncoding = 'windows-1251'; $linkPrefixExtension = false; -$imageFiles = [ - 'button-bold' => 'ru/button_bold.png', - 'button-italic' => 'ru/button_italic.png', - 'button-link' => 'ru/button_link.png', -]; - $linkTrail = '/^([a-zабвгдеёжзийклмнопрстуфхцчшщъыьэюя]+)(.*)$/sDu'; diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic index a0177b1737..0345ad62a3 100644 --- a/maintenance/dictionary/mediawiki.dic +++ b/maintenance/dictionary/mediawiki.dic @@ -3697,7 +3697,6 @@ showredirs showreviewed showsizediff showtoc -showtoolbar showunreviewed shtml si diff --git a/maintenance/jsduck/categories.json b/maintenance/jsduck/categories.json index 7ff972e8dd..54c1d38805 100644 --- a/maintenance/jsduck/categories.json +++ b/maintenance/jsduck/categories.json @@ -38,10 +38,6 @@ "mw.visibleTimeout" ] }, - { - "name": "Actions", - "classes": ["mw.toolbar"] - }, { "name": "API", "classes": ["mw.Api*", "mw.ForeignApi*"] diff --git a/resources/Resources.php b/resources/Resources.php index 9603830b84..7d2ed144df 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1394,12 +1394,6 @@ return [ 'dependencies' => 'jquery.cookie', 'targets' => [ 'desktop', 'mobile' ], ], - 'mediawiki.toolbar' => [ - 'class' => ResourceLoaderEditToolbarModule::class, - 'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js', - 'styles' => 'resources/src/mediawiki.toolbar/toolbar.less', - 'dependencies' => 'jquery.textSelection', - ], 'mediawiki.experiments' => [ 'scripts' => 'resources/src/mediawiki.experiments.js', 'targets' => [ 'desktop', 'mobile' ], 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 50e2ff034d39d6edba8407f59605c049b25290d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 522 zcmV+l0`>igP))){P+G6R*2mfNMN3pkPg!nxhlP@(#n|!0*z;m+ zdY-Pt!PM@nywe8<2(rW5z|-x$&**xFmH+?%GB-Z0zSXV0)NXi(C@e9du*JH~=eEe= z93LV90Ra>j836(UE;BiOik!2?;F+nvE;2b88y|y_q_D%?bAXYmyw$D0*rBq@H$6qA zw$7-#)kaQPi<_{cw$Pul%Nrjfp0Ue&ik>DaF`BK%XLN-H1_za=z?Z7TaetC3FE^2+ zypyKDji0y_78(Wz2rxE2TV{4@c#Cv{mwu0>g_f?0oV1Xmy?cwIGB`m41Oyo!Aw^GH zfs(3*n6ZSGu6l~0Z+??-fR%uesdb2>VQu600001`Nkl;525>j1pUi^X3GfVV=PFYnK9)~MC=o?%$^R(bSfVL~%Sxy#!n>3(ryQODx$&3D)P zx!Uk1<~ygm0RWzV?%M&!X5~IGd!|P@1U_tl$y56_YOQk=Imou{0o24DXI$F&EC2ui M07*qoM6N<$f&m%)G5`Po 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 2e3e7819ace53620201aaf70dffb69dfbc0dc05b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 424 zcmV;Z0ayNsP)U6BWJB=t4+Q zy3FLd&F3{bL8rLSv&P^^P+E|mw6Me7TxN89iJPsz*l~P~Xmf(7yVZh_rCMZiqqfkJ zqq|U9W}dOjov_JDQ(u~`#}ybGM^Idss>CQQGf!D&lcvBpKuT6(agd|ENm5{LeUXNk zu~lGj1O*0yl&p1#qgZBpEi^woPis0&Xf2qk3;+NCc1c7*RCobo%7Xy}F%SjNpFz}r zmxl(98|wu_!o(0u$&_FhRDu$8;X_Qp5!`SsI!7r3VWO9JNeN*PW-b{BJQ0zSfFQHy z-Aa=7XD}rmef&2t;zHQPnWS;3XQr086$?DvPyr*D{K>?6;5ZUsVggeKeggm{G#Ur3 So--K$0000)b7C3?HL;%a(#@w&*-SP&S!Cc zGdMpG5)?^LS-Q>VlcKgTH9P?V0t5vGqqNJj#^8*buO1;LUTAiaptYyD(W<=Fp|Z(? zk)&8*ZewkHu*2Pyq`C?V4TO@Wt-si9c!-Uhu&BG$Uut-dpS7d5&{AA!lccLQDz^4410JGB`mXBr21pz$h*?PFQA;qrD_4FM^b-hM2KTR%CUEqicPZ zC$Qzq0001uNkl+e|iCu<$+Pyc^crUdL`$fUp47qA?z6?_n5WmNx!|9#+W-K7cZ0;e&**V{zAQ1BLrSHVq|;(+wz|#d zx60)}N2FqGwjm^vtGwS)S*^3i;GC?~1_pzUoy?M=&onul2MB~fN20L9-L1gf9UzYc z1%f9mls7z_Dle97cexxNk2E=(t-sigoyj{vo+~hxD=(EUGnk~c(=j%gGdP;4yVXQY zqCrTZqqfjiV5(hcuAZ^WYT~0j5|V`m#V~)q{5D$z=xT> zg_gXJp}>=-z&k^l4G)EoqrG#2uwHAZV{xj6n6Y(;qi(P)Z~y=Rok>JNRCobx&czwS zFaSg0r&z&z_bCnDoyrXU!mf_LLE?WTvV>j`jOVN;*yM>958h@LOIN^D$^R9cO#r=H z%k;E#157#dTOl}@;BC|j=?r$+jT3CVtq zJ+5juMb7~kjf!H7)ONNW?qCYEW0IA?1hkzsKf#zJ1|vvwmzM>ouEX1k zo9JF?_aG$1*z?txtojlZ;ck4z)b59rrxh0(IzULl&*!2|Ka88Ni<+*6CoSy+1)*YZJmw$R0MgW@k@E;Kv@1O<(rwWpxC z_YM%Nnz5R#$I(t&;WRwlJVojxDWsdTgp{fqA0t>|ao;vR&QoBQs>GV5zVs3m>LVzL zo3cPiQv(A8GB`oSUv2FkBblbZlcvC=i=pcuBiJi4XIN)INK`>eRdRrolBK_&l&j${ zHl&TCkfXhlpt;CVUHA$N;6c)Lrp`P|8HksP_R-!3U!;^!58yxj$9z-~ zZ})c3-}gMJf#BV{U+xA^RYz~%eGmJuJ%6})Ea18O`iD7#*WUA%=z~OP9Jn}m9#r!< zcyC`)I6r)8Re2s=xMQ-K=lY?wcltQ2EwAlr$W+VOlc`iJQ=u>AiY*!YiGH;#8yEjE UKLb99*Z=?k07*qoM6N<$f=Pg$-T(jq 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 df6700dd6282e0b7867d394d8539c7959c718205..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmVnj@ZCgu2^B z73A3~I&$%DyAGY4P^fAk!qI^_qfp~)7A~HB3Wm>XUk~x$zG5aMqbAJUcltIYpx3Tl zCnqN>Dm1{-T&FH9t5Xz{i!jFY{(@7=q^Jb_|8;ub8VgF3W-T7Q_1AyI%mWl0!Bpg& zqu#1b`>s9u)T`eBtFT_buE_}`g$q-i%6#$KT_eU#KeBCcXy9KW&?`S}tTt{WOm(HA zLeFZ{1YJG@y+~0_dr~lZ4N4DUaDqQnSR pc4kIk*$XTrgOr}G!;qe`p|Z%q)b59rrT_o{d4-i>YIjLd zTfNZfz0c@iX?2{czqrZbLrPNt0Rdxedb-W$IzUJU1_!swZD=#$%2MBzLnzP2> z6c-sKDKD6)z8M=I5E2xOo3OCM-J`V4Mow6Qk)#U@4wR(1t-siQi=HYjH3I|$78o01 zZF{J@)mmh7MNC(qvda?{7^Sz-qqfjDJw{n$ab$3Sp0Udp8XX%SBbTYc7#bd(u*sUO z$C9MIIY3EGS7c^$gqNzsa)FdpU~i3|w+IOe93Ul=rodBPY;b;(L`_*}c8HLpy@r^v zb%>({eH4NK006B?L_t(|0hG-(QpP|SfZ=zEKGAov~uCd7g>WivnCyBP)Xc7DEhn}M-5L>CF?uilrOjo$mY=I#oO?>BT= z9q%4(aCa7M(e{OWRlVP+u50|#!@ls!i40wmJrdDf^^%qG_I$qc=8^XCI(yROz-U(2 z&v(|t@L{}6tTURhjmPi&)L#hSwt6ilSp5$G_U9jzY`1W(00000NkvXXu0mjf0DJ9J 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 d3dd88e6c8290dfc47fed09cdc7075a9f616412b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmV;70dxL|P)lHq}z0c^Zz~n4a z!-1RGs=nh_cg_GSxVp{fOl`}1me;Ps2~-LS*mt-sg+0FS_pl0059lL_t(|0hEum0Ru1$1jP_<;r(}W zoh~0{x1Qx08nQm006zu=(^44v&P`C!`-dF*r>bJqqfkVvCEpR z$Cs+alcvCsqrHZhv2}=}Qh(td00014NklTlu$q zNUK3p8k#3NSMW3x>vVl~_`U!v8{5AAbNIHOJ`Bc~ulHES*PYBsRtpET307*qoM6N<$g2+N}*#H0l 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 5e3cd111f18a97c2de250e392a4ac5c4805cd833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmV+c0sj7pP)m006zu=(^44v&P`C!`-dF*r>bJqqfkVvCEpR z$Cs+alcvCsqrHZhv2}=}Qh(td0001VNkllA5Cdm|^Z&o%T5k`{>BhoK z81fqb@r2h1zCzDe@#?Plu3x|il}6tK(OWXm006zu=(^44v&P`C!`-dF*r>bJqqfkVvCEpR z$Cs+alcvCsqrHZhv2}=}Qh(td00010Nkl(?0RP_J-db8(z&`110002qNklbJcLi5PZkKwr~eVv)c5);nlBW zzenHq3n4Ih6p?)kx@uSo!F?$)z4F#f4jeuA^5~1!Evs zp_E$R3se=oWWcA7e!VZxC`)=0g0JA2XO<&L=;>7P^dEd9P3hy*d*H-`l 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 7d64a164004038aad4c2afedf08ca2308017ae98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 430 zcmV;f0a5;mP)E;Ny#v{PJXy3OZMS!9fxud~MB6c!nxu(a&mHp zn6W%WPshi{b%>)|YJV_gs!JK@ISV+g_ne#@1&FW^aKF{ArMQYM660FtB5k$ z5i(dBVnE`6FfIQw5^7jyYfYmZAPnw-M?l2hes3>gf3TAW&mcPA;Gjb$yfT^o2r5TG z>p9^h82mnxzjPAJ!u>fNaiQ4-SS^H?U`$;tT}Rxsxuff>fV+@uaNEW={u>)7CSYR* Y0NTSDH9h005&!@I07*qoM6N<$f=vIpNdN!< 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 47e1ca401333d7d462d8f863a84e7470c26e5212..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmV;(05|`MP)*en6Z$fy_2TEm#V~?t;e3R%cHi?sJqpzzu2(D-LuBvy3Oak&*;I_ z?!?&h$=vqRXQXTS#DurU0`CjOs9aRw#^>;RW~ zdWe5Q7v#gC{y#*V5r;Sz4)MX}Uo3!;k@^3BY{CG9HyleZ?7`gt0000 C>0NRF 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 69192965c486ee622029868ae669b9e31095f615..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)iy! zB?(yEi>Ucy64!;`UPcHDo711e$Nk}QHJH`&mt){dam4^GzkVA7bvvk1SM3-mwPF}! zJUlrZaXUHi=`#GkQa3Ff+T2nQ3wXs>plxb87%7^*Eln5zK~Ne3ATQ~d25vq#s(PdN zN>l%)g9FtP6YwAe%mfisiR{i1mk!jbs#o^5{P8yu2_m&3MlVw3D2nGo@hn}QJUx%f zfGcYeCeVwW!8IEPpEwzMsN3odfo^|nZg zGJ2n%*eud{w)&`PVvp(Ql>XO6m3Wt!#b(AC6B{O)#4!Z$N*xyp&?)_w1`(2D^LVz> z90x$=GORjvfR*V4@ycGM-rKTsdZ Z_!o+yEEP?{bshi!002ovPDHLkV1m=p*J=O& 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 820efe26bd5c54c165d6a648712f94938db16d61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmVm006zu=(^44v&P`C!`-dF*r>bJqqfkVvCEpR z$Cs+alcvCsqrHZhv2}=}Qh(td00018NkleEpJ`tD->3r^hmfEV}Q5X9dXM3LtSN#uM$-sZpGf%~>z kTbsIYbp7M(eBC;Ke!Kx7l!^gpKL7v#07*qoM6N<$f^&*+`Tzg` 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 5dd362cf6433c29d5cb26e99bb5797763af798ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 275 zcmV+u0qp*XP)bJqqfkVvCEpR z$Cs+alcvCsqrHZhv2}=}<=XEP0001nNkl)jMxxyTfz4 Zwg)0!Ih4cVto8r^002ovPDHLkV1ne4feiov 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 80c3156c6cbfb0f575a0534bb6192462cf4a0d4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 707 zcmV;!0zCbRP)AX06_O;mT$4@r((cc-;9GW@4F7N!160L+HOHT-7XeDB@)Iy!U*cd4&kF@!e&Rv*UbQ>L7Cgd{%9zC-%; zVBuAO6|H~y3{0OpW2;6vk12HmI`RwY=IaBCaP9fPipn($FginwF>@R#o(*=8k~m6} z80`C=F*oZx6H(!OU`6hjQ9BvTR6paaa*Mmwc5-2&pA^SZNK&BpyKzIg*&7DVdBBQG z*UMN-=EL;N6HdNBq`YXc|@7!3|NFFMlkk2zzU;HnetRyRBWLh z=jzEb%r@2fTrVMsp)^UJx{t7~?g8&~EX}_OyZcwhTQR|73Q6?0 zf91@1Z4s@bF`mt(cL#NI^Wv2`9?)QAP!afFxN7@6(>~)UrsT1tCNVVp)7YI?7}2wx z9l`F7U}sxEQ&OP8N{`rm9tLD&b8UoDrqDmC&iCAlj*1;YF2G7nKXL(PefRFJU}u-Vwa!Al z{cWs&3$RkzqdJe~0m%a0w!O_;o*K|-I5mCh|2nXe-^e=;4!d_2Z_}%KYq|yJIj|B} p*mE1AUrg}r1tZYA8DLvbI0fg$T*J&oAGQDh002ovPDHLkV1fjfP>uiq 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 05a977af5aba1917a8ebb9b340397b5159ecff64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmV-H0lxl;P)P)t-s|NsAM zdyv=X{zzbZ(&YXB002W-c*)%M#Mtw})b72{=l}o!y3Oaa#^A8S-L1dasJqppw$Prj z%bKmnm#V~*rofP+y@r^vb%>*fCfEJ|006N`L_t(|0d0r{0s}!1!nVTMocsS@+EBNw z07?Hjq;&kpDW&rjJ-E#*r5yB*#mzs~tKy5Ikct=bz?Y>|zK}fem87VQe;HNy8XYwR zArGm>H?9qYjR-z`E42}=pKg^O-$`9W$3r_T@V(Uc5xsS|Sl|a~7$U44F<9V7#5jh3 zBF5{+Pm{#sgNWP2&+{xZn+OJpUzSBcz@y?<&^s3R?TQ}UCVv0NDIHGPFQ>x=VI2|w TrT6Yv00000NkvXXu0mjfS(}=Q 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 2cbcc0b31a423969f5c772163982c5357e233cd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmV;319$w1P)nVxIkW`5b-qyPAP^WU0( z+10(S%848Qu0`;cYFFj()qlVMJim@#N`+JInaqikTrxFab7S^X_wiHB~b{~9q z&-*KTuRPy#?uo;>P+yWp!hTPphXroR+LoH>PVj8(9R6U%cJj&VbQWW7>Ut8zJ#t+& zN2Q08yN(40Crnx{tPWoXEBXUBR~dI5Ypg4$dwC?M)=M;JZO3j~PdqRmy>B^uv#>C$ zX;=lm-}S1Z((Xg$ve+1AK*C1;%3uVE70%ho-IPUN>Vq+uPlo*W5L`>lzq-1guoDx>4iF*G(G_4i8qQHxAA?E-qQm zE?Rbj$q#{*_CZvxJ@yj1Vk<97FRdGr8&6GY?3I;)+c)n(^(UrGho{Btt;ysuwH*vK zx`Rc9m0&-tAgvvu#e;x&>A*01AZ>kI2YXVyd}IbyCWp{}`wf>-Rkm!~!|kfT5`T$^ zjsZJob(SFVpMU)EE%=5NZzg42Di%*$Dsl@$qc)DJ?Bd0}yrC9Sea=9Ui-aejCVgX9yKT8B>PPd1L(c&HOrya;%VJ1NLNn5)o_j}C?e z`s~QVfgX{6;Rx&Ik$( zV|A;!sGY^tC+D&ohcvt?$AHxIE{@8^kuQS}Sm~FTqT;jN32wnLiEOpGSET=lL8(Tq zobK#uL~2vF#fE|zSQ!;b!-9iDQ!?8{dKPEqz1l}+#st##rsDO{bOwb=pd}@4DJy8; zgC$sr3XLaG|L7V;OA*n#y4c);?Cj_m8jboB)hi|?hgC7CM8=k@y5y@HTsJ1Td%+9z ez79AG3jYI-cHV{jp@B&N00007&I5;95u6)ilc_PUmo?HQ9h(io#N1=F! zpZ^bmi@A!$L);RaX*k??`^ewBIcyumf7wPbw1xn{hd1DXOA+GEg3op(gt`CByk{|A eNxoPqc(nn7tsdE5fDc3f0000%U 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 4d48a5d18fb668159503c6ccb672aabeb6946b7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmV-+0g3*JP)GCRp#NcUTuGgIJCx#amCw&?;?a((92 zr%!lvdG^VdL@CcpC=cA(4=IF$+Fjj`E=NEw=(0aG00Qg#OGI{}?n(EGLve?F1i11X U&pSl~761SM07*qoM6N<$g8IO-IRF3v 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 41098c7d719f664996adae633a4f7e2ba6eccc06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 485 zcmVQ>u%Y%(~6zywB*CrqdZ5jxsl#WNx>w!QrE`+DlWav&P`3x!N!_nqO+O zJVKyUT&)ZZhOooknW@oUXtFOfnQC>ofse$bw$~#kldZqlikZeECX!rcuTfd4IzXLs zf4iu=)smvh3k-&EeYsj>t(~vWEi#uD8H=N~&_PL{78r|dd9@1+g`Tm?AR~{7nZcT^ z$1^&ZK1G~yf3#d^tCy<8ji0|!Tcjv0k}^4$lcvCsqrHZhv2}=}TQXj#0001_Nkl%%vEoh>lDxcvq6q!;vHauEO$<9l|p2eVg9M|toeAUfB=)sTTtK6?0zyYmAG zzWnz*a&ZTiuFLS{*E+J5WgurBJwpqPP{V^fc?7pt1+U+D2Dil8@_WB8!W);j{mZL{ b@Cnx&T9zcQ(HmDm00000NkvXXu0mjf^XTdV 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 8c2d85a7aff85cc9d86d6819df6e76b2508c9216..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmV;t0Ym*z+eVmuYjo!PM?&al5_G z=q4$ZWp1~+&F8$&=&!-ymZsA(H=JZ{x3k9JgOSE-ce*4flSogdUuv_k!`)tJvTAj> zjhxCaG?}fx*l2UL3=M`wOru<8uTfd4BPNolyVY7`ts*6n3k-%WGM9UazJ`{>qqfkP zs>`0S%Rfh+nytq^MVwq{tCy<8lBB|ppTLKizJ->&kDJJrMQ`_41N znl8LxK=?(tGPcEfn0__n6Ye}(xp4RA@HE~5>{n?{>5L@1Cw>dBXx^y%Ij0|_UYzHB m&+ak2aaM~Zi;i0Af=^$)5+W$|Lys%~0000M>ouEX1k zo9JF?_aG$1*z?txtojlZ;ck4z)b59rrxh0(IzULl&*!2|Ka88Ni<+*6CoSy+1)*YZJmw$R0MgW@k@E;Kv@1O<(rwWpxC z_YM%Nnz5R#$I(t&;WRwlJVojxDWsdTgp{fqA0t>|ao;vR&QoBQs>GV5zVs3m>LVzL zo3cPiQv(A8GB`oSUv2FkBblbZlcvC=i=pcuBiJi4XIN)INK`>eRdRrolBK_&l&j${ zHl&TCkfXhlpt;CVUHA$N;6c)Lrp`P|8HksP_R-!3U!;^!58yxj$9z-~ zZ})c3-}gMJf#BV{U+xA^RYz~%eGmJuJ%6})Ea18O`iD7#*WUA%=z~OP9Jn}m9#r!< zcyC`)I6r)8Re2s=xMQ-K=lY?wcltQ2EwAlr$W+VOlc`iJQ=u>AiY*!YiGH;#8yEjE UKLb99*Z=?k07*qoM6N<$f=Pg$-T(jq diff --git a/resources/src/mediawiki.toolbar/images/ksh/LICENSE b/resources/src/mediawiki.toolbar/images/ksh/LICENSE deleted file mode 100644 index 640bbff802..0000000000 --- a/resources/src/mediawiki.toolbar/images/ksh/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ - -button_italic.png -------------------- -Source : https://commons.wikimedia.org/wiki/Image:Button_S_italic.png -License: Public domain -Author : Purodha Blissenbach, https://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 34268d9a84850898e8d1eb2b599d54a2fc26ba88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmV-r0h<1aP)bJqqfkVvCEpR z$Cs+alcvCsqrHZhv2}=}-isSG0001GNkln}F_i;W*h2Y(7| s{8^T@LlC(9OAqmXOpI^dVS+dR0Q%G&l&eTJjsO4v07*qoM6N<$f;o0^82|tP 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 44a0a741459adc47bb3f698296eee6de1fea3c9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmV;70dxL|P)gKn#vM)0_y3FOX#^8pJoh~vth=+x^x3n!XIJ3py zu*2OgF*ptm4>L0}R$XVX!`!XE*ol*%P*`M`q_sCZM5w#fsk+flS7TLOXIf%yH9JG2 zw$MLBO*A<|jF+f+gOQ%G%Y2EON>X1kI6zHQUW=Efnytr|s>G9~z>uT8hM2K+h@-4r zV>18%0Ch=3K~#7Fbc}@!1ThT2!pYnT5+tBCTfeceh5%PIo>&ykBm1bx zHv;e5={*DXcE@xlum|`5*UZJ+o$|>?(!ab6((b5 qZ2DtZ!-3Y~|Cku}9l!+p{s90D)fbciMc^a=0000bJqqfkVvCEpR z$Cs+alcvCsqrHZhv2}=}<=XEP0001iNkl+#bGrlm~F6_cB*K)t2Y;O_j29yr_(am-MLi1XqKPvXV@u`s@2!Xo?+0P_?a Uj9d-*bN~PV07*qoM6N<$g3gSGAOHXW diff --git a/resources/src/mediawiki.toolbar/toolbar.js b/resources/src/mediawiki.toolbar/toolbar.js deleted file mode 100644 index be49d26b6e..0000000000 --- a/resources/src/mediawiki.toolbar/toolbar.js +++ /dev/null @@ -1,208 +0,0 @@ -/** - * Interface for the classic edit toolbar. - * - * @class mw.toolbar - * @singleton - */ -( function () { - 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 = $( '' ).attr( { - src: button.imageFile, - alt: button.speedTip, - title: button.speedTip, - id: button.imageId || undefined, - 'class': 'mw-toolbar-editbutton' - } ); - } else { - $button = $( '
' ).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 compatibility, 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 ( !Array.isArray( buttons ) ) { - buttons = slice.call( arguments ); - } - if ( isReady ) { - buttons.forEach( function ( button ) { - insertButton( button ); - } ); - } 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. - toolbar.init = $.noop; - - // Expose API publicly - // @deprecated since MW 1.29 - mw.log.deprecate( mw, 'toolbar', toolbar, null, 'mw.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 ( Array.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 ); - } ); - } ); - -}() ); diff --git a/resources/src/mediawiki.toolbar/toolbar.less b/resources/src/mediawiki.toolbar/toolbar.less deleted file mode 100644 index 93ea294b0e..0000000000 --- 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}'); -} -- 2.20.1