diff --git a/js/gamutable.es6.js b/js/gamutable.es6.js index b16dce5..25ae577 100644 --- a/js/gamutable.es6.js +++ b/js/gamutable.es6.js @@ -31,14 +31,16 @@ const orderBy = (arr, props, orders) => // transforme 03/11/2000 en 20001103 let re = /^(\d{2})\/(\d{2})\/(\d{2,4})$/; - let r1 = p1.match(re); - if (Array.isArray(r1)) { - p1 = r1[3] + r1[2] + r1[1]; - } + if (typeof p1 !== 'number') { + let r1 = p1.match(re); + if (Array.isArray(r1)) { + p1 = r1[3] + r1[2] + r1[1]; + } - let r2 = p2.match(re); - if (Array.isArray(r2)) { - p2 = r2[3] + r2[2] + r2[1]; + let r2 = p2.match(re); + if (Array.isArray(r2)) { + p2 = r2[3] + r2[2] + r2[1]; + } } acc = p1 > p2 ? 1 : p1 < p2 ? -1 : 0; @@ -88,7 +90,6 @@ let monTableau = { }, computed: { tableau: function() { - console.log('computed tableau'); return this.pagination( this.table.filter(ligne => { if (this.search) { diff --git a/js/gamutable.js b/js/gamutable.js index 7e97b48..a6b19fc 100644 --- a/js/gamutable.js +++ b/js/gamutable.js @@ -45,16 +45,19 @@ var orderBy = function orderBy(arr, props, orders) { // transforme 03/11/2000 en 20001103 var re = /^(\d{2})\/(\d{2})\/(\d{2,4})$/; - var r1 = p1.match(re); - if (Array.isArray(r1)) { - p1 = r1[3] + r1[2] + r1[1]; - } + if (typeof p1 !== 'number') { + var r1 = p1.match(re); - var r2 = p2.match(re); + if (Array.isArray(r1)) { + p1 = r1[3] + r1[2] + r1[1]; + } - if (Array.isArray(r2)) { - p2 = r2[3] + r2[2] + r2[1]; + var r2 = p2.match(re); + + if (Array.isArray(r2)) { + p2 = r2[3] + r2[2] + r2[1]; + } } acc = p1 > p2 ? 1 : p1 < p2 ? -1 : 0; @@ -108,7 +111,6 @@ var monTableau = { tableau: function tableau() { var _this = this; - console.log('computed tableau'); return this.pagination(this.table.filter(function (ligne) { if (_this.search) { if (!Object.values(ligne).every(function (el) {