Robert Vogel has submitted this change and it was merged.

Change subject: Fix for new ExtJS RL implementation
......................................................................


Fix for new ExtJS RL implementation

As some BlueSpice main components relay on it we will need to check ix
ExtJS is available or make sure by using mw.loader.using

Pacth Set 2: Bypassing jenkins

Change-Id: I71589e6fc9b394c3042f998d06efbbbce60263e1
TODO: The standard message dialogs may be a problem...
---
M resources/Resources.php
M resources/bluespice/bs.tools.js
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/resources/Resources.php b/resources/Resources.php
index 9b8567c..a0adf91 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -42,8 +42,7 @@
                'bs-one-unit-ago',
                'bs-now',
                'blanknamespace', //MediaWiki
-       ),
-       'position' => 'bottom' // available since r85616
+       )
 ) + $aResourceModuleTemplate;
 
 $wgResourceModules['ext.bluespice.styles'] = array(
diff --git a/resources/bluespice/bs.tools.js b/resources/bluespice/bs.tools.js
index 9daee58..bc17c7f 100644
--- a/resources/bluespice/bs.tools.js
+++ b/resources/bluespice/bs.tools.js
@@ -14,6 +14,8 @@
                        overflowY: 'auto'
                };
 
-               Ext.create('Ext.tip.ToolTip', conf);
+               mw.using( 'ext.bluespice.extjs' ).done(function() {
+                       Ext.create( 'Ext.tip.ToolTip', conf );
+               });
        });
 });
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/248818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I71589e6fc9b394c3042f998d06efbbbce60263e1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to