| Index: trunk/phase3/skins/common/wikibits.js |
| — | — | @@ -613,7 +613,8 @@ |
| 614 | 614 | sortfn = ts_sort_date; |
| 615 | 615 | if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d$/)) |
| 616 | 616 | sortfn = ts_sort_date; |
| 617 | | - if (itm.match(/^[\u00a3$\u20ac\u00a5]/)) // pound dollar euro yen |
| | 617 | + // pound dollar euro yen currency cents |
| | 618 | + if (itm.match(/(^[\u00a3$\u20ac\u00a4\u00a5]|\u00a2$)/)) |
| 618 | 619 | sortfn = ts_sort_currency; |
| 619 | 620 | if (itm.match(/^[\d.,]+\%?$/)) |
| 620 | 621 | sortfn = ts_sort_numeric; |
| — | — | @@ -719,8 +720,8 @@ |
| 720 | 721 | } |
| 721 | 722 | |
| 722 | 723 | function ts_sort_currency(a,b) { |
| 723 | | - var aa = ts_parseFloat(a[1].replace(/[^0-9.]/g,'')); |
| 724 | | - var bb = ts_parseFloat(b[1].replace(/[^0-9.]/g,'')); |
| | 724 | + var aa = ts_parseFloat(a[1].replace(/[^0-9.,]/g,'')); |
| | 725 | + var bb = ts_parseFloat(b[1].replace(/[^0-9.,]/g,'')); |
| 725 | 726 | return (aa != bb ? aa - bb : a[2] - b[2]); |
| 726 | 727 | } |
| 727 | 728 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -115,7 +115,7 @@ |
| 116 | 116 | * Added an on-wiki external image whitelist. Items in this whitelist are |
| 117 | 117 | treated as regular expression fragments to match for when possibly |
| 118 | 118 | displaying an external image inline. |
| 119 | | -* (bug 15405) Sort yen correctly in sortable tables |
| | 119 | +* (bugs 15405, 15436) Sort more currency types correctly in sortable tables |
| 120 | 120 | |
| 121 | 121 | === Bug fixes in 1.14 === |
| 122 | 122 | |