Merge "Fix TextContent::preSaveTransform() return type"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index a022c6d..d2a06b7 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1030,6 +1030,9 @@ return array(
                'skinStyles' => array(
                        'vector' => 'skins/vector/special.preferences.less',
                ),
+               'messages' => array(
+                       'prefs-tabs-navigation-hint',
+               ),
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js',
@@ -1185,4 +1188,15 @@ return array(
                ),
                'position' => 'top',
        ),
+
+       /* OOJS */
+       // WARNING: oojs is NOT COMPATIBLE with older browsers and
+       // WILL BREAK if loaded in browsers that don't support ES5
+       'oojs' => array(
+               'scripts' => array(
+                       'resources/oojs/oojs.js',
+               ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
+
 );