jenkins-bot has submitted this change and it was merged.
Change subject: FlexiSkin: Changed RL module dependencies
......................................................................
FlexiSkin: Changed RL module dependencies
* Requireing the own module does not make much sense
* The ExtJS loader does not need to be set with a default path.
ExtensionManager does this already.
Change-Id: I007df25906f1c93c3a4d6044668867b5204c0c11
---
M Flexiskin/Flexiskin.setup.php
M Flexiskin/resources/bluespice.flexiskin.js
2 files changed, 4 insertions(+), 9 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flexiskin/Flexiskin.setup.php b/Flexiskin/Flexiskin.setup.php
index 084e54d..bd77a38 100644
--- a/Flexiskin/Flexiskin.setup.php
+++ b/Flexiskin/Flexiskin.setup.php
@@ -18,9 +18,6 @@
'styles' => array(
'extensions/BlueSpiceExtensions/Flexiskin/resources/bluespice.flexiskin.css',
),
- 'dependencies' => array(
- 'ext.bluespice.extjs'
- ),
'messages' => array(
'bs-flexiskin-labelname',
'bs-flexiskin-labeldesc',
diff --git a/Flexiskin/resources/bluespice.flexiskin.js
b/Flexiskin/resources/bluespice.flexiskin.js
index a594cb2..edc604f 100644
--- a/Flexiskin/resources/bluespice.flexiskin.js
+++ b/Flexiskin/resources/bluespice.flexiskin.js
@@ -1,7 +1,5 @@
-mw.loader.using('ext.bluespice.flexiskin', function() {
- Ext.Loader.setPath('BS.Flexiskin', bs.em.paths.get('Flexiskin') +
'/resources/BS.Flexiskin');
-
- Ext.create('BS.Flexiskin.Panel', {
- renderTo: 'bs-flexiskin-container'
- });
+mw.loader.using('ext.bluespice.extjs', function() {
+ Ext.create('BS.Flexiskin.Panel', {
+ renderTo: 'bs-flexiskin-container'
+ });
});
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/247270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I007df25906f1c93c3a4d6044668867b5204c0c11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Tweichart <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
