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

Fix pawn on pre-annotation and keypress

Browse source 
modules/ve/ce/ve.ce.SurfaceObserver.js
* pollOnceNoEmit method to update SurfaceObserver's benchmark text

modules/ve/ce/ve.ce.Surface.js
* pollOnceNoEmit from onUnlock

Change-Id: Idb14a6aea723c42109b3825478766799d4abef22
This commit is contained in:
David Chan 2013-09-11 19:47:39 -07:00
parent 129cf0a42c
commit 789d0caf09
2 changed files with 45 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1158,7 +1158,7 @@ ve.ce.Surface.prototype.onLock = function () {
*/
ve.ce.Surface.prototype.onUnlock = function () {
this.surfaceObserver.locked = false;
// TODO: should we pollOnce?
this.surfaceObserver.pollOnceNoEmit();
};
/*! Relocation */

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

@ -125,8 +125,6 @@ ve.ce.SurfaceObserver.prototype.stopTimerLoop = function () {
/**
* Poll for changes.
*
* If `postpone` is false or undefined then polling will occcur immediately.
*
* TODO: fixing selection in certain cases, handling selection across multiple nodes in Firefox
*
* FIXME: Does not work well (selectionChange is not emitted) when cursor is placed inside a slug
@ -137,6 +135,34 @@ ve.ce.SurfaceObserver.prototype.stopTimerLoop = function () {
* @emits selectionChange
*/
ve.ce.SurfaceObserver.prototype.pollOnce = function () {
this.pollOnceInternal( true );
};
/**
* Poll to update SurfaceObserver, but don't emit change events
*
* @method
*/
ve.ce.SurfaceObserver.prototype.pollOnceNoEmit = function () {
this.pollOnceInternal( false );
};
/**
* Poll for changes.
*
* TODO: fixing selection in certain cases, handling selection across multiple nodes in Firefox
*
* FIXME: Does not work well (selectionChange is not emitted) when cursor is placed inside a slug
* with a mouse.
*
* @method
* @private
* @param {boolean} emitChanges Emit change events if selection changed
* @emits contentChange
* @emits selectionChange
*/
ve.ce.SurfaceObserver.prototype.pollOnceInternal = function ( emitChanges ) {
var $nodeOrSlug, node, text, hash, range, rangyRange;
range = this.range;
@ -169,12 +195,15 @@ ve.ce.SurfaceObserver.prototype.pollOnce = function () {
text = ve.ce.getDomText( node.$[0] );
hash = ve.ce.getDomHash( node.$[0] );
if ( this.text !== text || this.hash !== hash ) {
this.emit(
'contentChange',
node,
{ 'text': this.text, 'hash': this.hash, 'range': this.range },
{ 'text': text, 'hash': hash, 'range': range }
);
if ( emitChanges ) {
this.emit(
'contentChange',
node,
{ 'text': this.text, 'hash': this.hash,
'range': this.range },
{ 'text': text, 'hash': hash, 'range': range }
);
}
this.text = text;
this.hash = hash;
}
@ -182,11 +211,13 @@ ve.ce.SurfaceObserver.prototype.pollOnce = function () {
// Only emit selectionChange event if there's a meaningful range difference
if ( ( this.range && range ) ? !this.range.equals( range ) : ( this.range !== range ) ) {
this.emit(
'selectionChange',
this.range,
range
);
if ( emitChanges ) {
this.emit(
'selectionChange',
this.range,
range
);
}
this.range = range;
}
};