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

Change subject: Disable undo/usurp within SurfaceSynchronizer
......................................................................


Disable undo/usurp within SurfaceSynchronizer

Change-Id: Ic5dc470e444288ea41b2ed2a35fc82e078e3fe0b
---
M src/dm/ve.dm.SurfaceSynchronizer.js
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/src/dm/ve.dm.SurfaceSynchronizer.js 
b/src/dm/ve.dm.SurfaceSynchronizer.js
index 0f51f1b..853c4b4 100644
--- a/src/dm/ve.dm.SurfaceSynchronizer.js
+++ b/src/dm/ve.dm.SurfaceSynchronizer.js
@@ -27,6 +27,10 @@
 
        // Properties
        this.surface = surface;
+       // HACK disable undo/redo
+       this.surface.canUndo = this.surface.canRedo = function () {
+               return false;
+       };
        this.doc = surface.documentModel;
        this.store = this.doc.getStore();
        this.authorSelections = {};
@@ -45,7 +49,8 @@
        this.socket.on( 'newChange', this.onNewChange.bind( this ) );
        this.socket.on( 'nameChange', this.onNameChange.bind( this ) );
        this.socket.on( 'authorDisconnect', this.onAuthorDisconnect.bind( this 
) );
-       this.tryUsurp();
+       // TODO: unbreak then re-enable usurp
+       // this.tryUsurp();
 
        // Events
        this.doc.connect( this, {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5dc470e444288ea41b2ed2a35fc82e078e3fe0b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <da...@troi.org>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
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