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

port over select event listener, and updateSelection methods for setting and removing context icon, add getSelectionRect method for context icon position

Browse source
This commit is contained in:
Rob Moen 2012-03-12 21:50:22 +00:00
parent 56b9068d03
commit 65170e13df
Notes: Rob Moen 2012-03-12 21:50:22 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/113674
2 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ ve.ce.Surface = function( $container, model ) {
// Properties
this.model = model;
this.currentSelection = new ve.Range();
this.documentView = new ve.ce.DocumentNode( this.model.getDocument(), this );
this.contextView = null;
this.$ = $container
@ -79,6 +80,18 @@ ve.ce.Surface = function( $container, model ) {
'compositionStart': null,
'compositionEnd': null
};
this.model.on( 'select', function( selection ) {
// Keep a copy of the current selection on hand
_this.currentSelection = selection.clone();
// Respond to selection changes
_this.updateSelection();
if ( selection.getLength() ) {
_this.clearInsertionAnnotations();
} else {
_this.loadInsertionAnnotations();
}
} );
};
/* Methods */
@ -242,6 +255,31 @@ ve.ce.Surface.prototype.getModel = function() {
return this.model;
};
ve.ce.Surface.prototype.updateSelection = function( delay ) {
var _this = this;
function update() {
if ( _this.currentSelection.getLength() ) {
_this.clearInsertionAnnotations();
}
if ( _this.contextView ) {
if ( _this.currentSelection.getLength() ) {
_this.contextView.set();
} else {
_this.contextView.clear();
}
}
_this.updateSelectionTimeout = undefined;
}
if ( delay ) {
if ( this.updateSelectionTimeout !== undefined ) {
return;
}
this.updateSelectionTimeout = setTimeout( update, delay );
} else {
update();
}
};
ve.ce.Surface.prototype.documentOnFocus = function() {
this.startPolling();
};
@ -517,6 +555,11 @@ ve.ce.Surface.prototype.getSelectionRange = function() {
}
};
ve.ce.Surface.prototype.getSelectionRect = function() {
var sel = rangy.getSelection();
return sel.getBoundingClientRect();
};
ve.ce.Surface.prototype.getDOMNodeAndOffset = function( offset ) {
var $node = this.documentView.getNodeFromOffset( offset ).$,
nodeOffset = this.documentView.getOffsetFromNode( $node.data('view') ) + 1,
@ -579,6 +622,8 @@ ve.ce.Surface.prototype.showSelection = function( range ) {
range.setStart( start.node, start.offset );
range.setEnd( stop.node, stop.offset );
sel.setSingleRange( range );
// Trigger select event
this.model.select( this.getSelectionRange() );
};
ve.ce.Surface.prototype.getLeafNode = function( elem ) {

3
modules/ve/ui/ve.ui.Context.js
View file

@ -95,6 +95,9 @@ ve.ui.Context.prototype.positionIcon = function() {
var selection = this.surfaceView.getModel().getSelection(),
offset;
this.position = null;
console.log( this.surfaceView.getSelectionRect() );
if ( selection.from < selection.to ) {
var $lastRange = this.surfaceView.$.find( '.es-contentView-range:visible:last' );
if ( $lastRange.length ) {