|
940 | 940 | switch (datatype)
|
941 | 941 | {
|
942 | 942 | case "Date":
|
943 |
| - var date = new Date(value); |
| 943 | + var date; |
| 944 | + var pos; |
| 945 | + |
| 946 | + if (typeof (value) === "string" && (pos = value.indexOf("T")) != -1) |
| 947 | + { |
| 948 | + value = value.substr(0, pos); |
| 949 | + |
| 950 | + // Strip time, we only want date |
| 951 | + var parts = value.split('-'); |
| 952 | + |
| 953 | + // new Date(year, month [, day [, hours[, minutes[, seconds[, ms]]]]]) |
| 954 | + date = new Date(parts[0], parts[1] - 1, parts[2]); // Note: months are 0-based |
| 955 | + } |
| 956 | + else |
| 957 | + date = new Date(value); |
| 958 | + |
| 959 | + date.setHours(0, 0, 0, 0); |
| 960 | + |
944 | 961 | value = date.toLocaleDateString();
|
| 962 | + |
945 | 963 | break;
|
946 | 964 | case "Currency":
|
947 | 965 | value = parseFloat(value).toFixed(2);
|
|
986 | 1004 | this.$element.find("form .transient").remove();
|
987 | 1005 | this.$element.find("form")[0].reset();
|
988 | 1006 |
|
989 |
| - this.setFilterValues(this.options.filterDefaults); |
| 1007 | + this.setFilterValues(this.options.filterDefaults, null, true); |
990 | 1008 |
|
991 | 1009 | // clear any none's that were inadvertently reset
|
992 | 1010 | this.$element.find(".griddly-filters-form [data-griddly-filter-isnoneall=true] [multiple] option[value=]").prop("selected", false);
|
|
1442 | 1460 | return this.ajax(url, selection, button, griddly);
|
1443 | 1461 | }
|
1444 | 1462 | }
|
1445 |
| - else if (!toggle && url) |
| 1463 | + else if (!toggle && url && typeof confirmMessage !== "undefined") |
1446 | 1464 | window.location = url;
|
1447 | 1465 |
|
1448 | 1466 | if (onclick)
|
|
0 commit comments