https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110546

Revision: 110546
Author:   inez
Date:     2012-02-02 02:27:45 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Fix showCursorAt method for bug of ">=" vs ">"

Modified Paths:
--------------
    trunk/extensions/VisualEditor/contentEditable/views/es.SurfaceView.js

Modified: trunk/extensions/VisualEditor/contentEditable/views/es.SurfaceView.js
===================================================================
--- trunk/extensions/VisualEditor/contentEditable/views/es.SurfaceView.js       
2012-02-02 01:17:02 UTC (rev 110545)
+++ trunk/extensions/VisualEditor/contentEditable/views/es.SurfaceView.js       
2012-02-02 02:27:45 UTC (rev 110546)
@@ -35,7 +35,7 @@
                if ( range.start === range.end ) {
                        var tx = this.model.getDocument().prepareInsertion( 
range.start, [ { 'type': '/paragraph' }, { 'type': 'paragraph' } ]);
                        this.model.transact( tx );
-                       this.showCursorAt( range.start );
+                       this.showCursorAt( range.start + 2 );
                }
        } else if ( e.which === 8 ) {
                console.log("A");
@@ -57,6 +57,11 @@
        
        var index = 1 + this.documentView.getOffsetFromNode( $node.data('view') 
);
        
+       if(offset === index) {
+               //localOffset = 0;
+               //node = current[0].eq(0)[0];
+       }
+       
        while ( stack.length > 0 ) {
                if ( current[1] >= current[0].length ) {
                        stack.pop();
@@ -68,7 +73,7 @@
                
                if ( item.nodeType === 3 ) {
                        var length = item.textContent.length;
-                       if ( offset > index && offset <= index + length ) {
+                       if ( offset >= index && offset <= index + length ) {
                                node = item;
                                localOffset = offset - index;
                        } else {
@@ -99,7 +104,7 @@
 
 es.SurfaceView.prototype.getOffset = function( localNode, localOffset ) {
        var $node = $( localNode );
-       while( !$node.hasClass( 'es-paragraphView' ) ) {
+       while( !$node.hasClass( 'ce-leafNode' ) ) {
                $node = $node.parent();
        }
        


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to