https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113675
Revision: 113675
Author: rmoen
Date: 2012-03-12 22:04:29 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
small fix: getSelectionRange was breaking the surface layer, changed to saved
state member
Modified Paths:
--------------
trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
trunk/extensions/VisualEditor/modules/ve/ui/ve.ui.Context.js
Modified: trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
===================================================================
--- trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
2012-03-12 21:50:22 UTC (rev 113674)
+++ trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
2012-03-12 22:04:29 UTC (rev 113675)
@@ -150,7 +150,7 @@
ve.ce.Surface.prototype.loadInsertionAnnotations = function( annotation ) {
this.insertionAnnotations =
- this.model.getDocument().getAnnotationsFromOffset(
this.getSelectionRange().to - 1 );
+ this.model.getDocument().getAnnotationsFromOffset(
this.currentSelection.to - 1 );
// Filter out annotations that aren't textStyles or links
for ( var i = 0; i < this.insertionAnnotations.length; i++ ) {
if ( !this.insertionAnnotations[i].type.match(
/(textStyle\/|link\/)/ ) ) {
Modified: trunk/extensions/VisualEditor/modules/ve/ui/ve.ui.Context.js
===================================================================
--- trunk/extensions/VisualEditor/modules/ve/ui/ve.ui.Context.js
2012-03-12 21:50:22 UTC (rev 113674)
+++ trunk/extensions/VisualEditor/modules/ve/ui/ve.ui.Context.js
2012-03-12 22:04:29 UTC (rev 113675)
@@ -95,9 +95,6 @@
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 ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
