[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: init.mw.Target: make getSurfaceConfig aware of modes

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383410 )

Change subject: init.mw.Target: make getSurfaceConfig aware of modes
..


init.mw.Target: make getSurfaceConfig aware of modes

ve.init.Target sets up TriggerListeners based on getSurfaceConfig if there's
no Surface instantiated. As such, loading directly in source mode would have
those listeners present and assuming the document is in visual mode. So, if
there's not a Surface already, we'll assume we're going to get one created
with the defaultMode, and set things up expecting that.

Bug: T153959
Change-Id: Ia0afe32e6b63ea0d3418137ca5c8bc32c009ecfa
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 14 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 2fc7b9c..08d17f2 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -310,9 +310,6 @@
// Preserve empty linebreaks on paste in source editor
importRules.all.keepEmptyContentBranches = true;
config = this.getSurfaceConfig( ve.extendObject( {}, config, {
-   commandRegistry: ve.ui.wikitextCommandRegistry,
-   sequenceRegistry: ve.ui.wikitextSequenceRegistry,
-   dataTransferHandlerFactory: 
ve.ui.wikitextDataTransferHandlerFactory,
importRules: importRules
} ) );
return new ve.ui.MWWikitextSurface( dmDoc, config );
@@ -342,6 +339,20 @@
 };
 
 /**
+ * @inheritdoc
+ */
+ve.init.mw.Target.prototype.getSurfaceConfig = function ( config ) {
+   // If we're not asking for a specific mode's config, use the default 
mode.
+   config = ve.extendObject( { mode: this.defaultMode }, config );
+   return ve.init.mw.Target.super.prototype.getSurfaceConfig.call( this, 
ve.extendObject( {
+   // Provide the wikitext versions of the registries, if we're 
using source mode
+   commandRegistry: config.mode === 'source' ? 
ve.ui.wikitextCommandRegistry : ve.ui.commandRegistry,
+   sequenceRegistry: config.mode === 'source' ? 
ve.ui.wikitextSequenceRegistry : ve.ui.sequenceRegistry,
+   dataTransferHandlerFactory: config.mode === 'source' ? 
ve.ui.wikitextDataTransferHandlerFactory : ve.ui.dataTransferHandlerFactory
+   }, config ) );
+};
+
+/**
  * Switch to editing mode.
  *
  * @method

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0afe32e6b63ea0d3418137ca5c8bc32c009ecfa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Divec 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: init.mw.Target: make getSurfaceConfig aware of modes

[DLynch (Code Review)]

DLynch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383410 )

Change subject: init.mw.Target: make getSurfaceConfig aware of modes
..

init.mw.Target: make getSurfaceConfig aware of modes

ve.init.Target sets up TriggerListeners based on getSurfaceConfig if there's
no Surface instantiated. As such, loading directly in source mode would have
those listeners present and assuming the document is in visual mode. So, if
there's not a Surface already, we'll assume we're going to get one created
with the defaultMode, and set things up expecting that.

Bug: T153959
Change-Id: Ia0afe32e6b63ea0d3418137ca5c8bc32c009ecfa
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 14 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/10/383410/1

diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 2fc7b9c..08d17f2 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -310,9 +310,6 @@
// Preserve empty linebreaks on paste in source editor
importRules.all.keepEmptyContentBranches = true;
config = this.getSurfaceConfig( ve.extendObject( {}, config, {
-   commandRegistry: ve.ui.wikitextCommandRegistry,
-   sequenceRegistry: ve.ui.wikitextSequenceRegistry,
-   dataTransferHandlerFactory: 
ve.ui.wikitextDataTransferHandlerFactory,
importRules: importRules
} ) );
return new ve.ui.MWWikitextSurface( dmDoc, config );
@@ -342,6 +339,20 @@
 };
 
 /**
+ * @inheritdoc
+ */
+ve.init.mw.Target.prototype.getSurfaceConfig = function ( config ) {
+   // If we're not asking for a specific mode's config, use the default 
mode.
+   config = ve.extendObject( { mode: this.defaultMode }, config );
+   return ve.init.mw.Target.super.prototype.getSurfaceConfig.call( this, 
ve.extendObject( {
+   // Provide the wikitext versions of the registries, if we're 
using source mode
+   commandRegistry: config.mode === 'source' ? 
ve.ui.wikitextCommandRegistry : ve.ui.commandRegistry,
+   sequenceRegistry: config.mode === 'source' ? 
ve.ui.wikitextSequenceRegistry : ve.ui.sequenceRegistry,
+   dataTransferHandlerFactory: config.mode === 'source' ? 
ve.ui.wikitextDataTransferHandlerFactory : ve.ui.dataTransferHandlerFactory
+   }, config ) );
+};
+
+/**
  * Switch to editing mode.
  *
  * @method

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0afe32e6b63ea0d3418137ca5c8bc32c009ecfa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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