r79866 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79865‎ | r79866 | r79867 >
Date:16:13, 8 January 2011
Author:catrope
Status:ok
Tags:
Comment:
1.16wmf4: MFT r79865
Modified paths:
  • /branches/wmf/1.16wmf4/skins/common/edit.js (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/skins/common/edit.js
@@ -78,7 +78,7 @@
7979 // apply tagOpen/tagClose to selection in textarea,
8080 // use sampleText instead of selection if there is none
8181 function insertTags( tagOpen, tagClose, sampleText ) {
82 - if ( typeof $j != 'undefined' && typeof $j.fn.textSelection != 'undefined' &&
 82+ if ( typeof $j != 'undefined' && typeof $j.fn.textSelection != 'undefined' && currentFocused &&
8383 ( currentFocused.nodeName.toLowerCase() == 'iframe' || currentFocused.id == 'wpTextbox1' ) ) {
8484 $j( '#wpTextbox1' ).textSelection(
8585 'encapsulateSelection', { 'pre': tagOpen, 'peri': sampleText, 'post': tagClose }
Property changes on: branches/wmf/1.16wmf4/skins/common/edit.js
___________________________________________________________________
Added: svn:mergeinfo
8686 Merged /trunk/phase3/skins/common/edit.js:r63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590,65774,67836,77555,77558-77560,77563-77565,77573,79865
8787 Merged /branches/wmf-deployment/skins/common/edit.js:r60970

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r79865(bug 26620) JavaScript error in insertTags() when jQuery is present but curre...catrope16:06, 8 January 2011

Status & tagging log