Fixed bug that cause ResourceLoader to generate mediaWiki.loader.implement calls...

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index 61077fc..889fbbb 100644 (file)
--- a/includes/ResourceLoader.php
+++ b/includes/ResourceLoader.php
@@ -323,7 +323,11 @@ class ResourceLoader {
                        } else if ( $context->getOnly() === 'messages' ) {
                                echo "mediaWiki.msg.set( $messages );\n";
                        } else {
-                               $styles = FormatJson::encode( $styles );
+                               if ( count( $styles ) ) {
+                                       $styles = FormatJson::encode( $styles );
+                               } else {
+                                       $styles = 'null';
+                               }
                                echo "mediaWiki.loader.implement( '$name', function() {{$scripts}},\n$styles,\n$messages );\n";
                        }
                }

diff --git a/resources/Resources.php b/resources/Resources.php
index a9c970b..09d5e94 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -80,24 +80,22 @@ return array(
        ) ),
        'jquery.ui.widget' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.widget.js',
-               'dependencies' => 'jquery.ui.core',
        ) ),
        'jquery.ui.mouse' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.mouse.js',
-               'dependencies' => 'jquery',
+               'dependencies' => 'jquery.ui.widget',
        ) ),
        'jquery.ui.position' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.position.js',
-               'dependencies' => 'jquery',
        ) ),
        // Interactions
        'jquery.ui.draggable' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.draggable.js',
-               'dependencies' => 'jquery.ui.core',
+               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget' ),
        ) ),
        'jquery.ui.droppable' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.droppable.js',
-               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.draggable' ),
+               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable' ),
        ) ),
        'jquery.ui.resizable' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.resizable.js',
@@ -105,7 +103,7 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.resizable.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.resizable.css',
                ),
-               'dependencies' => 'jquery.ui.core',
+               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
        ) ),
        'jquery.ui.selectable' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.selectable.js',
@@ -113,16 +111,16 @@ return array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.selectable.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.selectable.css',
                ),
-               'dependencies' => 'jquery.ui.core',
+               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
        ) ),
        'jquery.ui.sortable' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.sortable.js',
-               'dependencies' => 'jquery.ui.core',
+               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
        ) ),
        // Widgets
        'jquery.ui.accordion' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.accordion.js',
-               'dependencies' => 'jquery.ui.core',
+               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
                'skinStyles' => array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.accordion.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.accordion.css',
@@ -208,7 +206,15 @@ return array(
        ) ),
        'jquery.ui.dialog' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.dialog.js',
-               'dependencies' => 'jquery.ui.core',
+               'dependencies' => array(
+                       'jquery.ui.core',
+                       'jquery.ui.widget',
+                       'jquery.ui.button',
+                       'jquery.ui.draggable',
+                       'jquery.ui.mouse',
+                       'jquery.ui.position',
+                       'jquery.ui.resizable',
+               ),
                'skinStyles' => array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.dialog.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.dialog.css',
@@ -216,7 +222,7 @@ return array(
        ) ),
        'jquery.ui.progressbar' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.progressbar.js',
-               'dependencies' => 'jquery.ui.core',
+               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
                'skinStyles' => array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.progressbar.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.progressbar.css',
@@ -232,7 +238,7 @@ return array(
        ) ),
        'jquery.ui.tabs' => new ResourceLoaderFileModule( array(
                'scripts' => 'resources/jquery.ui/jquery.ui.tabs.js',
-               'dependencies' => 'jquery.ui.core',
+               'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
                'skinStyles' => array(
                        'default' => 'resources/jquery.ui/themes/default/jquery.ui.tabs.css',
                        'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.tabs.css',

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index feba576..282c52a 100644 (file)
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -360,7 +360,7 @@ window.mediaWiki = new ( function( $ ) {
                        // Add style sheet to document
                        if ( typeof registry[module].style === 'string' && registry[module].style.length ) {
                                $( 'head' ).append( '<style type="text/css">' + registry[module].style + '</style>' );
-                       } else if ( typeof registry[module].style === 'object' ) {
+                       } else if ( typeof registry[module].style === 'object' && !( registry[module].style instanceof Array ) ) {
                                for ( var media in registry[module].style ) {
                                        $( 'head' ).append(
                                                '<style type="text/css" media="' + media + '">' + registry[module].style[media] + '</style>'
@@ -600,7 +600,7 @@ window.mediaWiki = new ( function( $ ) {
                        registry[module].state = 'loaded';
                        // Attach components
                        registry[module].script = script;
-                       if ( typeof style === 'string' || typeof style === 'object' ) {
+                       if ( typeof style === 'string' || typeof style === 'object' && !( style instanceof Array ) ) {
                                registry[module].style = style;
                        }
                        if ( typeof localization === 'object' ) {