Merge "(bug 29898) Set cookie to force HTTPS from HTTP"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 82ab718..17a5904 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -160,6 +160,7 @@ return array(
        ),
        'jquery.highlightText' => array(
                'scripts' => 'resources/jquery/jquery.highlightText.js',
+               'dependencies' => 'jquery.mwExtension',
        ),
        'jquery.hoverIntent' => array(
                'scripts' => 'resources/jquery/jquery.hoverIntent.js',
@@ -175,10 +176,6 @@ return array(
                'styles' => 'resources/jquery/jquery.makeCollapsible.css',
                'messages' => array( 'collapsible-expand', 'collapsible-collapse' ),
        ),
-       'jquery.messageBox' => array(
-               'scripts' => 'resources/jquery/jquery.messageBox.js',
-               'styles' => 'resources/jquery/jquery.messageBox.css',
-       ),
        'jquery.mockjax' => array(
                'scripts' => 'resources/jquery/jquery.mockjax.js',
        ),
@@ -220,6 +217,7 @@ return array(
                'scripts' => 'resources/jquery/jquery.tablesorter.js',
                'styles' => 'resources/jquery/jquery.tablesorter.css',
                'messages' => array( 'sort-descending', 'sort-ascending' ),
+               'dependencies' => 'jquery.mwExtension',
        ),
        'jquery.textSelection' => array(
                'scripts' => 'resources/jquery/jquery.textSelection.js',
@@ -606,6 +604,16 @@ return array(
        'mediawiki.htmlform' => array(
                'scripts' => 'resources/mediawiki/mediawiki.htmlform.js',
        ),
+       'mediawiki.notification' => array(
+               'styles' => 'resources/mediawiki/mediawiki.notification.css',
+               'scripts' => 'resources/mediawiki/mediawiki.notification.js',
+               'dependencies' => array(
+                       'mediawiki.page.startup',
+               ),
+       ),
+       'mediawiki.notify' => array(
+               'scripts' => 'resources/mediawiki/mediawiki.notify.js',
+       ),
        'mediawiki.Title' => array(
                'scripts' => 'resources/mediawiki/mediawiki.Title.js',
                'dependencies' => 'mediawiki.util',
@@ -618,6 +626,8 @@ return array(
                'dependencies' => array(
                        'jquery.cookie',
                        'mediawiki.api',
+                       'user.options',
+                       'user.tokens',
                ),
        ),
        'mediawiki.util' => array(
@@ -625,8 +635,8 @@ return array(
                'dependencies' => array(
                        'jquery.client',
                        'jquery.cookie',
-                       'jquery.messageBox',
                        'jquery.mwExtension',
+                       'mediawiki.notify',
                ),
                'messages' => array( 'showtoc', 'hidetoc' ),
                'position' => 'top', // For $wgPreloadJavaScriptMwUtil
@@ -642,6 +652,13 @@ return array(
                ),
                'position' => 'top',
        ),
+       'mediawiki.action.edit.preview' => array(
+               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.preview.js',
+               'dependencies' => array(
+                       'jquery.form',
+                       'jquery.spinner',
+               ),
+       ),
        'mediawiki.action.history' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
                'group' => 'mediawiki.action.history',
@@ -652,7 +669,10 @@ return array(
        ),
        'mediawiki.action.view.dblClickEdit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
-               'dependencies' => 'mediawiki.util',
+               'dependencies' => array(
+                       'mediawiki.util',
+                       'mediawiki.page.startup',
+               ),
        ),
        'mediawiki.action.view.metadata' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.view.metadata.js',
@@ -674,52 +694,19 @@ return array(
        'mediawiki.language' => array(
                'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
                'languageScripts' => array(
-                       'am' => 'resources/mediawiki.language/languages/am.js',
-                       'bat-smg' => 'resources/mediawiki.language/languages/bat-smg.js',
-                       'be' => 'resources/mediawiki.language/languages/be.js',
-                       'be-tarask' => 'resources/mediawiki.language/languages/be-tarask.js',
-                       'bh' => 'resources/mediawiki.language/languages/bh.js',
                        'bs' => 'resources/mediawiki.language/languages/bs.js',
-                       'cs' => 'resources/mediawiki.language/languages/cs.js',
-                       'cu' => 'resources/mediawiki.language/languages/cu.js',
-                       'cy' => 'resources/mediawiki.language/languages/cy.js',
                        'dsb' => 'resources/mediawiki.language/languages/dsb.js',
                        'fi' => 'resources/mediawiki.language/languages/fi.js',
-                       'fr' => 'resources/mediawiki.language/languages/fr.js',
                        'ga' => 'resources/mediawiki.language/languages/ga.js',
-                       'gd' => 'resources/mediawiki.language/languages/gd.js',
-                       'gv' => 'resources/mediawiki.language/languages/gv.js',
                        'he' => 'resources/mediawiki.language/languages/he.js',
-                       'hr' => 'resources/mediawiki.language/languages/hr.js',
                        'hsb' => 'resources/mediawiki.language/languages/hsb.js',
                        'hu' => 'resources/mediawiki.language/languages/hu.js',
                        'hy' => 'resources/mediawiki.language/languages/hy.js',
-                       'ksh' => 'resources/mediawiki.language/languages/ksh.js',
                        'la' => 'resources/mediawiki.language/languages/la.js',
-                       'ln' => 'resources/mediawiki.language/languages/ln.js',
-                       'lt' => 'resources/mediawiki.language/languages/lt.js',
-                       'lv' => 'resources/mediawiki.language/languages/lv.js',
-                       'mg' => 'resources/mediawiki.language/languages/mg.js',
-                       'mk' => 'resources/mediawiki.language/languages/mk.js',
-                       'mo' => 'resources/mediawiki.language/languages/mo.js',
-                       'mt' => 'resources/mediawiki.language/languages/mt.js',
-                       'nso' => 'resources/mediawiki.language/languages/nso.js',
                        'os' => 'resources/mediawiki.language/languages/os.js',
-                       'pl' => 'resources/mediawiki.language/languages/pl.js',
-                       'ro' => 'resources/mediawiki.language/languages/ro.js',
                        'ru' => 'resources/mediawiki.language/languages/ru.js',
-                       'se' => 'resources/mediawiki.language/languages/se.js',
-                       'sh' => 'resources/mediawiki.language/languages/sh.js',
-                       'sk' => 'resources/mediawiki.language/languages/sk.js',
                        'sl' => 'resources/mediawiki.language/languages/sl.js',
-                       'sma' => 'resources/mediawiki.language/languages/sma.js',
-                       'sr-ec' => 'resources/mediawiki.language/languages/sr-ec.js',
-                       'sr-el' => 'resources/mediawiki.language/languages/sr-el.js',
-                       'sr' => 'resources/mediawiki.language/languages/sr.js',
-                       'ti' => 'resources/mediawiki.language/languages/ti.js',
-                       'tl' => 'resources/mediawiki.language/languages/tl.js',
                        'uk' => 'resources/mediawiki.language/languages/uk.js',
-                       'wa' => 'resources/mediawiki.language/languages/wa.js',
                ),
                'dependencies' => array(
                                'mediawiki.language.data',
@@ -781,7 +768,9 @@ return array(
                'dependencies' => array(
                        'mediawiki.page.startup',
                        'mediawiki.api.watch',
-                       'mediawiki.util'
+                       'mediawiki.util',
+                       'mediawiki.notify',
+                       'jquery.mwExtension',
                ),
                'messages' => array(
                        'watch',
@@ -919,12 +908,6 @@ return array(
                'dependencies' => 'mediawiki.legacy.wikibits',
                'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
        ),
-       'mediawiki.legacy.preview' => array(
-               'scripts' => 'common/preview.js',
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
-               'dependencies' => 'mediawiki.legacy.wikibits',
-       ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'common/protect.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],