dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle minus signs in sortable tables
[lhc/web/wiklou.git]
/
skins
/
common
/
wikibits.js
diff --git
a/skins/common/wikibits.js
b/skins/common/wikibits.js
index
0485cdf
..
95b2e06
100644
(file)
--- a/
skins/common/wikibits.js
+++ b/
skins/common/wikibits.js
@@
-36,7
+36,6
@@
if (!window.onloadFuncts) {
var onloadFuncts = [];
}
var onloadFuncts = [];
}
-// code that is dependent on js2 functions should use js2AddOnloadHook
function addOnloadHook(hookFunct) {
// Allows add-on scripts to add onload functions
if(!doneOnloadHook) {
function addOnloadHook(hookFunct) {
// Allows add-on scripts to add onload functions
if(!doneOnloadHook) {
@@
-594,8
+593,8
@@
function ts_resortTable(lnk) {
preprocessor = ts_dateToSortKey;
} else if (/^\d\d[\/.-]\d\d[\/.-]\d\d$/.test(itm)) {
preprocessor = ts_dateToSortKey;
preprocessor = ts_dateToSortKey;
} else if (/^\d\d[\/.-]\d\d[\/.-]\d\d$/.test(itm)) {
preprocessor = ts_dateToSortKey;
- // pound dollar euro yen currency cents
- } else if (/(^[\u00a3$\u20ac\u00a4\u00a5]|\u00a2$)/.test(itm)) {
+ // (minus sign)([pound dollar euro yen currency]|cents)
+ } else if (/(^
([-\u2212] *)?
[\u00a3$\u20ac\u00a4\u00a5]|\u00a2$)/.test(itm)) {
preprocessor = ts_currencyToSortKey;
} else if (ts_number_regex.test(itm)) {
preprocessor = ts_parseFloat;
preprocessor = ts_currencyToSortKey;
} else if (ts_number_regex.test(itm)) {
preprocessor = ts_parseFloat;
@@
-706,9
+705,9
@@
function ts_initTransformTable() {
// if percents and regular numbers aren't being mixed.
ts_number_regex = new RegExp(
"^(" +
// if percents and regular numbers aren't being mixed.
ts_number_regex = new RegExp(
"^(" +
- "[+-
]?[0-9][0-9,]*(\\.[0-9,]*)?(E[+-
]?[0-9][0-9,]*)?" + // Fortran-style scientific
+ "[+-
\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[+-\u2212
]?[0-9][0-9,]*)?" + // Fortran-style scientific
"|" +
"|" +
- "[+-]?" + digitClass + "+%?" + // Generic localised
+ "[+-
\u2212
]?" + digitClass + "+%?" + // Generic localised
")$", "i"
);
}
")$", "i"
);
}
@@
-775,13
+774,12
@@
function ts_parseFloat( s ) {
}
s = newNum;
}
}
s = newNum;
}
-
- num = parseFloat(s.replace(/,/g, ""));
- return (isNaN(num) ? 0 : num);
+ num = parseFloat(s.replace(/[, ]/g, "").replace("\u2212", "-"));
+ return (isNaN(num) ? -Infinity : num);
}
function ts_currencyToSortKey( s ) {
}
function ts_currencyToSortKey( s ) {
- return ts_parseFloat(s.replace(/[^0-9.,]/g,''));
+ return ts_parseFloat(s.replace(/[^
-\u2212
0-9.,]/g,''));
}
function ts_sort_generic(a, b) {
}
function ts_sort_generic(a, b) {