Merge r110853

This commit is contained in:
Sam Reed 2012-02-07 16:37:08 +00:00
parent 157c495a9e
commit b5c998d1ee
Notes: Gabriel Wicke 2012-02-27 16:40:01 +00:00

View file

@ -53,6 +53,7 @@ $wgResourceModules += array(
'messages' => array( 'messages' => array(
'visualeditor-feedback-prompt', 'visualeditor-feedback-prompt',
'visualeditor-feedback-dialog-title', 'visualeditor-feedback-dialog-title',
'visualeditor-sandbox-title',
), ),
'dependencies' => array( 'dependencies' => array(
'ext.visualEditor.sandbox', 'ext.visualEditor.sandbox',
@ -64,8 +65,10 @@ $wgResourceModules += array(
'scripts' => array( 'scripts' => array(
'sandbox/sandbox.js', 'sandbox/sandbox.js',
), ),
'messages' => array(
'visualeditorsandbox',
),
'styles' => 'sandbox/sandbox.css', 'styles' => 'sandbox/sandbox.css',
'messages' => array(),
'dependencies' => array( 'dependencies' => array(
'ext.visualEditor.ve', 'ext.visualEditor.ve',
), ),
@ -148,6 +151,15 @@ $wgResourceModules += array(
'dependencies' => array( 'dependencies' => array(
'jquery', 'jquery',
), ),
'messages' => array(
'visualeditor-tooltip-wikitext',
'visualeditor-tooltip-json',
'visualeditor-tooltip-html',
'visualeditor-tooltip-render',
'visualeditor-tooltip-history',
'visualeditor-tooltip-help',
'visualeditor',
),
) )
); );