@bennerinformatics/ember-fw-table 2.1.0 → 2.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
|
|
37
37
|
{{!-- Second page numbers --}}
|
|
38
38
|
{{#if (and showPages showPagesBottom)}}
|
|
39
|
-
<div class="text-center"
|
|
39
|
+
<div class="text-center">
|
|
40
40
|
<PageNumbers @content={{hash }} @showFL={{true}} @currentPage={{page}} @numPagesToShow={{maxPageButtons}} @totalPages={{totalPages}} @action={{action "setPage"}} />
|
|
41
41
|
</div>
|
|
42
42
|
{{/if}}
|
package/addon/utils/formats.js
CHANGED
|
@@ -84,10 +84,11 @@ export function formatNullable(nullText = 'None') {
|
|
|
84
84
|
*/
|
|
85
85
|
export function formatMoment(format, exportFormat = null) {
|
|
86
86
|
return function(date) {
|
|
87
|
-
if (moment.isMoment(date)) {
|
|
88
|
-
|
|
89
|
-
let useFormat = exportFormat && this['export'] ? exportFormat : format;
|
|
90
|
-
return date.format(useFormat);
|
|
87
|
+
if (!moment.isMoment(date)) {
|
|
88
|
+
date = moment(date);
|
|
91
89
|
}
|
|
90
|
+
// if we are exporting and have an export format, use that
|
|
91
|
+
let useFormat = exportFormat && this['export'] ? exportFormat : format;
|
|
92
|
+
return date.format(useFormat);
|
|
92
93
|
};
|
|
93
94
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bennerinformatics/ember-fw-table",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.2",
|
|
4
4
|
"description": "Additional resources related to tables for the Ember FW App System.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ember-addon",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"ember-light-table": "2.0.0-beta.5",
|
|
26
26
|
"ember-papaparse": "^1.0.0",
|
|
27
27
|
"ember-truth-helpers": "^2.1.0",
|
|
28
|
-
"
|
|
28
|
+
"sass": "1.32.13",
|
|
29
29
|
"papaparse": "^5.0.2"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|