wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-29 00:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Destroy test surfaces"

Browse source
This commit is contained in:
jenkins-bot 2013-10-08 09:19:03 +00:00 committed by Gerrit Code Review
parent 98e2eaf6aa c752215896
commit 846414f215
5 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/ve/ce/ve.ce.Surface.js
View file

@ -302,6 +302,7 @@ ve.ce.Surface.prototype.disable = function () {
* @method
*/
ve.ce.Surface.prototype.destroy = function () {
this.surfaceObserver.detach();
this.documentView.getDocumentNode().setLive( false );
this.$.remove();
this.$phantoms.remove();

14
modules/ve/ce/ve.ce.SurfaceObserver.js
View file

@ -80,6 +80,16 @@ ve.ce.SurfaceObserver.prototype.clear = function ( range ) {
this.hash = null;
};
/**
* Detach from the document view
*
* @method
*/
ve.ce.SurfaceObserver.prototype.detach = function () {
this.documentView = null;
this.domDocument = null;
};
/**
* Start the setTimeout synchronisation loop
*
@ -165,6 +175,10 @@ ve.ce.SurfaceObserver.prototype.pollOnceNoEmit = function () {
ve.ce.SurfaceObserver.prototype.pollOnceInternal = function ( emitChanges ) {
var $nodeOrSlug, node, text, hash, range, rangyRange;
if ( !this.domDocument ) {
return;
}
range = this.range;
node = this.node;
rangyRange = ve.ce.DomRange.newFromDomSelection( rangy.getSelection( this.domDocument ) );

2
modules/ve/test/ce/ve.ce.Surface.test.js
View file

@ -217,6 +217,8 @@ QUnit.test( 'onContentChange', function ( assert ) {
}
assert.deepEqual( ops, expectedOps, msg + ': operations' );
assert.deepEqual( surface.getModel().getSelection(), expectedRange, msg + ': range' );
surface.destroy();
}
for ( i = 0; i < cases.length; i++ ) {

1
modules/ve/test/ce/ve.ce.test.js
View file

@ -96,6 +96,7 @@ QUnit.test( 'getOffsetFrom(Element|Text)Node', function ( assert ) {
documentView = surface.getView().getDocument();
testOffsets( documentView.documentNode.$[0], testCases[i], -1 );
surface.destroy();
}
} );

2
modules/ve/ui/ve.ui.Surface.js
View file

@ -154,10 +154,10 @@ ve.ui.Surface.prototype.getCommands = function () {
*/
ve.ui.Surface.prototype.destroy = function () {
ve.instances.splice( ve.instances.indexOf( this ), 1 );
this.view.destroy();
this.$.remove();
this.$globalOverlay.remove();
this.$localOverlay.remove();
this.view.destroy();
};
/**