http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89753
Revision: 89753
Author: tparscal
Date: 2011-06-08 22:47:48 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
Enabled starting selection within paragraph but outside line element boundaries.
Modified Paths:
--------------
trunk/parsers/wikidom/lib/jquery.editSurface.js
trunk/parsers/wikidom/lib/jquery.flow.js
Modified: trunk/parsers/wikidom/lib/jquery.editSurface.js
===================================================================
--- trunk/parsers/wikidom/lib/jquery.editSurface.js 2011-06-08 21:43:23 UTC
(rev 89752)
+++ trunk/parsers/wikidom/lib/jquery.editSurface.js 2011-06-08 22:47:48 UTC
(rev 89753)
@@ -20,14 +20,18 @@
$(document)
.mousedown( function( e ) {
- if ( !$( e.target ).is( '.editSurface-line' ) ) {
+ var $target = $( e.target );
+ if ( $target.is( '.editSurface-paragraph' ) ) {
+ $target = $target.children().closestToOffset( {
'left': e.pageX, 'top': e.pageY } );
+ }
+ if ( !$target.is( '.editSurface-line' ) ) {
return;
}
sel = {
'active': true,
'from': null,
'to': null,
- 'start': getCursorPosition( e.pageX, e.pageY,
$( e.target ) ),
+ 'start': getCursorPosition( e.pageX, e.pageY,
$target ),
'end': null
};
cursor.show();
@@ -110,9 +114,6 @@
return text;
}
function getCursorPosition( x, y, $target ) {
- if ( $target === undefined ) {
- var $target = $( '.editSurface-line' ).closestToOffset(
{ 'left': x, 'top': y } );
- }
var metrics = $target.data( 'metrics' );
var text = $target.data( 'text' );
var line = $target.data( 'line' );
Modified: trunk/parsers/wikidom/lib/jquery.flow.js
===================================================================
--- trunk/parsers/wikidom/lib/jquery.flow.js 2011-06-08 21:43:23 UTC (rev
89752)
+++ trunk/parsers/wikidom/lib/jquery.flow.js 2011-06-08 22:47:48 UTC (rev
89753)
@@ -5,6 +5,7 @@
$.flow = { 'widthCache': {} };
$.fn.flow = function( text ) {
+ console.time( 'flow' );
function encodeHtml( c ) {
return c.replace( /&/g, '&' )
@@ -83,12 +84,9 @@
line++;
}
-
- return $this;
- // the end
-
-
-
+ console.timeEnd( 'flow' );
+
+ return $this;
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
