From 3e633839c73448c3c6fdb92978aba4b4578bd6b3 Mon Sep 17 00:00:00 2001 From: callumacrae Date: Thu, 7 Jun 2012 13:32:39 +0100 Subject: [PATCH 1/2] Added width property to selection plugin. --- dom/selection/selection.html | 15 ++++++++++----- dom/selection/selection.js | 15 +++++++++------ dom/selection/selection.md | 3 ++- dom/selection/selection_test.js | 2 +- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dom/selection/selection.html b/dom/selection/selection.html index 536b16e5..6f230026 100644 --- a/dom/selection/selection.html +++ b/dom/selection/selection.html @@ -32,24 +32,29 @@ id='multi'>Select Across Multiple Elements
012
345
- + +

Selection width: 0

diff --git a/dom/selection/selection.js b/dom/selection/selection.js index fb8fd365..5c11b4bb 100644 --- a/dom/selection/selection.js +++ b/dom/selection/selection.js @@ -40,7 +40,8 @@ getElementsSelection = function(el, win){ } return { start: startPos, - end : endPos + end : endPos, + width : endPos - startPos }; }, // Text selection works differently for selection in an input vs @@ -56,9 +57,9 @@ getSelection = function(el){ && document.activeElement != el && el.selectionStart == el.selectionEnd && el.selectionStart == 0){ - return {start: el.value.length, end: el.value.length}; + return {start: el.value.length, end: el.value.length, width: 0}; } - return {start: el.selectionStart, end: el.selectionEnd} + return {start: el.selectionStart, end: el.selectionEnd, width: el.selectionEnd - el.selectionStart}; } // getSelection means a 'normal' element in a standards browser. else if(win.getSelection){ @@ -75,7 +76,8 @@ getSelection = function(el){ var start = r.text.length return { start: start, - end: start + real.text.length + end: start + real.text.length, + width: real.text.length } } // This works on textareas and other elements @@ -104,7 +106,7 @@ getSelection = function(el){ return res } }catch(e){ - return {start: el.value.length, end: el.value.length}; + return {start: el.value.length, end: el.value.length, width: 0}; } } }, @@ -199,7 +201,7 @@ getCharElement = function( elems , range, len ) { * Set or retrieve the currently selected text range. It works on all elements: * * $('#text').selection(8, 12) - * $('#text').selection() // -> { start : 8, end : 12 } + * $('#text').selection() // -> { start : 8, end : 12, width: 4 } * * @param {Number} [start] Start position of the selection range * @param {Number} [end] End position of the selection range @@ -208,6 +210,7 @@ getCharElement = function( elems , range, len ) { * * - __start__ - The number of characters from the start of the element to the start of the selection. * - __end__ - The number of characters from the start of the element to the end of the selection. + * - __width__ - The width of the selection range. * * when no arguments are passed. */ diff --git a/dom/selection/selection.md b/dom/selection/selection.md index 717c0c1a..c1fd5b0e 100644 --- a/dom/selection/selection.md +++ b/dom/selection/selection.md @@ -17,12 +17,13 @@ Using `jQuery.fn.selection` by providing a start and end offset: A call without any parameters will return the current selection: - $('#text').selection() // -> { start : 8, end : 12 } + $('#text').selection() // -> { start : 8, end : 12, width : 4 } Where the returned object contains: - __start__ - The number of characters from the start of the element to the start of the selection. - __end__ - The number of characters from the start of the element to the end of the selection. +- __width__ - The width of the selection range. The selected text can be retrieved like this: diff --git a/dom/selection/selection_test.js b/dom/selection/selection_test.js index 28886444..9319c976 100644 --- a/dom/selection/selection_test.js +++ b/dom/selection/selection_test.js @@ -29,7 +29,7 @@ test("getCharElement", function(){ for(var i =0; i< res.length; i++){ - same(res[i],{start: 1, end: 5},types[i]) + same(res[i],{start: 1, end: 5, width: 4},types[i]) } start(); From 6993e3a453f0595771eae71fb6ec51dc27a5ca25 Mon Sep 17 00:00:00 2001 From: callumacrae Date: Thu, 7 Jun 2012 16:53:33 +0100 Subject: [PATCH 2/2] Rewrote selection_test.js --- dom/selection/selection_test.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dom/selection/selection_test.js b/dom/selection/selection_test.js index 9319c976..418e85c4 100644 --- a/dom/selection/selection_test.js +++ b/dom/selection/selection_test.js @@ -11,25 +11,15 @@ test("getCharElement", function(){ stop(); setTimeout(function(){ var types = ['textarea','#inp','#1','#2']; - for(var i =0; i< types.length; i++){ - //console.log(types[i]) - $(types[i]).selection(1,5); - } /* $('textarea').selection(1,5); $('input').selection(1,5); $('#1').selection(1,5); $('#2').selection(1,5); */ - var res = []; - for(var i =0; i< types.length; i++){ - res.push( $(types[i]).selection() ); - } - - - - for(var i =0; i< res.length; i++){ - same(res[i],{start: 1, end: 5, width: 4},types[i]) + for(var i = 0; i < types.length; i++){ + $(types[i]).selection(1, 5); + same($(types[i]).selection(), {start: 1, end: 5, width: 4}, types[i]); } start();