From 4a24e3412aee9a95f398372251bb676139e1266b Mon Sep 17 00:00:00 2001 From: Stef Kariotidis Date: Mon, 11 Sep 2023 08:58:04 +0300 Subject: [PATCH 1/5] do not format document --- filtering/type-based/diacritics-neutralise.js | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/filtering/type-based/diacritics-neutralise.js b/filtering/type-based/diacritics-neutralise.js index 173922f..f3f493e 100644 --- a/filtering/type-based/diacritics-neutralise.js +++ b/filtering/type-based/diacritics-neutralise.js @@ -83,7 +83,7 @@ var DataTable = $.fn.dataTable; var diacriticsMap = [ { base: 'A', - letters: /[\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F]/g, + letters: /[\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F\u0391\u0386]/g, }, { base: 'AA', letters: /[\uA732]/g }, { base: 'AE', letters: /[\u00C6\u01FC\u01E2]/g }, @@ -93,100 +93,100 @@ var diacriticsMap = [ { base: 'AY', letters: /[\uA73C]/g }, { base: 'B', - letters: /[\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181]/g, + letters: /[\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181\u0392]/g, }, { base: 'C', - letters: /[\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E]/g, + letters: /[\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E\u03A8]/g, }, { base: 'D', - letters: /[\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779]/g, + letters: /[\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779\u0394]/g, }, { base: 'DZ', letters: /[\u01F1\u01C4]/g }, { base: 'Dz', letters: /[\u01F2\u01C5]/g }, { base: 'E', - letters: /[\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E]/g, + letters: /[\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E\u0395\u0388]/g, }, - { base: 'F', letters: /[\u0046\u24BB\uFF26\u1E1E\u0191\uA77B]/g }, + { base: 'F', letters: /[\u0046\u24BB\uFF26\u1E1E\u0191\uA77B\u03A6]/g }, { base: 'G', - letters: /[\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E]/g, + letters: /[\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E\u0393]/g, }, { base: 'H', - letters: /[\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D]/g, + letters: /[\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D\u0397\u0389]/g, }, { base: 'I', - letters: /[\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197]/g, + letters: /[\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197\u0399\u038A\u03AA]/g, }, - { base: 'J', letters: /[\u004A\u24BF\uFF2A\u0134\u0248]/g }, + { base: 'J', letters: /[\u004A\u24BF\uFF2A\u0134\u0248\u039E]/g }, { base: 'K', - letters: /[\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2]/g, + letters: /[\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2\u039A]/g, }, { base: 'L', - letters: /[\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780]/g, + letters: /[\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780\u039B]/g, }, { base: 'LJ', letters: /[\u01C7]/g }, { base: 'Lj', letters: /[\u01C8]/g }, - { base: 'M', letters: /[\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C]/g }, + { base: 'M', letters: /[\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C\u039C]/g }, { base: 'N', - letters: /[\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4]/g, + letters: /[\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4\u039D]/g, }, { base: 'NJ', letters: /[\u01CA]/g }, { base: 'Nj', letters: /[\u01CB]/g }, { base: 'O', - letters: /[\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C]/g, + letters: /[\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C\u039F\u038C]/g, }, { base: 'OI', letters: /[\u01A2]/g }, { base: 'OO', letters: /[\uA74E]/g }, { base: 'OU', letters: /[\u0222]/g }, { base: 'P', - letters: /[\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754]/g, + letters: /[\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754\u03A0]/g, }, { base: 'Q', letters: /[\u0051\u24C6\uFF31\uA756\uA758\u024A]/g }, { base: 'R', - letters: /[\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782]/g, + letters: /[\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782\u03A1]/g, }, { base: 'S', - letters: /[\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784]/g, + letters: /[\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784\u03A3]/g, }, { base: 'T', - letters: /[\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786]/g, + letters: /[\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786\u03A4]/g, }, { base: 'TZ', letters: /[\uA728]/g }, { base: 'U', - letters: /[\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244]/g, + letters: /[\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244\u0398]/g, }, - { base: 'V', letters: /[\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245]/g }, + { base: 'V', letters: /[\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245\u03A9\u038F]/g }, { base: 'VY', letters: /[\uA760]/g }, { base: 'W', - letters: /[\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72]/g, + letters: /[\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72\u03C2]/g, }, - { base: 'X', letters: /[\u0058\u24CD\uFF38\u1E8A\u1E8C]/g }, + { base: 'X', letters: /[\u0058\u24CD\uFF38\u1E8A\u1E8C\u03A7]/g }, { base: 'Y', - letters: /[\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE]/g, + letters: /[\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE\u03A5\u03D2\u038E\u03AB]/g, }, { base: 'Z', - letters: /[\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762]/g, + letters: /[\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762\u0396]/g, }, { base: 'a', - letters: /[\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250]/g, + letters: /[\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250\u03B1\u03AC]/g, }, { base: 'aa', letters: /[\uA733]/g }, { base: 'ae', letters: /[\u00E6\u01FD\u01E3]/g }, @@ -196,94 +196,94 @@ var diacriticsMap = [ { base: 'ay', letters: /[\uA73D]/g }, { base: 'b', - letters: /[\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253]/g, + letters: /[\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253\u03B2]/g, }, { base: 'c', - letters: /[\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184]/g, + letters: /[\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184\u03C8]/g, }, { base: 'd', - letters: /[\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A]/g, + letters: /[\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A\u03B4]/g, }, { base: 'dz', letters: /[\u01F3\u01C6]/g }, { base: 'e', - letters: /[\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD]/g, + letters: /[\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD\u03B5\u03AD]/g, }, - { base: 'f', letters: /[\u0066\u24D5\uFF46\u1E1F\u0192\uA77C]/g }, + { base: 'f', letters: /[\u0066\u24D5\uFF46\u1E1F\u0192\uA77C\u03C6]/g }, { base: 'g', - letters: /[\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F]/g, + letters: /[\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F\u03B3]/g, }, { base: 'h', - letters: /[\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265]/g, + letters: /[\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265\u03B7\u03AE]/g, }, { base: 'hv', letters: /[\u0195]/g }, { base: 'i', - letters: /[\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131]/g, + letters: /[\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131\u03B9\u03AF\u0390]/g, }, - { base: 'j', letters: /[\u006A\u24D9\uFF4A\u0135\u01F0\u0249]/g }, + { base: 'j', letters: /[\u006A\u24D9\uFF4A\u0135\u01F0\u0249\u03BE]/g }, { base: 'k', - letters: /[\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3]/g, + letters: /[\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3\u03BA]/g, }, { base: 'l', - letters: /[\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747]/g, + letters: /[\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747\u03BB]/g, }, { base: 'lj', letters: /[\u01C9]/g }, - { base: 'm', letters: /[\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F]/g }, + { base: 'm', letters: /[\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F\u03BC]/g }, { base: 'n', - letters: /[\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5]/g, + letters: /[\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5\u03BD]/g, }, { base: 'nj', letters: /[\u01CC]/g }, { base: 'o', - letters: /[\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275]/g, + letters: /[\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275\u03BF\u03CC]/g, }, { base: 'oi', letters: /[\u01A3]/g }, { base: 'ou', letters: /[\u0223]/g }, { base: 'oo', letters: /[\uA74F]/g }, { base: 'p', - letters: /[\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755]/g, + letters: /[\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755\u03C0]/g, }, { base: 'q', letters: /[\u0071\u24E0\uFF51\u024B\uA757\uA759]/g }, { base: 'r', - letters: /[\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783]/g, + letters: /[\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783\u03C1]/g, }, { base: 's', - letters: /[\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B]/g, + letters: /[\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B\u03C3]/g, }, { base: 't', - letters: /[\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787]/g, + letters: /[\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787\u03C4]/g, }, { base: 'tz', letters: /[\uA729]/g }, { base: 'u', - letters: /[\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289]/g, + letters: /[\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289\u03B8]/g, }, - { base: 'v', letters: /[\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C]/g }, + { base: 'v', letters: /[\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C\u03C9\u03CE]/g }, { base: 'vy', letters: /[\uA761]/g }, { base: 'w', - letters: /[\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73]/g, + letters: /[\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73\u03C2]/g, }, - { base: 'x', letters: /[\u0078\u24E7\uFF58\u1E8B\u1E8D]/g }, + { base: 'x', letters: /[\u0078\u24E7\uFF58\u1E8B\u1E8D\u03C7]/g }, { base: 'y', - letters: /[\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF]/g, + letters: /[\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF\u03C5\u03CD\u03B0]/g, }, { base: 'z', - letters: /[\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763]/g, + letters: /[\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763\u03B6]/g, }, ]; function removeDiacritics(s) { From aa8283164081fbc8572fe9721c74fcf9e901c15f Mon Sep 17 00:00:00 2001 From: Przemyslaw Klys Date: Mon, 11 Sep 2023 21:11:58 +0200 Subject: [PATCH 2/5] Adds support for conditional colors to the percentageBars rendering function This commit modifies the `DataTable.render.percentBar` function by adding the `conditionalColors` parameter to support conditional coloring of the percentage bars. If the `conditionalColors` parameter is provided, the function will iterate through the conditional colors array and apply the appropriate color based on the range specified. If `conditionalColors` is not provided, the function will default to the original color settings. These changes enable more customization of the appearance of the percentage bars. --- dataRender/percentageBars.js | 68 ++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/dataRender/percentageBars.js b/dataRender/percentageBars.js index ce44338..81b592a 100644 --- a/dataRender/percentageBars.js +++ b/dataRender/percentageBars.js @@ -97,7 +97,7 @@ var DataTable = $.fn.dataTable; * } ] * } ); */ -DataTable.render.percentBar = function (pShape, cText, cBorder, cBar, cBack, vRound, bType) { +DataTable.render.percentBar = function (pShape, cText, cBorder, cBar, cBack, vRound, bType, conditionalColors) { pShape = pShape || 'square'; cText = cText || '#000'; cBorder = cBorder || '#BCBCBC'; @@ -107,23 +107,7 @@ DataTable.render.percentBar = function (pShape, cText, cBorder, cBar, cBack, vRo bType = bType || 'ridge'; //Bar templates var styleRule1 = 'max-width:100px;height:12px;margin:0 auto;'; - var styleRule2 = 'border:2px ' + - bType + - ' ' + - cBorder + - ';line-height:12px;font-size:14px;color:' + - cText + - ';background:' + - cBack + - ';position:relative;'; - var styleRule3 = 'height:12px;line-height:12px;text-align:center;background-color:' + - cBar + - ';padding:auto 6px;'; - //Square is default, make template round if pShape == round - if (pShape == 'round') { - styleRule2 += 'border-radius:5px;'; - styleRule3 += 'border-top-left-radius:4px;border-bottom-left-radius:4px;'; - } + return function (d, type, row) { //Remove % if found in the value //Round to the given parameter vRound @@ -139,6 +123,54 @@ DataTable.render.percentBar = function (pShape, cText, cBorder, cBar, cBack, vRo if (typeof d !== 'number' && typeof d !== 'string') { return d; } + + var cBackConditional; + var cBarConditional; + var cTextConditional; + // do conditional colors based on user input + if (conditionalColors) { + for (var i = 0; i < conditionalColors.length; i++) { + if (s >= conditionalColors[i].min && s <= conditionalColors[i].max) { + if (conditionalColors[i].barColor) { + cBarConditional = conditionalColors[i].barColor; + } else { + cBarConditional = cBar; + } + if (conditionalColors[i].backgroundColor) { + cBackConditional = conditionalColors[i].backgroundColor; + } else { + cBackConditional = cBack; + } + if (conditionalColors[i].textColor) { + cTextConditional = conditionalColors[i].textColor; + } else { + cTextConditional = cText; + } + break; + } + } + } else { + cBackConditional = cBack; + cBarConditional = cBar; + cTextConditional = cText; + } + var styleRule2 = 'border:2px ' + + bType + + ' ' + + cBorder + + ';line-height:12px;font-size:14px;color:' + + cText + + ';background:' + + cBackConditional + + ';position:relative;'; + //Bar template + var styleRule3 = 'height:12px;line-height:12px;text-align:center;background-color:' + + cBarConditional + ';padding:auto 6px;'; + //Square is default, make template round if pShape == round + if (pShape == 'round') { + styleRule2 += 'border-radius:5px;'; + styleRule3 += 'border-top-left-radius:4px;border-bottom-left-radius:4px;'; + } //Return the code for the bar return ('
'+i+"%
"}},e}); \ No newline at end of file +!function(r){var n,o;"function"==typeof define&&define.amd?define(["jquery","datatables.net"],function(e){return r(e,window,document)}):"object"==typeof exports?(n=require("jquery"),o=function(e,t){t.fn.dataTable||require("datatables.net")(e,t)},"undefined"==typeof window?module.exports=function(e,t){return e=e||window,t=t||n(e),o(e,t),r(t,0,e.document)}:(o(window,n),module.exports=r(n,window,window.document))):r(jQuery,window,document)}(function(e,t,r,n){"use strict";e=e.fn.dataTable;return e.render.percentBar=function(a,u,l,f,p,s,c,x){a=a||"square",u=u||"#000",l=l||"#BCBCBC",f=f||"#5FD868",p=p||"#E6E6E6",s=s||0,c=c||"ridge";return function(e,t,r){var n,o,i=parseFloat(e.toString().replace(/\s%|%/g,"")).toFixed(s);if(100=x[d].min&&i<=x[d].max){o=x[d].barColor||f,n=x[d].backgroundColor||p,x[d].textColor||u;break}}else n=p,o=f,0;t="border:2px "+c+" "+l+";line-height:12px;font-size:14px;color:"+u+";background:"+n+";position:relative;",e="height:12px;line-height:12px;text-align:center;background-color:"+o+";padding:auto 6px;";return"round"==a&&(t+="border-radius:5px;",e+="border-top-left-radius:4px;border-bottom-left-radius:4px;"),'
'+i+"%
"}},e}); \ No newline at end of file diff --git a/dataRender/percentageBars.min.mjs b/dataRender/percentageBars.min.mjs index a636d6a..b1f4d94 100644 --- a/dataRender/percentageBars.min.mjs +++ b/dataRender/percentageBars.min.mjs @@ -1,2 +1,2 @@ /*! © Drijkoningen Dirk - datatables.net/license */ -import jQuery from"jquery";import DataTable from"datatables.net";let $=jQuery;DataTable.render.percentBar=function(t,e,r,i,a,o,d){o=o||0;var n="border:2px "+(d=d||"ridge")+" "+(r=r||"#BCBCBC")+";line-height:12px;font-size:14px;color:"+(e=e||"#000")+";background:"+(a=a||"#E6E6E6")+";position:relative;",p="height:12px;line-height:12px;text-align:center;background-color:"+(i=i||"#5FD868")+";padding:auto 6px;";return"round"==(t=t||"square")&&(n+="border-radius:5px;",p+="border-top-left-radius:4px;border-bottom-left-radius:4px;"),function(t,e,r){var i=parseFloat(t.toString().replace(/\s%|%/g,"")).toFixed(o);return 100
'+i+"%
"}};export default DataTable; \ No newline at end of file +import jQuery from"jquery";import DataTable from"datatables.net";let $=jQuery;DataTable.render.percentBar=function(d,l,p,u,s,x,b,f){d=d||"square",l=l||"#000",p=p||"#BCBCBC",u=u||"#5FD868",s=s||"#E6E6E6",x=x||0,b=b||"ridge";return function(e,t,r){var i,o,a=parseFloat(e.toString().replace(/\s%|%/g,"")).toFixed(x);if(100=f[n].min&&a<=f[n].max){o=f[n].barColor||u,i=f[n].backgroundColor||s,f[n].textColor||l;break}}else i=s,o=u,0;t="border:2px "+b+" "+p+";line-height:12px;font-size:14px;color:"+l+";background:"+i+";position:relative;",e="height:12px;line-height:12px;text-align:center;background-color:"+o+";padding:auto 6px;";return"round"==d&&(t+="border-radius:5px;",e+="border-top-left-radius:4px;border-bottom-left-radius:4px;"),'
'+a+"%
"}};export default DataTable; \ No newline at end of file diff --git a/dataRender/percentageBars.mjs b/dataRender/percentageBars.mjs index 8bbceb1..eb0d553 100644 --- a/dataRender/percentageBars.mjs +++ b/dataRender/percentageBars.mjs @@ -57,7 +57,7 @@ let $ = jQuery; * } ] * } ); */ -DataTable.render.percentBar = function (pShape, cText, cBorder, cBar, cBack, vRound, bType) { +DataTable.render.percentBar = function (pShape, cText, cBorder, cBar, cBack, vRound, bType, conditionalColors) { pShape = pShape || 'square'; cText = cText || '#000'; cBorder = cBorder || '#BCBCBC'; @@ -67,23 +67,6 @@ DataTable.render.percentBar = function (pShape, cText, cBorder, cBar, cBack, vRo bType = bType || 'ridge'; //Bar templates var styleRule1 = 'max-width:100px;height:12px;margin:0 auto;'; - var styleRule2 = 'border:2px ' + - bType + - ' ' + - cBorder + - ';line-height:12px;font-size:14px;color:' + - cText + - ';background:' + - cBack + - ';position:relative;'; - var styleRule3 = 'height:12px;line-height:12px;text-align:center;background-color:' + - cBar + - ';padding:auto 6px;'; - //Square is default, make template round if pShape == round - if (pShape == 'round') { - styleRule2 += 'border-radius:5px;'; - styleRule3 += 'border-top-left-radius:4px;border-bottom-left-radius:4px;'; - } return function (d, type, row) { //Remove % if found in the value //Round to the given parameter vRound @@ -99,6 +82,57 @@ DataTable.render.percentBar = function (pShape, cText, cBorder, cBar, cBack, vRo if (typeof d !== 'number' && typeof d !== 'string') { return d; } + var cBackConditional; + var cBarConditional; + var cTextConditional; + // do conditional colors based on user input + if (conditionalColors) { + for (var i = 0; i < conditionalColors.length; i++) { + if (s >= conditionalColors[i].min && s <= conditionalColors[i].max) { + if (conditionalColors[i].barColor) { + cBarConditional = conditionalColors[i].barColor; + } + else { + cBarConditional = cBar; + } + if (conditionalColors[i].backgroundColor) { + cBackConditional = conditionalColors[i].backgroundColor; + } + else { + cBackConditional = cBack; + } + if (conditionalColors[i].textColor) { + cTextConditional = conditionalColors[i].textColor; + } + else { + cTextConditional = cText; + } + break; + } + } + } + else { + cBackConditional = cBack; + cBarConditional = cBar; + cTextConditional = cText; + } + var styleRule2 = 'border:2px ' + + bType + + ' ' + + cBorder + + ';line-height:12px;font-size:14px;color:' + + cText + + ';background:' + + cBackConditional + + ';position:relative;'; + //Bar template + var styleRule3 = 'height:12px;line-height:12px;text-align:center;background-color:' + + cBarConditional + ';padding:auto 6px;'; + //Square is default, make template round if pShape == round + if (pShape == 'round') { + styleRule2 += 'border-radius:5px;'; + styleRule3 += 'border-top-left-radius:4px;border-bottom-left-radius:4px;'; + } //Return the code for the bar return ('
Date: Mon, 18 Sep 2023 09:21:27 +0100 Subject: [PATCH 4/5] Fix: Correct naming for slidingChild feature plugin https://datatables.net/forums/discussion/77195 --- ...atatables.slidingChild.d.ts => dataTables.slidingChild.d.ts} | 0 .../{datatables.slidingChild.js => dataTables.slidingChild.js} | 0 features/slidingChild/dataTables.slidingChild.min.js | 2 ++ ...les.slidingChild.min.mjs => dataTables.slidingChild.min.mjs} | 0 ...{datatables.slidingChild.mjs => dataTables.slidingChild.mjs} | 0 features/slidingChild/datatables.slidingChild.min.js | 2 -- .../{datatables.slidingChild.ts => dataTables.slidingChild.ts} | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename features/slidingChild/{datatables.slidingChild.d.ts => dataTables.slidingChild.d.ts} (100%) rename features/slidingChild/{datatables.slidingChild.js => dataTables.slidingChild.js} (100%) rename features/slidingChild/{datatables.slidingChild.min.mjs => dataTables.slidingChild.min.mjs} (100%) rename features/slidingChild/{datatables.slidingChild.mjs => dataTables.slidingChild.mjs} (100%) delete mode 100644 features/slidingChild/datatables.slidingChild.min.js rename features/slidingChild/src/{datatables.slidingChild.ts => dataTables.slidingChild.ts} (100%) diff --git a/features/slidingChild/datatables.slidingChild.d.ts b/features/slidingChild/dataTables.slidingChild.d.ts similarity index 100% rename from features/slidingChild/datatables.slidingChild.d.ts rename to features/slidingChild/dataTables.slidingChild.d.ts diff --git a/features/slidingChild/datatables.slidingChild.js b/features/slidingChild/dataTables.slidingChild.js similarity index 100% rename from features/slidingChild/datatables.slidingChild.js rename to features/slidingChild/dataTables.slidingChild.js diff --git a/features/slidingChild/dataTables.slidingChild.min.js b/features/slidingChild/dataTables.slidingChild.min.js index e69de29..121fa6f 100644 --- a/features/slidingChild/dataTables.slidingChild.min.js +++ b/features/slidingChild/dataTables.slidingChild.min.js @@ -0,0 +1,2 @@ +/*! © Nick Adkinson, SpryMedia Ltd - datatables.net/license */ +!function(t){var n,e;"function"==typeof define&&define.amd?define(["jquery","datatables.net"],function(i){return t(i,window,document)}):"object"==typeof exports?(n=require("jquery"),e=function(i,o){o.fn.dataTable||require("datatables.net")(i,o)},"undefined"==typeof window?module.exports=function(i,o){return i=i||window,o=o||n(i),e(i,o),t(o,0,i.document)}:(e(window,n),module.exports=t(n,window,window.document))):t(jQuery,window,document)}(function(d,i,s,o){"use strict";function a(i,o){var t=this,n=(i.on("draw",function(){t._updateFadedRows()}),i.table()),e=s.createElement("div");e.className="slider",this.s=d.extend({},{dt:i,table:d(n.node()),slider:d(e)},a.defaults,o),this._bind()}var t=d.fn.dataTable;a.prototype._bind=function(){var o=this,t=o.s;d(t.table,"> tbody").on("click",t.selector,function(){var i=d(this),i=i.is("tr")?i:i.closest("tr");i.is("tr")&&(i=t.dt.row(i),o._toggleChild(i))})},a.prototype._toggleChild=function(i){var o,t=this.s;i.child.isShown()?this._hideChild(i,function(){}):(o=t.dt.row(".shown")).length&&t.toggle?this._hideChild(o,this._showChildCallback(i)):this._showChild(i)},a.prototype._showChildCallback=function(i){return function(i){this._showChild(i)}.bind(this,i)},a.prototype._showChild=function(i){var o=d(i.node());this.s.displayLoadingIndicator&&this._addLoadingIndicator(o),this.s.source(o,this._response(i))},a.prototype._response=function(i){return function(i,o){this.__showChild(i,o)}.bind(this,i)},a.prototype.__showChild=function(i,o){var t=this.s,n=t.slider,e=d(i.node());t.displayLoadingIndicator&&d("."+this.s.loadingIndicatorClass).remove(),n.append(o),i.child(n,t.childClass).show(),e.toggleClass("shown"),this._updateFadedRows(),t.animateShow?this._showChildWithAnimation(i):this._showChildWithoutAnimation(i)},a.prototype._showChildWithAnimation=function(i){var o=this.s;d(o.slider,i.child()).slideDown(o.animationSpeed,function(){o.onShown(i)})},a.prototype._showChildWithoutAnimation=function(i){var o=this.s;d(o.slider,i.child()).show(),o.onShown(i)},a.prototype._hideChild=function(i,o){var t=this.s;d(i.node()).toggleClass("shown"),this._updateFadedRows(),t.animateHide?this._hideChildWithAnimation(i,o):this._hideChildWithoutAnimation(i,o)},a.prototype._hideChildWithAnimation=function(i,o){var t=this.s,n=t.slider;d(n,i.child()).slideUp(t.animationSpeed,function(){i.child.remove(),n.empty(),t.onHidden(i),o()})},a.prototype._hideChildWithoutAnimation=function(i,o){var t=this.s,n=t.slider;d(n,i.child()).hide(),i.child.remove(),n.empty(),t.onHidden(i),o()},a.prototype._updateFadedRows=function(){this.s.fadeNonShowingRows?(this._fadeNonShowingRows(),this._removeFadeFromShowingRows()):this._removeFadeFromRows()},a.prototype._fadeNonShowingRows=function(){this.s.dt.rows(".shown:visible").count()?this.s.dt.rows(":visible:not(.shown):not(.faded)").nodes().to$().css("opacity",this.s.fadeOpacity).addClass("faded"):this._removeFadeFromRows()},a.prototype._removeFadeFromShowingRows=function(){this.s.dt.rows(".shown.faded:visible").nodes().to$().css("opacity",1).removeClass("faded")},a.prototype._removeFadeFromRows=function(){this.s.dt.rows(".faded").nodes().to$().css("opacity",1).removeClass("faded")},a.prototype._addLoadingIndicator=function(i){var o=i.position(),t=d(this.s.loadingIndicatorContent);t.addClass(this.s.loadingIndicatorClass),t.css("top",o.top),t.css("left",o.left),t.css("height",i.height()),i.append(t)};return a.defaults={selector:"tr",childClass:"child",source:function(){},toggle:!0,animateShow:!0,animateHide:!0,fadeNonShowingRows:!1,fadeOpacity:.4,animationSpeed:200,onShown:function(){},onHidden:function(){},displayLoadingIndicator:!1,loadingIndicatorClass:"loading-indicator",loadingIndicatorContent:'
Loading...
'},t.SlidingChild=a,d(s).on("init.dt",function(i,o){"dt"===i.namespace&&(i=new t.Api(o),d(i.table().node()).hasClass("slidingChild")||o.oInit.slidingChild||t.defaults.slidingChild)&&new a(i,o.oInit.slidingChild)}),t}); \ No newline at end of file diff --git a/features/slidingChild/datatables.slidingChild.min.mjs b/features/slidingChild/dataTables.slidingChild.min.mjs similarity index 100% rename from features/slidingChild/datatables.slidingChild.min.mjs rename to features/slidingChild/dataTables.slidingChild.min.mjs diff --git a/features/slidingChild/datatables.slidingChild.mjs b/features/slidingChild/dataTables.slidingChild.mjs similarity index 100% rename from features/slidingChild/datatables.slidingChild.mjs rename to features/slidingChild/dataTables.slidingChild.mjs diff --git a/features/slidingChild/datatables.slidingChild.min.js b/features/slidingChild/datatables.slidingChild.min.js deleted file mode 100644 index 121fa6f..0000000 --- a/features/slidingChild/datatables.slidingChild.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! © Nick Adkinson, SpryMedia Ltd - datatables.net/license */ -!function(t){var n,e;"function"==typeof define&&define.amd?define(["jquery","datatables.net"],function(i){return t(i,window,document)}):"object"==typeof exports?(n=require("jquery"),e=function(i,o){o.fn.dataTable||require("datatables.net")(i,o)},"undefined"==typeof window?module.exports=function(i,o){return i=i||window,o=o||n(i),e(i,o),t(o,0,i.document)}:(e(window,n),module.exports=t(n,window,window.document))):t(jQuery,window,document)}(function(d,i,s,o){"use strict";function a(i,o){var t=this,n=(i.on("draw",function(){t._updateFadedRows()}),i.table()),e=s.createElement("div");e.className="slider",this.s=d.extend({},{dt:i,table:d(n.node()),slider:d(e)},a.defaults,o),this._bind()}var t=d.fn.dataTable;a.prototype._bind=function(){var o=this,t=o.s;d(t.table,"> tbody").on("click",t.selector,function(){var i=d(this),i=i.is("tr")?i:i.closest("tr");i.is("tr")&&(i=t.dt.row(i),o._toggleChild(i))})},a.prototype._toggleChild=function(i){var o,t=this.s;i.child.isShown()?this._hideChild(i,function(){}):(o=t.dt.row(".shown")).length&&t.toggle?this._hideChild(o,this._showChildCallback(i)):this._showChild(i)},a.prototype._showChildCallback=function(i){return function(i){this._showChild(i)}.bind(this,i)},a.prototype._showChild=function(i){var o=d(i.node());this.s.displayLoadingIndicator&&this._addLoadingIndicator(o),this.s.source(o,this._response(i))},a.prototype._response=function(i){return function(i,o){this.__showChild(i,o)}.bind(this,i)},a.prototype.__showChild=function(i,o){var t=this.s,n=t.slider,e=d(i.node());t.displayLoadingIndicator&&d("."+this.s.loadingIndicatorClass).remove(),n.append(o),i.child(n,t.childClass).show(),e.toggleClass("shown"),this._updateFadedRows(),t.animateShow?this._showChildWithAnimation(i):this._showChildWithoutAnimation(i)},a.prototype._showChildWithAnimation=function(i){var o=this.s;d(o.slider,i.child()).slideDown(o.animationSpeed,function(){o.onShown(i)})},a.prototype._showChildWithoutAnimation=function(i){var o=this.s;d(o.slider,i.child()).show(),o.onShown(i)},a.prototype._hideChild=function(i,o){var t=this.s;d(i.node()).toggleClass("shown"),this._updateFadedRows(),t.animateHide?this._hideChildWithAnimation(i,o):this._hideChildWithoutAnimation(i,o)},a.prototype._hideChildWithAnimation=function(i,o){var t=this.s,n=t.slider;d(n,i.child()).slideUp(t.animationSpeed,function(){i.child.remove(),n.empty(),t.onHidden(i),o()})},a.prototype._hideChildWithoutAnimation=function(i,o){var t=this.s,n=t.slider;d(n,i.child()).hide(),i.child.remove(),n.empty(),t.onHidden(i),o()},a.prototype._updateFadedRows=function(){this.s.fadeNonShowingRows?(this._fadeNonShowingRows(),this._removeFadeFromShowingRows()):this._removeFadeFromRows()},a.prototype._fadeNonShowingRows=function(){this.s.dt.rows(".shown:visible").count()?this.s.dt.rows(":visible:not(.shown):not(.faded)").nodes().to$().css("opacity",this.s.fadeOpacity).addClass("faded"):this._removeFadeFromRows()},a.prototype._removeFadeFromShowingRows=function(){this.s.dt.rows(".shown.faded:visible").nodes().to$().css("opacity",1).removeClass("faded")},a.prototype._removeFadeFromRows=function(){this.s.dt.rows(".faded").nodes().to$().css("opacity",1).removeClass("faded")},a.prototype._addLoadingIndicator=function(i){var o=i.position(),t=d(this.s.loadingIndicatorContent);t.addClass(this.s.loadingIndicatorClass),t.css("top",o.top),t.css("left",o.left),t.css("height",i.height()),i.append(t)};return a.defaults={selector:"tr",childClass:"child",source:function(){},toggle:!0,animateShow:!0,animateHide:!0,fadeNonShowingRows:!1,fadeOpacity:.4,animationSpeed:200,onShown:function(){},onHidden:function(){},displayLoadingIndicator:!1,loadingIndicatorClass:"loading-indicator",loadingIndicatorContent:'
Loading...
'},t.SlidingChild=a,d(s).on("init.dt",function(i,o){"dt"===i.namespace&&(i=new t.Api(o),d(i.table().node()).hasClass("slidingChild")||o.oInit.slidingChild||t.defaults.slidingChild)&&new a(i,o.oInit.slidingChild)}),t}); \ No newline at end of file diff --git a/features/slidingChild/src/datatables.slidingChild.ts b/features/slidingChild/src/dataTables.slidingChild.ts similarity index 100% rename from features/slidingChild/src/datatables.slidingChild.ts rename to features/slidingChild/src/dataTables.slidingChild.ts From 257a4c7c22ec168a1f550ec1b9add8bd5f1edc78 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Tue, 28 Nov 2023 15:39:35 +0000 Subject: [PATCH 5/5] Fix: any-number extension should work with non-sting values (ie. numbers!) gh#455 --- sorting/any-number.js | 63 +++++++++++++++++++++++++++++++++++--- sorting/any-number.min.js | 2 +- sorting/any-number.min.mjs | 2 +- sorting/any-number.mjs | 12 +++++--- sorting/src/any-number.ts | 15 ++++++--- 5 files changed, 80 insertions(+), 14 deletions(-) diff --git a/sorting/any-number.js b/sorting/any-number.js index c7eda6e..891b69f 100644 --- a/sorting/any-number.js +++ b/sorting/any-number.js @@ -1,4 +1,51 @@ /*! © SpryMedia Ltd, David Konrad - datatables.net/license */ + +(function( factory ){ + if ( typeof define === 'function' && define.amd ) { + // AMD + define( ['jquery', 'datatables.net'], function ( $ ) { + return factory( $, window, document ); + } ); + } + else if ( typeof exports === 'object' ) { + // CommonJS + var jq = require('jquery'); + var cjsRequires = function (root, $) { + if ( ! $.fn.dataTable ) { + require('datatables.net')(root, $); + } + }; + + if (typeof window === 'undefined') { + module.exports = function (root, $) { + if ( ! root ) { + // CommonJS environments without a window global must pass a + // root. This will give an error otherwise + root = window; + } + + if ( ! $ ) { + $ = jq( root ); + } + + cjsRequires( root, $ ); + return factory( $, root, root.document ); + }; + } + else { + cjsRequires( window, jq ); + module.exports = factory( jq, window, window.document ); + } + } + else { + // Browser + factory( jQuery, window, document ); + } +}(function( $, window, document ) { +'use strict'; +var DataTable = $.fn.dataTable; + + /** * Sorts columns by any number, ignoring text. This plugin is useful if you have * mixed content in a column, but still want to sort by numbers. Any number means @@ -29,10 +76,14 @@ */ function _anyNumberSort(a, b, high) { var reg = /[+-]?((\d+(\.\d*)?)|\.\d+)([eE][+-]?[0-9]+)?/; - a = a.replace(',', '.').match(reg); - a = a !== null ? parseFloat(a[0]) : high; - b = b.replace(',', '.').match(reg); - b = b !== null ? parseFloat(b[0]) : high; + if (typeof a === 'string') { + a = a.replace(',', '.').match(reg); + a = a !== null ? parseFloat(a[0]) : high; + } + if (typeof b === 'string') { + b = b.replace(',', '.').match(reg); + b = b !== null ? parseFloat(b[0]) : high; + } return a < b ? -1 : a > b ? 1 : 0; } DataTable.ext.type.order['any-number-asc'] = function (a, b) { @@ -41,3 +92,7 @@ DataTable.ext.type.order['any-number-asc'] = function (a, b) { DataTable.ext.type.order['any-number-desc'] = function (a, b) { return _anyNumberSort(a, b, Number.NEGATIVE_INFINITY) * -1; }; + + +return DataTable; +})); diff --git a/sorting/any-number.min.js b/sorting/any-number.min.js index a6f59fc..3cfd905 100644 --- a/sorting/any-number.min.js +++ b/sorting/any-number.min.js @@ -1,2 +1,2 @@ /*! © SpryMedia Ltd, David Konrad - datatables.net/license */ -!function(t){var r,u;"function"==typeof define&&define.amd?define(["jquery","datatables.net"],function(e){return t(e,window,document)}):"object"==typeof exports?(r=require("jquery"),u=function(e,n){n.fn.dataTable||require("datatables.net")(e,n)},"undefined"==typeof window?module.exports=function(e,n){return e=e||window,n=n||r(e),u(e,n),t(n,0,e.document)}:(u(window,r),module.exports=t(r,window,window.document))):t(jQuery,window,document)}(function(e,n,t,r){"use strict";e=e.fn.dataTable;function u(e,n,t){var r=/[+-]?((\d+(\.\d*)?)|\.\d+)([eE][+-]?[0-9]+)?/;return(e=null!==(e=e.replace(",",".").match(r))?parseFloat(e[0]):t)<(n=null!==(n=n.replace(",",".").match(r))?parseFloat(n[0]):t)?-1:n b ? 1 : 0; } DataTable.ext.type.order['any-number-asc'] = function (a, b) { diff --git a/sorting/src/any-number.ts b/sorting/src/any-number.ts index ff5510d..11fbc70 100644 --- a/sorting/src/any-number.ts +++ b/sorting/src/any-number.ts @@ -33,10 +33,17 @@ import DataTable from 'datatables.net'; function _anyNumberSort(a, b, high) { var reg = /[+-]?((\d+(\.\d*)?)|\.\d+)([eE][+-]?[0-9]+)?/; - a = a.replace(',', '.').match(reg); - a = a !== null ? parseFloat(a[0]) : high; - b = b.replace(',', '.').match(reg); - b = b !== null ? parseFloat(b[0]) : high; + + if (typeof a === 'string') { + a = a.replace(',', '.').match(reg); + a = a !== null ? parseFloat(a[0]) : high; + } + + if (typeof b === 'string') { + b = b.replace(',', '.').match(reg); + b = b !== null ? parseFloat(b[0]) : high; + } + return a < b ? -1 : a > b ? 1 : 0; }