From 62b4198859e4ac7cf41775dc8bc943272e3ddfc3 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Sun, 15 Jun 2014 18:48:08 +0200 Subject: [PATCH] jquery.textSelection: Remove references to iframe Another attempt to solve the references to WikiEditor's 'iframe' code. Renamed to a more suited name. The implementation still depends on WikiEditor. Long term, we should probably move part of the WikiEditor API into core. Bug: 29328 Change-Id: Ibe011b2b8d045b4dace3106b8ae718a11387501e --- resources/src/jquery/jquery.textSelection.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/resources/src/jquery/jquery.textSelection.js b/resources/src/jquery/jquery.textSelection.js index 042db91cdc..0573f660e8 100644 --- a/resources/src/jquery/jquery.textSelection.js +++ b/resources/src/jquery/jquery.textSelection.js @@ -25,7 +25,7 @@ $.fn.textSelection = function ( command, options ) { var fn, context, - hasIframe, + hasWikiEditorSurface, // The alt edit surface needs to implement the WikiEditor API needSave, retval; @@ -531,19 +531,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': @@ -554,16 +547,16 @@ } context = $( this ).data( 'wikiEditor-context' ); - hasIframe = context !== undefined && context && context.$iframe !== undefined; + hasWikiEditorSurface = ( context !== undefined ); // IE selection restore voodoo needSave = false; - if ( hasIframe && context.savedSelection !== null ) { + if ( hasWikiEditorSurface && context.savedSelection !== null ) { context.fn.restoreSelection(); needSave = true; } - retval = ( hasIframe ? context.fn : fn )[command].call( this, options ); - if ( hasIframe && needSave ) { + retval = ( hasWikiEditorSurface && context.fn[command] !== undefined ? context.fn : fn )[command].call( this, options ); + if ( hasWikiEditorSurface && needSave ) { context.fn.saveSelection(); } -- 2.20.1