From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Sun, 15 Jun 2014 16:48:08 +0000 (+0200)
Subject: jquery.textSelection: Remove references to iframe
X-Git-Tag: 1.31.0-rc.0~14946^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=62b4198859e4ac7cf41775dc8bc943272e3ddfc3;p=lhc%2Fweb%2Fwiklou.git

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
---

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();
 		}