| Index: trunk/phase3/resources/jquery/jquery.textSelection.js |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | // IE |
| 93 | 93 | $(this).focus(); |
| 94 | 94 | if ( context ) { |
| 95 | | - context.fn.restoreStuffForIE(); |
| | 95 | + context.fn.restoreCursorAndScrollTop(); |
| 96 | 96 | } |
| 97 | 97 | var selText = $(this).textSelection( 'getSelection' ); |
| 98 | 98 | var scrollTop = this.scrollTop; |
| — | — | @@ -398,4 +398,4 @@ |
| 399 | 399 | context.fn.saveSelection(); |
| 400 | 400 | } |
| 401 | 401 | return retval; |
| 402 | | -}; |
| \ No newline at end of file |
| | 402 | +}; |
| Index: trunk/extensions/LiquidThreads/js/lqt.toolbar.js |
| — | — | @@ -1339,7 +1339,7 @@ |
| 1340 | 1340 | 'wikieditor-toolbar-tool-link-cancel': function() { |
| 1341 | 1341 | // Clear any saved selection state |
| 1342 | 1342 | var context = $j(this).data( 'context' ); |
| 1343 | | - context.fn.restoreStuffForIE(); |
| | 1343 | + context.fn.restoreSelection(); |
| 1344 | 1344 | $j(this).dialog( 'close' ); |
| 1345 | 1345 | } |
| 1346 | 1346 | }, |
| — | — | @@ -1352,8 +1352,8 @@ |
| 1353 | 1353 | // Pre-fill the text fields based on the current selection |
| 1354 | 1354 | var context = $j(this).data( 'context' ); |
| 1355 | 1355 | // Restore and immediately save selection state, needed for inserting stuff later |
| 1356 | | - context.fn.restoreStuffForIE(); |
| 1357 | | - context.fn.saveStuffForIE(); |
| | 1356 | + context.fn.restoreSelection(); |
| | 1357 | + context.fn.saveSelection(); |
| 1358 | 1358 | var selection = context.$textarea.textSelection( 'getSelection' ); |
| 1359 | 1359 | $j( '#wikieditor-toolbar-link-int-target' ).focus(); |
| 1360 | 1360 | // Trigger the change event, so the link status indicator is up to date |
| — | — | @@ -1486,7 +1486,7 @@ |
| 1487 | 1487 | 'wikieditor-toolbar-tool-reference-cancel': function() { |
| 1488 | 1488 | // Clear any saved selection state |
| 1489 | 1489 | var context = $j( this ).data( 'context' ); |
| 1490 | | - context.fn.restoreStuffForIE(); |
| | 1490 | + context.fn.restoreSelection(); |
| 1491 | 1491 | $j( this ).dialog( 'close' ); |
| 1492 | 1492 | } |
| 1493 | 1493 | }, |
| — | — | @@ -1494,8 +1494,8 @@ |
| 1495 | 1495 | // Pre-fill the text fields based on the current selection |
| 1496 | 1496 | var context = $j(this).data( 'context' ); |
| 1497 | 1497 | // Restore and immediately save selection state, needed for inserting stuff later |
| 1498 | | - context.fn.restoreStuffForIE(); |
| 1499 | | - context.fn.saveStuffForIE(); |
| | 1498 | + context.fn.restoreSelection(); |
| | 1499 | + context.fn.saveSelection(); |
| 1500 | 1500 | var selection = context.$textarea.textSelection( 'getSelection' ); |
| 1501 | 1501 | // set focus |
| 1502 | 1502 | $j( '#wikieditor-toolbar-reference-text' ).focus(); |