Merge "Create a version of mediawiki.skinning.content for Parsoid HTML"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 0e5d087..9a13423 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -198,8 +198,10 @@ return array(
        /* jQuery */
 
        'jquery' => array(
-               'scripts' => 'resources/lib/jquery/jquery.js',
-               'debugScripts' => 'resources/lib/jquery/jquery.migrate.js',
+               'scripts' => array(
+                       'resources/lib/jquery/jquery.js',
+                       'resources/lib/jquery/jquery.migrate.js',
+               ),
                'debugRaw' => false,
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -210,7 +212,9 @@ return array(
                'scripts' => 'resources/src/jquery/jquery.accessKeyLabel.js',
                'dependencies' => array(
                        'jquery.client',
+                       'jquery.mwExtension',
                ),
+               'messages' => array( 'brackets', 'word-separator' ),
                'targets' => array( 'mobile', 'desktop' ),
        ),
        'jquery.appear' => array(
@@ -261,6 +265,7 @@ return array(
        'jquery.colorUtil' => array(
                'scripts' => 'resources/src/jquery/jquery.colorUtil.js',
        ),
+       // Use mediawiki.cookie in new code, rather than jquery.cookie.
        'jquery.cookie' => array(
                'scripts' => 'resources/lib/jquery/jquery.cookie.js',
                'targets' => array( 'desktop', 'mobile' ),
@@ -933,6 +938,12 @@ return array(
                'position' => 'top', // For $wgPreloadJavaScriptMwUtil
                'targets' => array( 'desktop', 'mobile' ),
        ),
+       'mediawiki.cookie' => array(
+               'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
+               'dependencies' => array(
+                       'jquery.cookie',
+               ),
+       ),
 
        /* MediaWiki Action */
 
@@ -993,7 +1004,7 @@ return array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.css',
                'dependencies' => array(
-                       'jquery.cookie',
+                       'mediawiki.cookie',
                        'mediawiki.jqueryMsg'
                ),
                'messages' => array(
@@ -1304,6 +1315,25 @@ return array(
                        'jquery.throttle-debounce',
                ),
        ),
+       'mediawiki.special.unwatchedPages' => array(
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css',
+               'messages' => array(
+                       'addedwatchtext-short',
+                       'removedwatchtext-short',
+                       'unwatch',
+                       'unwatching',
+                       'watch',
+                       'watcherrortext',
+                       'watching',
+               ),
+               'dependencies' => array(
+                       'mediawiki.api',
+                       'mediawiki.api.watch',
+                       'mediawiki.notify',
+                       'mediawiki.Title'
+               ),
+       ),
        'mediawiki.special.javaScriptTest' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.javaScriptTest.js',
                'messages' => array_merge( Skin::getSkinNameMessages(), array(
@@ -1430,6 +1460,10 @@ return array(
                        'ooui-outline-control-move-up',
                        'ooui-outline-control-remove',
                        'ooui-toolbar-more',
+                       'ooui-dialog-confirm-title',
+                       'ooui-dialog-confirm-default-prompt',
+                       'ooui-dialog-confirm-default-ok',
+                       'ooui-dialog-confirm-default-cancel'
                ),
                'dependencies' => array(
                        'oojs',