From c40b6fa9b0a0e17729a75661f80e7882cb0598e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Wed, 30 Apr 2014 19:59:33 +0200 Subject: [PATCH] jquery.textSelection: Remove hardcoded checks for removed WikiEditor iframe mode Bug: 29328 Change-Id: I6c813cb5601bf79375444b4a1c598218102ce321 --- resources/src/jquery/jquery.textSelection.js | 29 ++------------------ 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/resources/src/jquery/jquery.textSelection.js b/resources/src/jquery/jquery.textSelection.js index 042db91cdc..76e9601001 100644 --- a/resources/src/jquery/jquery.textSelection.js +++ b/resources/src/jquery/jquery.textSelection.js @@ -24,9 +24,6 @@ $.fn.textSelection = function ( command, options ) { var fn, - context, - hasIframe, - needSave, retval; /** @@ -149,9 +146,6 @@ // See bug 35201. activateElementOnIE( this ); - if ( context ) { - context.fn.restoreCursorAndScrollTop(); - } if ( options.selectionStart !== undefined ) { $( this ).textSelection( 'setSelection', { 'start': options.selectionStart, 'end': options.selectionEnd } ); } @@ -531,19 +525,12 @@ // Position to start selection at start: undefined, // Position to end selection at. Defaults to start - end: undefined, - // Element to start selection in (iframe only) - startContainer: undefined, - // Element to end selection in (iframe only). Defaults to startContainer - endContainer: undefined + end: undefined }, options ); if ( options.end === undefined ) { options.end = options.start; } - if ( options.endContainer === undefined ) { - options.endContainer = options.startContainer; - } // FIXME: We may not need character position-based functions if we insert markers in the right places break; case 'scrollToCaretPosition': @@ -553,19 +540,7 @@ break; } - context = $( this ).data( 'wikiEditor-context' ); - hasIframe = context !== undefined && context && context.$iframe !== undefined; - - // IE selection restore voodoo - needSave = false; - if ( hasIframe && context.savedSelection !== null ) { - context.fn.restoreSelection(); - needSave = true; - } - retval = ( hasIframe ? context.fn : fn )[command].call( this, options ); - if ( hasIframe && needSave ) { - context.fn.saveSelection(); - } + retval = fn[command].call( this, options ); return retval; }; -- 2.20.1