r62186 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r62185‎ | r62186 | r62187 >
Date:16:58, 9 February 2010
Author:catrope
Status:ok
Tags:
Comment:
Fix up r62154: don't throw a JS error when $j is undefined, and bump $wgStyleVersion
Modified paths:
  • /trunk/phase3/includes/DefaultSettings.php (modified) (history)
  • /trunk/phase3/skins/common/edit.js (modified) (history)

Diff [purge]

Index: trunk/phase3/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.fn.textSelection != 'undefined' ) {
 82+ if ( typeof $j != 'undefined' && typeof $j.fn.textSelection != 'undefined' ) {
8383 $j( '#wpTextbox1' ).textSelection(
8484 'encapsulateSelection', { 'pre': tagOpen, 'peri': sampleText, 'post': tagClose }
8585 );
Index: trunk/phase3/includes/DefaultSettings.php
@@ -1686,7 +1686,7 @@
16871687 * to ensure that client-side caches do not keep obsolete copies of global
16881688 * styles.
16891689 */
1690 -$wgStyleVersion = '265';
 1690+$wgStyleVersion = '266';
16911691
16921692
16931693 # Server-side caching:

Follow-up revisions

RevisionCommit summaryAuthorDate
r62190wmf-deployment: Merge r62154, r62186 from trunk (makes charinsert, old toolba...catrope19:27, 9 February 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r62154Updated to use the textSelection plugin when possible.tparscal01:31, 9 February 2010

Status & tagging log