jenkins-bot has submitted this change and it was merged.
Change subject: Stop treating ApexTheme class unfairly and make it proper
......................................................................
Stop treating ApexTheme class unfairly and make it proper
Change-Id: I2fa819c5647df237f4949017554010c2dd68a04b
---
M bin/testsuitegenerator.rb
M demos/demo.js
A php/themes/ApexTheme.php
M src/themes/apex/ApexTheme.js
4 files changed, 26 insertions(+), 5 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/testsuitegenerator.rb b/bin/testsuitegenerator.rb
index ecd9d2b..20a6801 100644
--- a/bin/testsuitegenerator.rb
+++ b/bin/testsuitegenerator.rb
@@ -16,8 +16,8 @@
testable_classes = classes
.reject{|c| c[:abstract] } # can't test abstract classes
- .reject{|c| !c[:parent] || c[:parent] == 'ElementMixin' } #
can't test abstract
- .reject{|c| %w[Element Widget Layout Theme
MediaWikiTheme].include? c[:name] } # no toplevel
+ .reject{|c| !c[:parent] || c[:parent] == 'ElementMixin' ||
c[:parent] == 'Theme' } # can't test abstract
+ .reject{|c| %w[Element Widget Layout Theme].include? c[:name] }
# no toplevel
.select{|c| c[:methods][0][:params].empty? } # only without
params :(
# values to test for each type
diff --git a/demos/demo.js b/demos/demo.js
index b5d58bd..58b2b2b 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -98,11 +98,11 @@
OO.ui.Demo.static.themes = {
mediawiki: {
fileSuffix: '-mediawiki',
- theme: OO.ui.MediaWikiTheme || OO.ui.Theme
+ theme: OO.ui.MediaWikiTheme
},
apex: {
fileSuffix: '-apex',
- theme: OO.ui.ApexTheme || OO.ui.Theme
+ theme: OO.ui.ApexTheme
}
};
diff --git a/php/themes/ApexTheme.php b/php/themes/ApexTheme.php
new file mode 100644
index 0000000..e812736
--- /dev/null
+++ b/php/themes/ApexTheme.php
@@ -0,0 +1,6 @@
+<?php
+
+namespace OOUI;
+
+class ApexTheme extends Theme {
+}
diff --git a/src/themes/apex/ApexTheme.js b/src/themes/apex/ApexTheme.js
index ac58a4a..157dfb6 100644
--- a/src/themes/apex/ApexTheme.js
+++ b/src/themes/apex/ApexTheme.js
@@ -1,3 +1,18 @@
+/**
+ * @class
+ * @extends OO.ui.Theme
+ *
+ * @constructor
+ */
+OO.ui.ApexTheme = function OoUiApexTheme() {
+ // Parent constructor
+ OO.ui.ApexTheme.super.call( this );
+};
+
+/* Setup */
+
+OO.inheritClass( OO.ui.ApexTheme, OO.ui.Theme );
+
/* Instantiation */
-OO.ui.theme = new OO.ui.Theme();
+OO.ui.theme = new OO.ui.ApexTheme();
--
To view, visit https://gerrit.wikimedia.org/r/189344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fa819c5647df237f4949017554010c2dd68a04b
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
