jenkins-bot has submitted this change and it was merged.

Change subject: Use target factory to create targets
......................................................................


Use target factory to create targets

Change-Id: Id37df2cb23ee22d40fefb6fe562a1513539b4aba
Depends-On: Iab0d5be611ece7038234551c4847b07517b4348d
---
M modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
M modules/editor/editors/visualeditor/mw.flow.ve.Target.js
M modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js
3 files changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js 
b/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
index ae953df..6fc3dc8 100644
--- a/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
+++ b/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
@@ -49,7 +49,7 @@
                // add i18n messages to VE
                ve.init.platform.addMessages( mw.messages.values );
 
-               this.target = new mw.flow.ve.Target();
+               this.target = ve.init.mw.targetFactory.create( 'flow' );
 
                // Fix missing base URL
                htmlDoc = ve.createDocumentFromHtml( content ); // HTMLDocument
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js 
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
index 10bc564..86d48d4 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
@@ -24,6 +24,8 @@
 
        // Static
 
+       mw.flow.ve.Target.static.name = 'flow';
+
        mw.flow.ve.Target.static.toolbarGroups = [
                {
                        type: 'list',
@@ -80,4 +82,8 @@
                }
        };
 
+       // Registration
+
+       ve.init.mw.targetFactory.register( mw.flow.ve.Target );
+
 }( mediaWiki, OO, ve ) );
diff --git 
a/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js 
b/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js
index bf067a1..be303b6 100644
--- a/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js
+++ b/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js
@@ -79,7 +79,7 @@
                                        // HACK add i18n messages to VE
                                        ve.init.platform.addMessages( 
mw.messages.values );
 
-                                       widget.target = new mw.flow.ve.Target();
+                                       widget.target = 
ve.init.mw.targetFactory.create( 'flow' );
                                        widget.$element.append( 
widget.target.$element );
                                } );
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/284880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id37df2cb23ee22d40fefb6fe562a1513539b4aba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to