jenkins-bot has submitted this change and it was merged.

Change subject: Fix dependency order
......................................................................


Fix dependency order

Change-Id: I5959883f0c7e7fccedd39ba05451a15e4fadf2ba
---
M UiFeedback.php
1 file changed, 10 insertions(+), 3 deletions(-)

Approvals:
  TheDJ: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UiFeedback.php b/UiFeedback.php
index ee31e06..90293b0 100644
--- a/UiFeedback.php
+++ b/UiFeedback.php
@@ -35,12 +35,18 @@
 $wgGroupPermissions[ 'UIFeedback_Administator' ][ 'write_uifeedback' ] = true;
 
 // Register modules
+$wgResourceModules[ 'jquery.htmlfeedback' ] = array(
+       'scripts'       => array(
+               'resources/lib.canvas-to-blob.js',
+               'resources/lib.html2canvas.js',
+               'resources/lib.jquery.htmlfeedback.js',
+       ),
+       'localBasePath' => __DIR__,
+       'remoteExtPath' => 'UIFeedback',
+);
 $wgResourceModules[ 'ext.uiFeedback' ] = array(
        'scripts'       => array(
                'resources/ext.uiFeedback.js',
-               'resources/lib.jquery.htmlfeedback.js',
-               'resources/lib.html2canvas.js',
-               'resources/lib.canvas-to-blob.js',
        ),
        'styles'        => array( 'resources/ext.uiFeedback.css' ),
        'dependencies'  => array(
@@ -50,6 +56,7 @@
                'jquery.cookie',
                'jquery.ui.draggable',
                'jquery.client',
+               'jquery.htmlfeedback',
 
                'mediawiki.api',
                'mediawiki.util',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5959883f0c7e7fccedd39ba05451a15e4fadf2ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UIFeedback
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
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