jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354620 )
Change subject: [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme
......................................................................
[BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme
Deprecated since v0.22.0.
Change-Id: I931638ceb91afbb678868f108ffcd65481adda6f
---
M Gruntfile.js
M README.md
M bin/testsuitegenerator.rb
M build/modules.yaml
D php/themes/MediaWikiTheme.php
D src/themes/mediawiki/MediaWikiTheme.js
D src/themes/mediawiki/theme.less
7 files changed, 1 insertion(+), 41 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/Gruntfile.js b/Gruntfile.js
index d825bf4..ad7c4cb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,7 +7,6 @@
pkg = grunt.file.readJSON( 'package.json' ),
themes = {
wikimediaui: 'WikimediaUI', // Do not change this line
or you'll break `grunt add-theme`
- mediawiki: 'MediaWiki', // Backwards-compatibility
wrapper
apex: 'Apex'
},
lessFiles = {},
diff --git a/README.md b/README.md
index 6ee88c4..b893890 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@
* One of `oojs-ui-wikimediaui.css` or `oojs-ui-apex.css`, containing
theme-specific styles; and
* One of `oojs-ui-wikimediaui.js` or `oojs-ui-apex.js`, containing
theme-specific code
-You can load additional icon packs from files named
`oojs-ui-mediawiki-icons-*.css` or `oojs-ui-apex-icons-*.css`.
+You can load additional icon packs from files named
`oojs-ui-wikimediaui-icons-*.css` or `oojs-ui-apex-icons-*.css`.
The remaining files make it possible to load only parts of the whole library.
diff --git a/bin/testsuitegenerator.rb b/bin/testsuitegenerator.rb
index 3770661..5c7da37 100644
--- a/bin/testsuitegenerator.rb
+++ b/bin/testsuitegenerator.rb
@@ -21,7 +21,6 @@
testable_classes = classes
.reject{|c| c[:abstract] } # can't test abstract classes
.reject{|c| !c[:parent] || c[:trait] || c[:parent] == 'Theme' }
# can't test abstract
- .reject{|c| c[:name] == 'MediaWikiTheme' } # can't test abstract
.reject{|c| %w[Element Widget Layout Theme].include? c[:name] }
# no toplevel
make_class_instance_placeholder = lambda do |klass, config|
diff --git a/build/modules.yaml b/build/modules.yaml
index 209ceb9..009d003 100644
--- a/build/modules.yaml
+++ b/build/modules.yaml
@@ -260,12 +260,6 @@
],
"theme": "wikimediaui"
},
- "oojs-ui-mediawiki-icons-location": {
- "styles": [
- "src/themes/wikimediaui/icons-location.json"
- ],
- "theme": "wikimediaui"
- },
"oojs-ui-{theme}-icons-user": {
"styles": [
"src/themes/{theme}/icons-user.json"
@@ -277,12 +271,6 @@
]
},
"oojs-ui-wikimediaui-icons-wikimedia": {
- "styles": [
- "src/themes/wikimediaui/icons-wikimedia.json"
- ],
- "theme": "wikimediaui"
- },
- "oojs-ui-mediawiki-icons-wikimedia": {
"styles": [
"src/themes/wikimediaui/icons-wikimedia.json"
],
diff --git a/php/themes/MediaWikiTheme.php b/php/themes/MediaWikiTheme.php
deleted file mode 100644
index 1c37218..0000000
--- a/php/themes/MediaWikiTheme.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-namespace OOUI;
-
-class MediaWikiTheme extends WikimediaUITheme {
-}
diff --git a/src/themes/mediawiki/MediaWikiTheme.js
b/src/themes/mediawiki/MediaWikiTheme.js
deleted file mode 100644
index 590628a..0000000
--- a/src/themes/mediawiki/MediaWikiTheme.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @class
- * @extends OO.ui.WikimediaUITheme
- *
- * @constructor
- */
-OO.ui.MediaWikiTheme = function OoUiMediaWikiTheme() {
- // Parent constructor
- OO.ui.MediaWikiTheme.parent.call( this );
-};
-
-/* Setup */
-
-OO.inheritClass( OO.ui.MediaWikiTheme, OO.ui.WikimediaUITheme );
-
-/* Instantiation */
-
-OO.ui.theme = new OO.ui.MediaWikiTheme();
diff --git a/src/themes/mediawiki/theme.less b/src/themes/mediawiki/theme.less
deleted file mode 100644
index d6609e9..0000000
--- a/src/themes/mediawiki/theme.less
+++ /dev/null
@@ -1,2 +0,0 @@
-// Deprecated theme entry point.
-@import '../wikimediaui/theme';
--
To view, visit https://gerrit.wikimedia.org/r/354620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I931638ceb91afbb678868f108ffcd65481adda6f
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
