https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114031
Revision: 114031
Author: rmoen
Date: 2012-03-16 20:18:26 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
adapt LinkInspector to use surfaceObserver for selection
Modified Paths:
--------------
trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
trunk/extensions/VisualEditor/modules/ve/ui/inspectors/ve.ui.LinkInspector.js
trunk/extensions/VisualEditor/modules/ve/ui/tools/ve.ui.AnnotationButtonTool.js
Modified: trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
===================================================================
--- trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
2012-03-16 19:51:18 UTC (rev 114030)
+++ trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
2012-03-16 20:18:26 UTC (rev 114031)
@@ -31,7 +31,6 @@
// Surface Observer
this.surfaceObserver = new ve.ce.SurfaceObserver( this.documentView );
this.surfaceObserver.on( 'select', function( selection ) {
-
if ( selection !== null ) {
// Keep a copy of the current selection on hand
_this.currentSelection = selection.clone();
Modified:
trunk/extensions/VisualEditor/modules/ve/ui/inspectors/ve.ui.LinkInspector.js
===================================================================
---
trunk/extensions/VisualEditor/modules/ve/ui/inspectors/ve.ui.LinkInspector.js
2012-03-16 19:51:18 UTC (rev 114030)
+++
trunk/extensions/VisualEditor/modules/ve/ui/inspectors/ve.ui.LinkInspector.js
2012-03-16 20:18:26 UTC (rev 114031)
@@ -8,7 +8,6 @@
ve.ui.LinkInspector = function( toolbar, context ) {
// Inheritance
ve.ui.Inspector.call( this, toolbar, context );
-
// Properties
this.$clearButton = $( '<div class="es-inspector-button
es-inspector-clearButton"></div>' )
.prependTo( this.$ );
Modified:
trunk/extensions/VisualEditor/modules/ve/ui/tools/ve.ui.AnnotationButtonTool.js
===================================================================
---
trunk/extensions/VisualEditor/modules/ve/ui/tools/ve.ui.AnnotationButtonTool.js
2012-03-16 19:51:18 UTC (rev 114030)
+++
trunk/extensions/VisualEditor/modules/ve/ui/tools/ve.ui.AnnotationButtonTool.js
2012-03-16 20:18:26 UTC (rev 114031)
@@ -23,8 +23,8 @@
ve.ui.AnnotationButtonTool.prototype.onClick = function() {
var surfaceView = this.toolbar.getSurfaceView();
if ( this.inspector ) {
- if ( surfaceView.getModel().getSelection().getLength() ) {
-
this.toolbar.getSurfaceView().getContextView().openInspector( this.inspector );
+ if( surfaceView.surfaceObserver.range.getLength() ) {
+
this.toolbar.getSurfaceView().contextView.openInspector( this.inspector );
} else {
if ( this.active ) {
var surfaceModel = surfaceView.getModel(),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
