Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57243
Change subject: Rename ve.NodeFactory to ve.NamedClassFactory
......................................................................
Rename ve.NodeFactory to ve.NamedClassFactory
We weren't really using it exclusively for nodes any more, and the only
functionality in there was for using .static.name
Change-Id: Ie26928cd01faee95a10912201663b45f1f20fb19
---
M .docs/categories.json
M VisualEditor.php
M demos/ve/index.php
M modules/ve/ce/ve.ce.AnnotationFactory.js
M modules/ve/ce/ve.ce.NodeFactory.js
M modules/ve/dm/ve.dm.NodeFactory.js
M modules/ve/test/index.php
R modules/ve/ve.NamedClassFactory.js
8 files changed, 18 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/43/57243/1
diff --git a/.docs/categories.json b/.docs/categories.json
index c07a7e4..7dcaf0a 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -148,7 +148,7 @@
},
{
"name": "Factories",
- "classes": ["ve.ActionFactory",
"ve.NodeFactory"]
+ "classes": ["ve.ActionFactory",
"ve.NamedClassFactory"]
},
{
"name": "Nodes",
diff --git a/VisualEditor.php b/VisualEditor.php
index 1f046a5..1e18e0c 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -203,7 +203,7 @@
've/ve.TriggerRegistry.js',
've/ve.Range.js',
've/ve.Node.js',
- 've/ve.NodeFactory.js',
+ 've/ve.NamedClassFactory.js',
've/ve.BranchNode.js',
've/ve.LeafNode.js',
've/ve.Surface.js',
diff --git a/demos/ve/index.php b/demos/ve/index.php
index 0fe0b87..1fdd2c7 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -99,7 +99,7 @@
<script src="../../modules/ve/ve.TriggerRegistry.js"></script>
<script src="../../modules/ve/ve.Range.js"></script>
<script src="../../modules/ve/ve.Node.js"></script>
- <script src="../../modules/ve/ve.NodeFactory.js"></script>
+ <script src="../../modules/ve/ve.NamedClassFactory.js"></script>
<script src="../../modules/ve/ve.BranchNode.js"></script>
<script src="../../modules/ve/ve.LeafNode.js"></script>
<script src="../../modules/ve/ve.Surface.js"></script>
diff --git a/modules/ve/ce/ve.ce.AnnotationFactory.js
b/modules/ve/ce/ve.ce.AnnotationFactory.js
index 0dd5232..350166a 100644
--- a/modules/ve/ce/ve.ce.AnnotationFactory.js
+++ b/modules/ve/ce/ve.ce.AnnotationFactory.js
@@ -9,18 +9,17 @@
* ContentEditable annotation factory.
*
* @class
- * @extends ve.NodeFactory
+ * @extends ve.NamedClassFactory
* @constructor
*/
ve.ce.AnnotationFactory = function VeCeAnnotationFactory() {
// Parent constructor
- // FIXME give ve.NodeFactory a more generic name
- ve.NodeFactory.call( this );
+ ve.NamedClassFactory.call( this );
};
/* Inheritance */
-ve.inheritClass( ve.ce.AnnotationFactory, ve.NodeFactory );
+ve.inheritClass( ve.ce.AnnotationFactory, ve.NamedClassFactory );
/* Initialization */
diff --git a/modules/ve/ce/ve.ce.NodeFactory.js
b/modules/ve/ce/ve.ce.NodeFactory.js
index 09eb863..64d8031 100644
--- a/modules/ve/ce/ve.ce.NodeFactory.js
+++ b/modules/ve/ce/ve.ce.NodeFactory.js
@@ -9,17 +9,17 @@
* ContentEditable node factory.
*
* @class
- * @extends ve.NodeFactory
+ * @extends ve.NamedClassFactory
* @constructor
*/
ve.ce.NodeFactory = function VeCeNodeFactory() {
// Parent constructor
- ve.NodeFactory.call( this );
+ ve.NamedClassFactory.call( this );
};
/* Inheritance */
-ve.inheritClass( ve.ce.NodeFactory, ve.NodeFactory );
+ve.inheritClass( ve.ce.NodeFactory, ve.NamedClassFactory );
/* Methods */
diff --git a/modules/ve/dm/ve.dm.NodeFactory.js
b/modules/ve/dm/ve.dm.NodeFactory.js
index dbb3133..e2a09e9 100644
--- a/modules/ve/dm/ve.dm.NodeFactory.js
+++ b/modules/ve/dm/ve.dm.NodeFactory.js
@@ -9,17 +9,17 @@
* DataModel node factory.
*
* @class
- * @extends ve.NodeFactory
+ * @extends ve.NamedClassFactory
* @constructor
*/
ve.dm.NodeFactory = function VeDmNodeFactory() {
// Parent constructor
- ve.NodeFactory.call( this );
+ ve.NamedClassFactory.call( this );
};
/* Inheritance */
-ve.inheritClass( ve.dm.NodeFactory, ve.NodeFactory );
+ve.inheritClass( ve.dm.NodeFactory, ve.NamedClassFactory );
/* Methods */
diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php
index 3c04faa..90f6600 100644
--- a/modules/ve/test/index.php
+++ b/modules/ve/test/index.php
@@ -43,7 +43,7 @@
<script src="../../ve/ve.TriggerRegistry.js"></script>
<script src="../../ve/ve.Range.js"></script>
<script src="../../ve/ve.Node.js"></script>
- <script src="../../ve/ve.NodeFactory.js"></script>
+ <script src="../../ve/ve.NamedClassFactory.js"></script>
<script src="../../ve/ve.BranchNode.js"></script>
<script src="../../ve/ve.LeafNode.js"></script>
<script src="../../ve/ve.Surface.js"></script>
diff --git a/modules/ve/ve.NodeFactory.js b/modules/ve/ve.NamedClassFactory.js
similarity index 72%
rename from modules/ve/ve.NodeFactory.js
rename to modules/ve/ve.NamedClassFactory.js
index b6d5bf4..6fb9032 100644
--- a/modules/ve/ve.NodeFactory.js
+++ b/modules/ve/ve.NamedClassFactory.js
@@ -1,25 +1,25 @@
/*!
- * VisualEditor NodeFactory class.
+ * VisualEditor NamedClassFactory class.
*
* @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
/**
- * Generic node factory.
+ * Generic factory for classes with a .static.name property.
*
* @abstract
* @extends ve.Factory
* @constructor
*/
-ve.NodeFactory = function VeNodeFactory() {
+ve.NamedClassFactory = function VeNamedClassFactory() {
// Parent constructor
ve.Factory.call( this );
};
/* Inheritance */
-ve.inheritClass( ve.NodeFactory, ve.Factory );
+ve.inheritClass( ve.NamedClassFactory, ve.Factory );
/* Methods */
@@ -30,7 +30,7 @@
* @param {Function} constructor Constructor to use when creating object
* @throws {Error} Node names must be strings and must not be empty
*/
-ve.NodeFactory.prototype.register = function ( constructor ) {
+ve.NamedClassFactory.prototype.register = function ( constructor ) {
var name = constructor.static && constructor.static.name;
if ( typeof name !== 'string' || name === '' ) {
throw new Error( 'Node names must be strings and must not be
empty' );
--
To view, visit https://gerrit.wikimedia.org/r/57243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie26928cd01faee95a10912201663b45f1f20fb19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
