Merge "Make image pagination not require a page load."

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
old mode 100644 (file)
new mode 100755 (executable)
index d6852c3..f13f414
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -100,8 +100,8 @@ return array(
        ),
        'skins.vector.js' => array(
                'scripts' => array(
-                       'vector/vector.js',
                        'vector/collapsibleTabs.js',
+                       'vector/vector.js',
                ),
                'position' => 'top',
                'dependencies' => 'jquery.delayedBind',
@@ -719,12 +719,25 @@ return array(
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
+                       'mediawiki.action.edit.styles',
                        'mediawiki.legacy.wikibits',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
                'position' => 'top',
        ),
+       'mediawiki.action.edit.styles' => array(
+               'styles' => 'resources/mediawiki.action/mediawiki.action.edit.styles.css',
+               'position' => 'top',
+       ),
+       'mediawiki.action.edit.collapsibleFooter' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
+               'styles' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
+               'dependencies' => array(
+                       'jquery.makeCollapsible',
+                       'mediawiki.icon',
+               ),
+       ),
        'mediawiki.action.edit.preview' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.preview.js',
                'dependencies' => array(
@@ -843,6 +856,9 @@ return array(
 
        /* MediaWiki Page */
 
+       'mediawiki.page.gallery' => array(
+               'scripts' => 'resources/mediawiki.page/mediawiki.page.gallery.js',
+       ),
        'mediawiki.page.ready' => array(
                'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
@@ -899,6 +915,10 @@ return array(
                        'watcherrortext',
                ),
        ),
+       'mediawiki.page.image.pagination' => array(
+               'scripts' => 'resources/mediawiki.page/mediawiki.page.image.pagination.js',
+               'dependencies' => array( 'jquery.spinner' )
+       ),
 
        /* MediaWiki Special pages */
 
@@ -985,6 +1005,7 @@ return array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.createAccount.js',
                'messages' => array(
                        'createacct-captcha',
+                       'createacct-emailrequired',
                        'createacct-imgcaptcha-ph'
                ),
                'dependencies' => 'mediawiki.jqueryMsg',
@@ -1071,6 +1092,8 @@ return array(
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => array(
+                       'mediawiki.api',
+                       'mediawiki.Title',
                        'mediawiki.legacy.wikibits',
                        'mediawiki.util',
                ),