https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114038
Revision: 114038
Author: inez
Date: 2012-03-16 22:16:15 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
Make LinkInspector works (using annotate method in SurfaceView)
Modified Paths:
--------------
trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
trunk/extensions/VisualEditor/modules/ve/ui/inspectors/ve.ui.LinkInspector.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 22:13:45 UTC (rev 114037)
+++ trunk/extensions/VisualEditor/modules/ve/ce/ve.ce.Surface.js
2012-03-16 22:16:15 UTC (rev 114038)
@@ -115,7 +115,7 @@
/* Methods */
ve.ce.Surface.prototype.annotate = function( method, annotation ) {
- var range = this.getSelectionRange(),
+ var range = this.currentSelection,
_this = this;
if ( method === 'toggle' ) {
@@ -511,8 +511,9 @@
};
ve.ce.Surface.prototype.getOffset = function( elem, offset, global ) {
- var $leafNode = this.getLeafNode( elem ),
- current = [$leafNode.contents(), 0],
+ var $leafNode = this.getLeafNode( elem );
+ if($leafNode === null)return;
+ var current = [$leafNode.contents(), 0],
stack = [current],
localOffset = 0;
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 22:13:45 UTC (rev 114037)
+++
trunk/extensions/VisualEditor/modules/ve/ui/inspectors/ve.ui.LinkInspector.js
2012-03-16 22:16:15 UTC (rev 114038)
@@ -22,14 +22,10 @@
if ( $(this).is( '.es-inspector-button-disabled' ) ) {
return;
}
- var surfaceView = _this.context.getSurfaceView(),
- surfaceModel = surfaceView.getModel(),
- tx =
surfaceModel.getDocument().prepareContentAnnotation(
- surfaceView.currentSelection,
- 'clear',
- /link\/.*/
- );
- surfaceModel.transact( tx );
+
+ var surfaceView = _this.context.getSurfaceView();
+ surfaceView.annotate( 'clear', /link\/.*/ );
+
_this.$locationInput.val( '' );
_this.context.closeInspector();
} );
@@ -86,20 +82,9 @@
if ( title === this.getTitleFromSelection() || !title ) {
return;
}
- var surfaceView = this.context.getSurfaceView(),
- surfaceModel = surfaceView.getModel();
- var clear = surfaceModel.getDocument().prepareContentAnnotation(
- surfaceView.currentSelection,
- 'clear',
- /link\/.*/
- );
- surfaceModel.transact( clear );
- var set = surfaceModel.getDocument().prepareContentAnnotation(
- surfaceView.currentSelection,
- 'set',
- { 'type': 'link/internal', 'data': { 'title': title } }
- );
- surfaceModel.transact( set );
+ var surfaceView = this.context.getSurfaceView();
+ surfaceView.annotate( 'clear', /link\/.*/ );
+ surfaceView.annotate( 'set', { 'type': 'link/internal', 'data':
{ 'title': title } } );
}
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
