Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/89806
Change subject: Use OO.EventEmitter instead of ve.EventEmitter ...................................................................... Use OO.EventEmitter instead of ve.EventEmitter Change-Id: Ie35e5f51a8d3c0d7f4fa46230b7b37112df610b9 --- M .docs/categories.json M VisualEditor.php M demos/ve/index.php M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js M modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js M modules/ve/ce/ve.ce.Surface.js M modules/ve/ce/ve.ce.SurfaceObserver.js M modules/ve/ce/ve.ce.View.js M modules/ve/dm/ve.dm.InternalList.js M modules/ve/dm/ve.dm.MetaItem.js M modules/ve/dm/ve.dm.MetaList.js M modules/ve/dm/ve.dm.Node.js M modules/ve/dm/ve.dm.Surface.js M modules/ve/init/ve.init.Platform.js M modules/ve/init/ve.init.Target.js M modules/ve/test/index.php M modules/ve/ui/ve.ui.Frame.js M modules/ve/ui/ve.ui.Layout.js M modules/ve/ui/ve.ui.Surface.js M modules/ve/ui/ve.ui.Toolbar.js M modules/ve/ui/ve.ui.Widget.js M modules/ve/ui/ve.ui.Window.js M modules/ve/ui/ve.ui.WindowSet.js M modules/ve/ve.Document.js D modules/ve/ve.EventEmitter.js M modules/ve/ve.Node.js M modules/ve/ve.Registry.js 27 files changed, 63 insertions(+), 80 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/06/89806/1 diff --git a/.docs/categories.json b/.docs/categories.json index 20b4706..30e8d2f 100644 --- a/.docs/categories.json +++ b/.docs/categories.json @@ -158,7 +158,7 @@ { "name": "Utilities", "classes": [ - "ve", "ve.EventEmitter", "ve.Registry", "ve.Factory", + "ve", "ve.Registry", "ve.Factory", "ve.Range", "ve.Element", "ve.EventSequencer" ] }, diff --git a/VisualEditor.php b/VisualEditor.php index 13a05cb..eca99fa 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -211,7 +211,6 @@ // ve 've/ve.js', 've/ve.track.js', - 've/ve.EventEmitter.js', // init 've/init/ve.init.js', diff --git a/demos/ve/index.php b/demos/ve/index.php index 5b745d3..a384c89 100644 --- a/demos/ve/index.php +++ b/demos/ve/index.php @@ -100,7 +100,6 @@ <!-- ext.visualEditor.base#standalone-init --> <script src="../../modules/ve/ve.js"></script> <script src="../../modules/ve/ve.track.js"></script> - <script src="../../modules/ve/ve.EventEmitter.js"></script> <script src="../../modules/ve/init/ve.init.js"></script> <script src="../../modules/ve/init/ve.init.Platform.js"></script> <script src="../../modules/ve/init/ve.init.Target.js"></script> diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js index 8bffe59..c51aab1 100644 --- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js +++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js @@ -15,13 +15,13 @@ * MediaWiki transclusion model. * * @class - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor */ ve.dm.MWTransclusionModel = function VeDmMWTransclusionModel() { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.parts = []; @@ -32,7 +32,7 @@ /* Inheritance */ -OO.mixinClass( ve.dm.MWTransclusionModel, ve.EventEmitter ); +OO.mixinClass( ve.dm.MWTransclusionModel, OO.EventEmitter ); /* Events */ diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js b/modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js index 55373e4..37ba897 100644 --- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js +++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js @@ -9,14 +9,14 @@ * MediaWiki transclusion part model. * * @class - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.dm.MWTransclusionModel} transclusion Transclusion */ ve.dm.MWTransclusionPartModel = function VeDmMWTransclusionPartModel( transclusion ) { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.transclusion = transclusion; @@ -25,7 +25,7 @@ /* Inheritance */ -OO.mixinClass( ve.dm.MWTransclusionPartModel, ve.EventEmitter ); +OO.mixinClass( ve.dm.MWTransclusionPartModel, OO.EventEmitter ); /* Methods */ diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js index cda42d7..69aecb8 100644 --- a/modules/ve/ce/ve.ce.Surface.js +++ b/modules/ve/ce/ve.ce.Surface.js @@ -11,7 +11,7 @@ * * @class * @extends ve.Element - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {jQuery} $container @@ -25,7 +25,7 @@ ve.Element.call( this, options ); // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.surface = surface; @@ -122,7 +122,7 @@ OO.inheritClass( ve.ce.Surface, ve.Element ); -OO.mixinClass( ve.ce.Surface, ve.EventEmitter ); +OO.mixinClass( ve.ce.Surface, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/ce/ve.ce.SurfaceObserver.js b/modules/ve/ce/ve.ce.SurfaceObserver.js index 8fca4be..f2327df 100644 --- a/modules/ve/ce/ve.ce.SurfaceObserver.js +++ b/modules/ve/ce/ve.ce.SurfaceObserver.js @@ -11,14 +11,14 @@ * ContentEditable surface observer. * * @class - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.ce.Document} documentView Document to observe */ ve.ce.SurfaceObserver = function VeCeSurfaceObserver( documentView ) { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.documentView = documentView; @@ -34,7 +34,7 @@ /* Inheritance */ -OO.mixinClass( ve.ce.SurfaceObserver, ve.EventEmitter ); +OO.mixinClass( ve.ce.SurfaceObserver, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/ce/ve.ce.View.js b/modules/ve/ce/ve.ce.View.js index f3f3ad5..65505ff 100644 --- a/modules/ve/ce/ve.ce.View.js +++ b/modules/ve/ce/ve.ce.View.js @@ -10,7 +10,7 @@ * * @abstract * @extends ve.Element - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.dm.Model} model Model to observe @@ -26,7 +26,7 @@ ve.Element.call( this, config ); // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.live = false; @@ -45,7 +45,7 @@ OO.inheritClass( ve.ce.View, ve.Element ); -OO.mixinClass( ve.ce.View, ve.EventEmitter ); +OO.mixinClass( ve.ce.View, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/dm/ve.dm.InternalList.js b/modules/ve/dm/ve.dm.InternalList.js index 5ad2f14..d4c560e 100644 --- a/modules/ve/dm/ve.dm.InternalList.js +++ b/modules/ve/dm/ve.dm.InternalList.js @@ -9,14 +9,14 @@ * DataModel meta item. * * @class - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.dm.Document} doc Document model */ ve.dm.InternalList = function VeDmInternalList( doc ) { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.document = doc; @@ -36,7 +36,7 @@ /* Inheritance */ -OO.mixinClass( ve.dm.InternalList, ve.EventEmitter ); +OO.mixinClass( ve.dm.InternalList, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/dm/ve.dm.MetaItem.js b/modules/ve/dm/ve.dm.MetaItem.js index 0bdaefd..a6ac12e 100644 --- a/modules/ve/dm/ve.dm.MetaItem.js +++ b/modules/ve/dm/ve.dm.MetaItem.js @@ -11,7 +11,7 @@ * @class * @abstract * @extends ve.dm.Model - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {Object} element Reference to element in meta-linmod @@ -20,7 +20,7 @@ // Parent constructor ve.dm.Model.call( this, element ); // Mixin - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.list = null; @@ -33,7 +33,7 @@ OO.inheritClass( ve.dm.MetaItem, ve.dm.Model ); -OO.mixinClass( ve.dm.MetaItem, ve.EventEmitter ); +OO.mixinClass( ve.dm.MetaItem, OO.EventEmitter ); /* Static members */ diff --git a/modules/ve/dm/ve.dm.MetaList.js b/modules/ve/dm/ve.dm.MetaList.js index 0014646..9b3f393 100644 --- a/modules/ve/dm/ve.dm.MetaList.js +++ b/modules/ve/dm/ve.dm.MetaList.js @@ -9,7 +9,7 @@ * DataModel meta item. * * @class - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.dm.Surface} surface Surface model @@ -18,7 +18,7 @@ var i, j, jlen, metadata, item, group; // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.surface = surface; @@ -49,7 +49,7 @@ /* Inheritance */ -OO.mixinClass( ve.dm.MetaList, ve.EventEmitter ); +OO.mixinClass( ve.dm.MetaList, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/dm/ve.dm.Node.js b/modules/ve/dm/ve.dm.Node.js index 1ae6bb3..19aafb4 100644 --- a/modules/ve/dm/ve.dm.Node.js +++ b/modules/ve/dm/ve.dm.Node.js @@ -21,7 +21,7 @@ ve.dm.Model.call( this, element ); // Mixin constructor ve.Node.call( this ); - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.length = length || 0; @@ -44,7 +44,7 @@ OO.mixinClass( ve.dm.Node, ve.Node ); -OO.mixinClass( ve.dm.Node, ve.EventEmitter ); +OO.mixinClass( ve.dm.Node, OO.EventEmitter ); /* Static Properties */ diff --git a/modules/ve/dm/ve.dm.Surface.js b/modules/ve/dm/ve.dm.Surface.js index f120935..b4dbce1 100644 --- a/modules/ve/dm/ve.dm.Surface.js +++ b/modules/ve/dm/ve.dm.Surface.js @@ -9,14 +9,14 @@ * DataModel surface. * * @class - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.dm.Document} doc Document model to create surface for */ ve.dm.Surface = function VeDmSurface( doc ) { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.documentModel = doc; @@ -33,7 +33,7 @@ /* Inheritance */ -OO.mixinClass( ve.dm.Surface, ve.EventEmitter ); +OO.mixinClass( ve.dm.Surface, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/init/ve.init.Platform.js b/modules/ve/init/ve.init.Platform.js index 19724b4..3572187 100644 --- a/modules/ve/init/ve.init.Platform.js +++ b/modules/ve/init/ve.init.Platform.js @@ -9,18 +9,18 @@ * Generic Initialization platform. * * @abstract - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor */ ve.init.Platform = function VeInitPlatform() { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); }; /* Inheritance */ -OO.mixinClass( ve.init.Platform, ve.EventEmitter ); +OO.mixinClass( ve.init.Platform, OO.EventEmitter ); /* Methods */ diff --git a/modules/ve/init/ve.init.Target.js b/modules/ve/init/ve.init.Target.js index cc100c9..f8607b7 100644 --- a/modules/ve/init/ve.init.Target.js +++ b/modules/ve/init/ve.init.Target.js @@ -10,14 +10,14 @@ * * @class * @abstract - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {jQuery} $container Conainter to render target into */ ve.init.Target = function VeInitTarget( $container ) { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.$ = $container; @@ -25,7 +25,7 @@ /* Inheritance */ -OO.mixinClass( ve.init.Target, ve.EventEmitter ); +OO.mixinClass( ve.init.Target, OO.EventEmitter ); /* Static Properties */ diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php index 620d4a0..f0f7682 100644 --- a/modules/ve/test/index.php +++ b/modules/ve/test/index.php @@ -45,7 +45,6 @@ <!-- ext.visualEditor.base#standalone-init --> <script src="../../ve/ve.js"></script> <script src="../../ve/ve.track.js"></script> - <script src="../../ve/ve.EventEmitter.js"></script> <script src="../../ve/init/ve.init.js"></script> <script src="../../ve/init/ve.init.Platform.js"></script> <script src="../../ve/init/ve.init.Target.js"></script> diff --git a/modules/ve/ui/ve.ui.Frame.js b/modules/ve/ui/ve.ui.Frame.js index 88cd853..1a3207b 100644 --- a/modules/ve/ui/ve.ui.Frame.js +++ b/modules/ve/ui/ve.ui.Frame.js @@ -10,7 +10,7 @@ * * @class * @extends ve.Element - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {Object} [config] Configuration options @@ -20,7 +20,7 @@ ve.Element.call( this, config ); // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.initialized = false; @@ -37,7 +37,7 @@ OO.inheritClass( ve.ui.Frame, ve.Element ); -OO.mixinClass( ve.ui.Frame, ve.EventEmitter ); +OO.mixinClass( ve.ui.Frame, OO.EventEmitter ); /* Static Properties */ diff --git a/modules/ve/ui/ve.ui.Layout.js b/modules/ve/ui/ve.ui.Layout.js index d836e9f..e3e5796 100644 --- a/modules/ve/ui/ve.ui.Layout.js +++ b/modules/ve/ui/ve.ui.Layout.js @@ -11,7 +11,7 @@ * @class * @abstract * @extends ve.Element - * @mixin ve.EventEmitter + * @mixin OO.EventEmitter * * @constructor * @param {Object} [config] Configuration options @@ -24,7 +24,7 @@ ve.Element.call( this, config ); // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Initialization this.$.addClass( 've-ui-layout' ); @@ -34,4 +34,4 @@ OO.inheritClass( ve.ui.Layout, ve.Element ); -OO.mixinClass( ve.ui.Layout, ve.EventEmitter ); +OO.mixinClass( ve.ui.Layout, OO.EventEmitter ); diff --git a/modules/ve/ui/ve.ui.Surface.js b/modules/ve/ui/ve.ui.Surface.js index c40ea1a..548545f 100644 --- a/modules/ve/ui/ve.ui.Surface.js +++ b/modules/ve/ui/ve.ui.Surface.js @@ -20,7 +20,7 @@ ve.Element.call( this, config ); // Mixin constructor - ve.EventEmitter.call( this, config ); + OO.EventEmitter.call( this, config ); // Properties this.$globalOverlay = $( '<div>' ); @@ -60,7 +60,7 @@ OO.inheritClass( ve.ui.Surface, ve.Element ); -OO.mixinClass( ve.ui.Surface, ve.EventEmitter ); +OO.mixinClass( ve.ui.Surface, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/ui/ve.ui.Toolbar.js b/modules/ve/ui/ve.ui.Toolbar.js index 1bb7427..703c274 100644 --- a/modules/ve/ui/ve.ui.Toolbar.js +++ b/modules/ve/ui/ve.ui.Toolbar.js @@ -10,7 +10,7 @@ * * @class * @extends ve.Element - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * @mixins ve.ui.GroupElement * * @constructor @@ -27,7 +27,7 @@ ve.Element.call( this, options ); // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); ve.ui.GroupElement.call( this, this.$$( '<div>' ) ); // Properties @@ -61,7 +61,7 @@ OO.inheritClass( ve.ui.Toolbar, ve.Element ); -OO.mixinClass( ve.ui.Toolbar, ve.EventEmitter ); +OO.mixinClass( ve.ui.Toolbar, OO.EventEmitter ); OO.mixinClass( ve.ui.Toolbar, ve.ui.GroupElement ); /* Methods */ diff --git a/modules/ve/ui/ve.ui.Widget.js b/modules/ve/ui/ve.ui.Widget.js index f4db539..73bb638 100644 --- a/modules/ve/ui/ve.ui.Widget.js +++ b/modules/ve/ui/ve.ui.Widget.js @@ -11,7 +11,7 @@ * @class * @abstract * @extends ve.Element - * @mixin ve.EventEmitter + * @mixin OO.EventEmitter * * @constructor * @param {Object} [config] Configuration options @@ -25,7 +25,7 @@ ve.Element.call( this, config ); // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.disabled = config.disabled; @@ -39,7 +39,7 @@ OO.inheritClass( ve.ui.Widget, ve.Element ); -OO.mixinClass( ve.ui.Widget, ve.EventEmitter ); +OO.mixinClass( ve.ui.Widget, OO.EventEmitter ); /* Methods */ diff --git a/modules/ve/ui/ve.ui.Window.js b/modules/ve/ui/ve.ui.Window.js index 10d2d05..258cdc6 100644 --- a/modules/ve/ui/ve.ui.Window.js +++ b/modules/ve/ui/ve.ui.Window.js @@ -11,7 +11,7 @@ * @class * @abstract * @extends ve.Element - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.ui.WindowSet} windowSet Window set this dialog is part of @@ -23,7 +23,7 @@ ve.Element.call( this, config ); // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.windowSet = windowSet; @@ -50,7 +50,7 @@ OO.inheritClass( ve.ui.Window, ve.Element ); -OO.mixinClass( ve.ui.Window, ve.EventEmitter ); +OO.mixinClass( ve.ui.Window, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/ui/ve.ui.WindowSet.js b/modules/ve/ui/ve.ui.WindowSet.js index ba2bbe0..1d39b2a 100644 --- a/modules/ve/ui/ve.ui.WindowSet.js +++ b/modules/ve/ui/ve.ui.WindowSet.js @@ -10,7 +10,7 @@ * * @class * @extends ve.Element - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.Factory} factory Window factory @@ -21,7 +21,7 @@ ve.Element.call( this, config ); // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.factory = factory; @@ -36,7 +36,7 @@ OO.inheritClass( ve.ui.WindowSet, ve.Element ); -OO.mixinClass( ve.ui.WindowSet, ve.EventEmitter ); +OO.mixinClass( ve.ui.WindowSet, OO.EventEmitter ); /* Events */ diff --git a/modules/ve/ve.Document.js b/modules/ve/ve.Document.js index 6667155..494e5ee 100644 --- a/modules/ve/ve.Document.js +++ b/modules/ve/ve.Document.js @@ -9,14 +9,14 @@ * Generic document. * * @class - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor * @param {ve.Node} model Model to observe */ ve.Document = function VeDocument( documentNode ) { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.documentNode = documentNode; @@ -24,7 +24,7 @@ /* Inheritance */ -OO.mixinClass( ve.Document, ve.EventEmitter ); +OO.mixinClass( ve.Document, OO.EventEmitter ); /* Methods */ diff --git a/modules/ve/ve.EventEmitter.js b/modules/ve/ve.EventEmitter.js deleted file mode 100644 index 869647c..0000000 --- a/modules/ve/ve.EventEmitter.js +++ /dev/null @@ -1,14 +0,0 @@ -/*! - * VisualEditor EventEmitter class. - * - * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt - * @license The MIT License (MIT); see LICENSE.txt - */ - -/** - * Event emitter. - * - * @class - * @extends OO.EventEmitter - */ -ve.EventEmitter = OO.EventEmitter; diff --git a/modules/ve/ve.Node.js b/modules/ve/ve.Node.js index e2fdcf3..3e0ae26 100644 --- a/modules/ve/ve.Node.js +++ b/modules/ve/ve.Node.js @@ -9,7 +9,7 @@ * Generic node. * * @abstract - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor */ diff --git a/modules/ve/ve.Registry.js b/modules/ve/ve.Registry.js index 9484e84..0f8336e 100644 --- a/modules/ve/ve.Registry.js +++ b/modules/ve/ve.Registry.js @@ -9,13 +9,13 @@ * Generic data registry. * * @abstract - * @mixins ve.EventEmitter + * @mixins OO.EventEmitter * * @constructor */ ve.Registry = function VeRegistry() { // Mixin constructors - ve.EventEmitter.call( this ); + OO.EventEmitter.call( this ); // Properties this.registry = {}; @@ -23,7 +23,7 @@ /* Inheritance */ -OO.mixinClass( ve.Registry, ve.EventEmitter ); +OO.mixinClass( ve.Registry, OO.EventEmitter ); /* Events */ -- To view, visit https://gerrit.wikimedia.org/r/89806 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie35e5f51a8d3c0d7f4fa46230b7b37112df610b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits