$.fn.textSelection = function ( command, options ) {
var fn,
$.fn.textSelection = function ( command, options ) {
var fn,
+ context,
+ hasIframe,
+ needSave,
// See bug 35201.
activateElementOnIE( this );
// See bug 35201.
activateElementOnIE( this );
+ if ( context ) {
+ context.fn.restoreCursorAndScrollTop();
+ }
if ( options.selectionStart !== undefined ) {
$( this ).textSelection( 'setSelection', { 'start': options.selectionStart, 'end': options.selectionEnd } );
}
if ( options.selectionStart !== undefined ) {
$( this ).textSelection( 'setSelection', { 'start': options.selectionStart, 'end': options.selectionEnd } );
}
// Position to start selection at
start: undefined,
// Position to end selection at. Defaults to start
// 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
}, options );
if ( options.end === undefined ) {
options.end = options.start;
}
}, 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':
// FIXME: We may not need character position-based functions if we insert markers in the right places
break;
case 'scrollToCaretPosition':
- retval = fn[command].call( this, options );
+ 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();
+ }