dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b040357
)
Bug 23755. Prevent tablesort code leaking to global scope.
author
Derk-Jan Hartman
<hartman@users.mediawiki.org>
Tue, 1 Jun 2010 23:18:07 +0000
(23:18 +0000)
committer
Derk-Jan Hartman
<hartman@users.mediawiki.org>
Tue, 1 Jun 2010 23:18:07 +0000
(23:18 +0000)
skins/common/wikibits.js
patch
|
blob
|
history
diff --git
a/skins/common/wikibits.js
b/skins/common/wikibits.js
index
0c16626
..
219e4ca
100644
(file)
--- a/
skins/common/wikibits.js
+++ b/
skins/common/wikibits.js
@@
-721,14
+721,14
@@
function ts_initTransformTable() {
if ( typeof wgSeparatorTransformTable == 'undefined'
|| ( wgSeparatorTransformTable[0] == '' && wgDigitTransformTable[2] == '' ) )
{
if ( typeof wgSeparatorTransformTable == 'undefined'
|| ( wgSeparatorTransformTable[0] == '' && wgDigitTransformTable[2] == '' ) )
{
- digitClass = "[0-9,.]";
+
var
digitClass = "[0-9,.]";
ts_number_transform_table = false;
} else {
ts_number_transform_table = {};
// Unpack the transform table
// Separators
ts_number_transform_table = false;
} else {
ts_number_transform_table = {};
// Unpack the transform table
// Separators
- ascii = wgSeparatorTransformTable[0].split("\t");
- localised = wgSeparatorTransformTable[1].split("\t");
+
var
ascii = wgSeparatorTransformTable[0].split("\t");
+
var
localised = wgSeparatorTransformTable[1].split("\t");
for ( var i = 0; i < ascii.length; i++ ) {
ts_number_transform_table[localised[i]] = ascii[i];
}
for ( var i = 0; i < ascii.length; i++ ) {
ts_number_transform_table[localised[i]] = ascii[i];
}
@@
-740,8
+740,8
@@
function ts_initTransformTable() {
}
// Construct regex for number identification
}
// Construct regex for number identification
- digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ',', '\\.'];
- maxDigitLength = 1;
+
var
digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ',', '\\.'];
+
var
maxDigitLength = 1;
for ( var digit in ts_number_transform_table ) {
// Escape regex metacharacters
digits.push(
for ( var digit in ts_number_transform_table ) {
// Escape regex metacharacters
digits.push(
@@
-753,9
+753,9
@@
function ts_initTransformTable() {
}
}
if ( maxDigitLength > 1 ) {
}
}
if ( maxDigitLength > 1 ) {
- digitClass = '[' + digits.join( '', digits ) + ']';
+
var
digitClass = '[' + digits.join( '', digits ) + ']';
} else {
} else {
- digitClass = '(' + digits.join( '|', digits ) + ')';
+
var
digitClass = '(' + digits.join( '|', digits ) + ')';
}
}
}
}
@@
-824,7
+824,7
@@
function ts_dateToSortKey( date ) {
return date.substr( 6, 4 ) + date.substr( 3, 2 ) + date.substr( 0, 2 );
}
} else if ( date.length == 8 ) {
return date.substr( 6, 4 ) + date.substr( 3, 2 ) + date.substr( 0, 2 );
}
} else if ( date.length == 8 ) {
- yr = date.substr( 6, 2 );
+
var
yr = date.substr( 6, 2 );
if ( parseInt( yr ) < 50 ) {
yr = '20' + yr;
} else {
if ( parseInt( yr ) < 50 ) {
yr = '20' + yr;
} else {
@@
-856,7
+856,7
@@
function ts_parseFloat( s ) {
}
s = newNum;
}
}
s = newNum;
}
- num = parseFloat( s.replace(/[, ]/g, '').replace("\u2212", '-') );
+
var
num = parseFloat( s.replace(/[, ]/g, '').replace("\u2212", '-') );
return ( isNaN( num ) ? -Infinity : num );
}
return ( isNaN( num ) ? -Infinity : num );
}