wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-24 02:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split ext.visualEditor.experimental into specific modules

Browse source 
Math, hiero, language and alienextension are now each in their own
module. Kept the experimental module for backwards compatibility,
it just has all of its constituent modules as dependencies.

MWExperimentalTool.js was split up, and ExperimentalTool.js was
renamed to LanguageInspectorTool.js.

Change-Id: I63b49dfbdb59dc9a494049553cc0c01e89e48826
This commit is contained in:
Roan Kattouw 2013-10-22 00:30:49 +02:00
parent 324b04137b
commit 412eb34de8
9 changed files with 159 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
VisualEditor.php
View file

@ -337,6 +337,7 @@ $wgResourceModules += array(
've-mw/dm/nodes/ve.dm.MWTransclusionNode.js',
've-mw/dm/nodes/ve.dm.MWReferenceListNode.js',
've-mw/dm/nodes/ve.dm.MWReferenceNode.js',
've-mw/dm/nodes/ve.dm.MWExtensionNode.js',
've/dm/annotations/ve.dm.LinkAnnotation.js',
've-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js',
@ -414,6 +415,7 @@ $wgResourceModules += array(
've-mw/ce/nodes/ve.ce.MWTransclusionNode.js',
've-mw/ce/nodes/ve.ce.MWReferenceListNode.js',
've-mw/ce/nodes/ve.ce.MWReferenceNode.js',
've-mw/ce/nodes/ve.ce.MWExtensionNode.js',
've/ce/annotations/ve.ce.LinkAnnotation.js',
've-mw/ce/annotations/ve.ce.MWExternalLinkAnnotation.js',
@ -535,6 +537,7 @@ $wgResourceModules += array(
've/ui/inspectors/ve.ui.AnnotationInspector.js',
've/ui/inspectors/ve.ui.LinkInspector.js',
've-mw/ui/inspectors/ve.ui.MWLinkInspector.js',
've-mw/ui/inspectors/ve.ui.MWExtensionInspector.js',
),
'styles' => array(
// ce
@ -712,33 +715,19 @@ $wgResourceModules += array(
),
),
'ext.visualEditor.experimental' => $wgVisualEditorResourceTemplate + array(
'ext.visualEditor.language' => $wgVisualEditorResourceTemplate + array(
'scripts' => array(
've-mw/dm/nodes/ve.dm.MWExtensionNode.js',
've-mw/ce/nodes/ve.ce.MWExtensionNode.js',
've-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js',
've-mw/ce/nodes/ve.ce.MWAlienExtensionNode.js',
've-mw/dm/nodes/ve.dm.MWHieroNode.js',
've-mw/ce/nodes/ve.ce.MWHieroNode.js',
've-mw/dm/nodes/ve.dm.MWMathNode.js',
've-mw/ce/nodes/ve.ce.MWMathNode.js',
've-mw/ui/inspectors/ve.ui.MWExtensionInspector.js',
've-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js',
've-mw/ui/inspectors/ve.ui.MWHieroInspector.js',
've-mw/ui/inspectors/ve.ui.MWMathInspector.js',
've/dm/annotations/ve.dm.LanguageAnnotation.js',
've/ce/annotations/ve.ce.LanguageAnnotation.js',
've/ui/inspectors/ve.ui.LanguageInspector.js',
've/ui/tools/ve.ui.LanguageInspectorTool.js',
've/ui/widgets/ve.ui.LanguageInputWidget.js',
've/ui/tools/ve.ui.ExperimentalTool.js',
've-mw/ui/tools/ve.ui.MWExperimentalTool.js',
),
'dependencies' => array(
'ext.visualEditor.core',
'jquery.uls',
),
'messages' => array(
// VE messages needed by code that is only in experimental mode
'visualeditor-languageinspector-title',
'visualeditor-languageinspector-block-tooltip',
'visualeditor-languageinspector-block-tooltip-rtldirection',
@ -749,25 +738,55 @@ $wgResourceModules += array(
'visualeditor-languageinspector-block-tooltip',
'visualeditor-languageinspector-block-tooltip-rtldirection',
'visualeditor-annotationbutton-language-tooltip',
),
),
'ext.visualEditor.mwalienextension' => $wgVisualEditorResourceTemplate + array(
'scripts' => array(
've-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js',
've-mw/ce/nodes/ve.ce.MWAlienExtensionNode.js',
've-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js',
've-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js',
),
'dependencies' => array(
'ext.visualEditor.core',
),
'messages' => array(
'visualeditor-mwalienextensioninspector-title',
'visualeditor-mwhieroinspector-title',
),
),
'ext.visualEditor.mwmath' => $wgVisualEditorResourceTemplate + array(
'scripts' => array(
've-mw/dm/nodes/ve.dm.MWMathNode.js',
've-mw/ce/nodes/ve.ce.MWMathNode.js',
've-mw/ui/inspectors/ve.ui.MWMathInspector.js',
've-mw/ui/tools/ve.ui.MWMathInspectorTool.js',
),
'dependencies' => array(
'ext.visualEditor.core',
),
'messages' => array(
'visualeditor-mwmathinspector-title',
),
),
'ext.visualEditor.icons-raster' => $wgVisualEditorResourceTemplate + array(
'styles' => array(
've/ui/styles/ve.ui.Icons-raster.css',
've-mw/ui/styles/ve.ui.Icons-raster.css',
'ext.visualEditor.mwhiero' => $wgVisualEditorResourceTemplate + array(
'scripts' => array(
've-mw/dm/nodes/ve.dm.MWHieroNode.js',
've-mw/ce/nodes/ve.ce.MWHieroNode.js',
've-mw/ui/inspectors/ve.ui.MWHieroInspector.js',
've-mw/ui/tools/ve.ui.MWHieroInspectorTool.js',
),
'dependencies' => array(
'ext.visualEditor.core',
),
'messages' => array(
'visualeditor-mwhieroinspector-title',
),
),
'ext.visualEditor.icons-vector' => $wgVisualEditorResourceTemplate + array(
'styles' => array(
've/ui/styles/ve.ui.Icons-vector.css',
've-mw/ui/styles/ve.ui.Icons-vector.css',
),
),
'ext.visualEditor.syntaxHighlight' => $wgVisualEditorResourceTemplate + array(
'ext.visualEditor.mwsyntaxHighlight' => $wgVisualEditorResourceTemplate + array(
'scripts' => array(
'syntaxhighlight/ve.dm.MWSyntaxHighlightNode.js',
'syntaxhighlight/ve.ce.MWSyntaxHighlightNode.js',
@ -789,6 +808,29 @@ $wgResourceModules += array(
'syntaxhighlight/styles/ve.ui.MWSyntaxHighlight.css',
),
),
'ext.visualEditor.experimental' => array(
'dependencies' => array(
'ext.visualEditor.mwmath',
'ext.visualEditor.mwhiero',
'ext.visualEditor.language',
'ext.visualEditor.mwalienextension',
//'ext.visualEditor.mwsyntaxHighlight',
),
),
'ext.visualEditor.icons-raster' => $wgVisualEditorResourceTemplate + array(
'styles' => array(
've/ui/styles/ve.ui.Icons-raster.css',
've-mw/ui/styles/ve.ui.Icons-raster.css',
),
),
'ext.visualEditor.icons-vector' => $wgVisualEditorResourceTemplate + array(
'styles' => array(
've/ui/styles/ve.ui.Icons-vector.css',
've-mw/ui/styles/ve.ui.Icons-vector.css',
),
),
);

4
demos/ve/index.php
View file

@ -308,12 +308,12 @@ $html = file_get_contents( $page );
<script src="../../modules/jquery.uls/src/jquery.uls.lcd.js"></script>
<script src="../../modules/jquery.uls/src/jquery.uls.languagefilter.js"></script>
<script src="../../modules/jquery.uls/src/jquery.uls.regionfilter.js"></script>
<!-- ext.visualEditor.experimental -->
<!-- ext.visualEditor.language -->
<script src="../../modules/ve/dm/annotations/ve.dm.LanguageAnnotation.js"></script>
<script src="../../modules/ve/ce/annotations/ve.ce.LanguageAnnotation.js"></script>
<script src="../../modules/ve/ui/inspectors/ve.ui.LanguageInspector.js"></script>
<script src="../../modules/ve/ui/tools/ve.ui.LanguageInspectorTool.js"></script>
<script src="../../modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js"></script>
<script src="../../modules/ve/ui/tools/ve.ui.ExperimentalTool.js"></script>
<!-- demo -->
<script>

2
maintenance/makeStaticLoader.php
View file

@ -153,7 +153,7 @@ class MakeStaticLoader extends Maintenance {
'jquery.uls.data',
'jquery.uls.compact',
'jquery.uls',
'ext.visualEditor.experimental',
'ext.visualEditor.language',
);
foreach ( $modules as $module ) {

29
modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js Normal file
View file

@ -0,0 +1,29 @@
/*!
* VisualEditor Experimental MediaWiki UserInterface alien extension tool class.
*
* @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
/**
* MediaWiki UserInterface alien extension tool.
*
* @class
* @extends ve.ui.InspectorTool
* @constructor
* @param {ve.ui.SurfaceToolbar} toolbar
* @param {Object} [config] Configuration options
*/
ve.ui.MWAlienExtensionInspectorTool = function VeUiMWAlienExtensionInspectorTool( toolbar, config ) {
ve.ui.InspectorTool.call( this, toolbar, config );
};
OO.inheritClass( ve.ui.MWAlienExtensionInspectorTool, ve.ui.InspectorTool );
ve.ui.MWAlienExtensionInspectorTool.static.name = 'alienExtension';
ve.ui.MWAlienExtensionInspectorTool.static.group = 'object';
ve.ui.MWAlienExtensionInspectorTool.static.icon = 'alienextension';
ve.ui.MWAlienExtensionInspectorTool.static.titleMessage =
'visualeditor-mwalienextensioninspector-title';
ve.ui.MWAlienExtensionInspectorTool.static.inspector = 'alienExtension';
ve.ui.MWAlienExtensionInspectorTool.static.modelClasses = [ ve.dm.MWAlienExtensionNode ];
ve.ui.MWAlienExtensionInspectorTool.static.autoAdd = false;
ve.ui.toolFactory.register( ve.ui.MWAlienExtensionInspectorTool );

71
modules/ve-mw/ui/tools/ve.ui.MWExperimentalTool.js
View file

@ -1,71 +0,0 @@
/*!
* VisualEditor Experimental MediaWiki UserInterface tool classes.
*
* @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
/**
* MediaWiki UserInterface hieroglyphics tool.
*
* @class
* @extends ve.ui.InspectorTool
* @constructor
* @param {ve.ui.SurfaceToolbar} toolbar
* @param {Object} [config] Configuration options
*/
ve.ui.MWHieroInspectorTool = function VeUiMWHieroInspectorTool( toolbar, config ) {
ve.ui.InspectorTool.call( this, toolbar, config );
};
OO.inheritClass( ve.ui.MWHieroInspectorTool, ve.ui.InspectorTool );
ve.ui.MWHieroInspectorTool.static.name = 'hiero';
ve.ui.MWHieroInspectorTool.static.group = 'object';
ve.ui.MWHieroInspectorTool.static.icon = 'hiero';
ve.ui.MWHieroInspectorTool.static.titleMessage = 'visualeditor-mwhieroinspector-title';
ve.ui.MWHieroInspectorTool.static.inspector = 'hiero';
ve.ui.MWHieroInspectorTool.static.modelClasses = [ ve.dm.MWHieroNode ];
ve.ui.toolFactory.register( ve.ui.MWHieroInspectorTool );
/**
* MediaWiki UserInterface alien extension tool.
*
* @class
* @extends ve.ui.InspectorTool
* @constructor
* @param {ve.ui.SurfaceToolbar} toolbar
* @param {Object} [config] Configuration options
*/
ve.ui.MWAlienExtensionInspectorTool = function VeUiMWAlienExtensionInspectorTool( toolbar, config ) {
ve.ui.InspectorTool.call( this, toolbar, config );
};
OO.inheritClass( ve.ui.MWAlienExtensionInspectorTool, ve.ui.InspectorTool );
ve.ui.MWAlienExtensionInspectorTool.static.name = 'alienExtension';
ve.ui.MWAlienExtensionInspectorTool.static.group = 'object';
ve.ui.MWAlienExtensionInspectorTool.static.icon = 'alienextension';
ve.ui.MWAlienExtensionInspectorTool.static.titleMessage =
'visualeditor-mwalienextensioninspector-title';
ve.ui.MWAlienExtensionInspectorTool.static.inspector = 'alienExtension';
ve.ui.MWAlienExtensionInspectorTool.static.modelClasses = [ ve.dm.MWAlienExtensionNode ];
ve.ui.MWAlienExtensionInspectorTool.static.autoAdd = false;
ve.ui.toolFactory.register( ve.ui.MWAlienExtensionInspectorTool );
/**
* MediaWiki UserInterface math tool.
*
* @class
* @extends ve.ui.InspectorTool
* @constructor
* @param {ve.ui.SurfaceToolbar} toolbar
* @param {Object} [config] Configuration options
*/
ve.ui.MWMathInspectorTool = function VeUiMWMathInspectorTool( toolbar, config ) {
ve.ui.InspectorTool.call( this, toolbar, config );
};
OO.inheritClass( ve.ui.MWMathInspectorTool, ve.ui.InspectorTool );
ve.ui.MWMathInspectorTool.static.name = 'math';
ve.ui.MWMathInspectorTool.static.group = 'object';
ve.ui.MWMathInspectorTool.static.icon = 'math';
ve.ui.MWMathInspectorTool.static.titleMessage = 'visualeditor-mwmathinspector-title';
ve.ui.MWMathInspectorTool.static.inspector = 'math';
ve.ui.MWMathInspectorTool.static.modelClasses = [ ve.dm.MWMathNode ];
ve.ui.toolFactory.register( ve.ui.MWMathInspectorTool );

27
modules/ve-mw/ui/tools/ve.ui.MWHieroInspectorTool.js Normal file
View file

@ -0,0 +1,27 @@
/*!
* VisualEditor MediaWiki UserInterface hieroglyphics tool class.
*
* @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
/**
* MediaWiki UserInterface hieroglyphics tool.
*
* @class
* @extends ve.ui.InspectorTool
* @constructor
* @param {ve.ui.SurfaceToolbar} toolbar
* @param {Object} [config] Configuration options
*/
ve.ui.MWHieroInspectorTool = function VeUiMWHieroInspectorTool( toolbar, config ) {
ve.ui.InspectorTool.call( this, toolbar, config );
};
OO.inheritClass( ve.ui.MWHieroInspectorTool, ve.ui.InspectorTool );
ve.ui.MWHieroInspectorTool.static.name = 'hiero';
ve.ui.MWHieroInspectorTool.static.group = 'object';
ve.ui.MWHieroInspectorTool.static.icon = 'hiero';
ve.ui.MWHieroInspectorTool.static.titleMessage = 'visualeditor-mwhieroinspector-title';
ve.ui.MWHieroInspectorTool.static.inspector = 'hiero';
ve.ui.MWHieroInspectorTool.static.modelClasses = [ ve.dm.MWHieroNode ];
ve.ui.toolFactory.register( ve.ui.MWHieroInspectorTool );

27
modules/ve-mw/ui/tools/ve.ui.MWMathInspectorTool.js Normal file
View file

@ -0,0 +1,27 @@
/*!
* VisualEditor MediaWiki UserInterface math tool class.
*
* @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
/**
* MediaWiki UserInterface math tool.
*
* @class
* @extends ve.ui.InspectorTool
* @constructor
* @param {ve.ui.SurfaceToolbar} toolbar
* @param {Object} [config] Configuration options
*/
ve.ui.MWMathInspectorTool = function VeUiMWMathInspectorTool( toolbar, config ) {
ve.ui.InspectorTool.call( this, toolbar, config );
};
OO.inheritClass( ve.ui.MWMathInspectorTool, ve.ui.InspectorTool );
ve.ui.MWMathInspectorTool.static.name = 'math';
ve.ui.MWMathInspectorTool.static.group = 'object';
ve.ui.MWMathInspectorTool.static.icon = 'math';
ve.ui.MWMathInspectorTool.static.titleMessage = 'visualeditor-mwmathinspector-title';
ve.ui.MWMathInspectorTool.static.inspector = 'math';
ve.ui.MWMathInspectorTool.static.modelClasses = [ ve.dm.MWMathNode ];
ve.ui.toolFactory.register( ve.ui.MWMathInspectorTool );

4
modules/ve/test/index.php
View file

@ -252,12 +252,12 @@
<script src="../../jquery.uls/src/jquery.uls.lcd.js"></script>
<script src="../../jquery.uls/src/jquery.uls.languagefilter.js"></script>
<script src="../../jquery.uls/src/jquery.uls.regionfilter.js"></script>
<!-- ext.visualEditor.experimental -->
<!-- ext.visualEditor.language -->
<script src="../../ve/dm/annotations/ve.dm.LanguageAnnotation.js"></script>
<script src="../../ve/ce/annotations/ve.ce.LanguageAnnotation.js"></script>
<script src="../../ve/ui/inspectors/ve.ui.LanguageInspector.js"></script>
<script src="../../ve/ui/tools/ve.ui.LanguageInspectorTool.js"></script>
<script src="../../ve/ui/widgets/ve.ui.LanguageInputWidget.js"></script>
<script src="../../ve/ui/tools/ve.ui.ExperimentalTool.js"></script>
<!-- Load plugins for test framework -->
<script src="ve.qunit.js"></script>

2
modules/ve/ui/tools/ve.ui.ExperimentalTool.js → modules/ve/ui/tools/ve.ui.LanguageInspectorTool.js
View file

@ -1,5 +1,5 @@
/*!
* VisualEditor Experimental UserInterface tool classes.
* VisualEditor UserInterface language tool class.
*
* @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt