dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "mediawiki.action.edit.preview: Restore trigger LivePreviewPrepare"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
88965d0
..
ccb842d
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-44,6
+44,7
@@
return array(
'user.cssprefs' => array( 'class' => 'ResourceLoaderUserCSSPrefsModule' ),
// Populate mediawiki.user placeholders with information about the current user
'user.cssprefs' => array( 'class' => 'ResourceLoaderUserCSSPrefsModule' ),
// Populate mediawiki.user placeholders with information about the current user
+ 'user.defaults' => array( 'class' => 'ResourceLoaderUserDefaultsModule' ),
'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
@@
-121,14
+122,9
@@
return array(
/* jQuery */
'jquery' => array(
/* jQuery */
'jquery' => array(
- 'scripts' => ( $GLOBALS['wgIncludejQueryMigrate'] ?
- array(
- 'resources/lib/jquery/jquery.js',
- 'resources/lib/jquery/jquery.migrate.js'
- ) :
- array(
- 'resources/lib/jquery/jquery.js'
- ) ),
+ 'scripts' => array(
+ 'resources/lib/jquery/jquery.js',
+ ),
'raw' => true,
'targets' => array( 'desktop', 'mobile' ),
),
'raw' => true,
'targets' => array( 'desktop', 'mobile' ),
),
@@
-762,6
+758,7
@@
return array(
'zh-cn' => 'resources/lib/moment/locale/zh-cn.js',
'zh-tw' => 'resources/lib/moment/locale/zh-tw.js',
),
'zh-cn' => 'resources/lib/moment/locale/zh-cn.js',
'zh-tw' => 'resources/lib/moment/locale/zh-tw.js',
),
+ 'targets' => array( 'desktop', 'mobile' ),
),
/* MediaWiki */
),
/* MediaWiki */
@@
-778,6
+775,7
@@
return array(
'dependencies' => array(
'mediawiki.hlist',
),
'dependencies' => array(
'mediawiki.hlist',
),
+ 'position' => 'top',
),
'mediawiki.template' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.template.js',
),
'mediawiki.template' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.template.js',
@@
-786,6
+784,7
@@
return array(
'mediawiki.apipretty' => array(
'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
'targets' => array( 'desktop', 'mobile' ),
'mediawiki.apipretty' => array(
'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
'targets' => array( 'desktop', 'mobile' ),
+ 'position' => 'top',
),
'mediawiki.api' => array(
'scripts' => 'resources/src/mediawiki.api/mediawiki.api.js',
),
'mediawiki.api' => array(
'scripts' => 'resources/src/mediawiki.api/mediawiki.api.js',
@@
-949,6
+948,7
@@
return array(
'jquery.client',
'jquery.placeholder',
'jquery.suggestions',
'jquery.client',
'jquery.placeholder',
'jquery.suggestions',
+ 'jquery.getAttrs',
'mediawiki.api',
),
),
'mediawiki.api',
),
),
@@
-1011,6
+1011,7
@@
return array(
'class' => 'ResourceLoaderEditToolbarModule',
'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js',
'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
'class' => 'ResourceLoaderEditToolbarModule',
'scripts' => 'resources/src/mediawiki.toolbar/toolbar.js',
'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
+ 'position' => 'top',
),
/* MediaWiki Action */
),
/* MediaWiki Action */
@@
-1020,7
+1021,6
@@
return array(
'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
'dependencies' => array(
'mediawiki.action.edit.styles',
'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
'dependencies' => array(
'mediawiki.action.edit.styles',
- 'mediawiki.toolbar',
'jquery.textSelection',
'jquery.byteLimit',
),
'jquery.textSelection',
'jquery.byteLimit',
),
@@
-1044,7
+1044,23
@@
return array(
'dependencies' => array(
'jquery.form',
'jquery.spinner',
'dependencies' => array(
'jquery.form',
'jquery.spinner',
+ 'mediawiki.api',
'mediawiki.action.history.diff',
'mediawiki.action.history.diff',
+ 'mediawiki.util',
+ 'mediawiki.jqueryMsg',
+ ),
+ 'messages' => array(
+ 'otherlanguages',
+ 'tooltip-p-lang',
+ 'summary-preview',
+ 'parentheses',
+ ),
+ ),
+ 'mediawiki.action.edit.stash' => array(
+ 'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
+ 'dependencies' => array(
+ 'jquery.getAttrs',
+ 'mediawiki.api',
),
),
'mediawiki.action.history' => array(
),
),
'mediawiki.action.history' => array(
@@
-1612,12
+1628,12
@@
return array(
'resources/lib/oojs-ui/oojs-ui.js',
),
'skinScripts' => array(
'resources/lib/oojs-ui/oojs-ui.js',
),
'skinScripts' => array(
- 'default' => 'resources/lib/oojs-ui/oojs-ui-apex.js',
- 'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.js',
+ 'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.js',
),
),
- 'skinStyles' => array(
- 'default' => 'resources/lib/oojs-ui/oojs-ui-apex.svg.css',
- 'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
+ 'dependencies' => array(
+ 'es5-shim',
+ 'oojs',
+ 'oojs-ui.styles',
),
'messages' => array(
'ooui-dialog-message-accept',
),
'messages' => array(
'ooui-dialog-message-accept',
@@
-1633,9
+1649,13
@@
return array(
'ooui-toolgroup-collapse',
'ooui-toolgroup-expand',
),
'ooui-toolgroup-collapse',
'ooui-toolgroup-expand',
),
- 'dependencies' => array(
- 'es5-shim',
- 'oojs',
+ 'targets' => array( 'desktop', 'mobile' ),
+ ),
+
+ 'oojs-ui.styles' => array(
+ 'position' => 'top',
+ 'skinStyles' => array(
+ 'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
),
'targets' => array( 'desktop', 'mobile' ),
),
),
'targets' => array( 'desktop', 'mobile' ),
),