diff --git a/package-lock.json b/package-lock.json index 1879df7a..eb1d8409 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12699,14 +12699,6 @@ } } }, - "vue-moment": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/vue-moment/-/vue-moment-4.1.0.tgz", - "integrity": "sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw==", - "requires": { - "moment": "^2.19.2" - } - }, "vue-pincode-input": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/vue-pincode-input/-/vue-pincode-input-0.4.0.tgz", diff --git a/package.json b/package.json index 1178ff70..baada957 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "vue": "^2.6.12", "vue-clipboard2": "^0.3.1", "vue-i18n": "^8.23.0", - "vue-moment": "^4.1.0", "vue-pincode-input": "^0.4.0", "vuex": "^3.6.2" }, diff --git a/src/filters/moment.js b/src/filters/moment.js new file mode 100644 index 00000000..e623c2ca --- /dev/null +++ b/src/filters/moment.js @@ -0,0 +1,9 @@ +import utils from "../lib/utils.js"; + +export default function (value, format) { + if (utils.isNumber(value)) { + return utils.formatUnixTime(value, format); + } else { + return utils.formatTime(value, format); + } +} diff --git a/src/lib/utils.js b/src/lib/utils.js index a40e93d5..88104936 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -70,6 +70,10 @@ function formatUnixTime(unixTime, format) { return moment.unix(unixTime).format(format); } +function formatTime(dateTime, format) { + return moment(dateTime).format(format); +} + function getUnixTime(date) { return moment(date).unix(); } @@ -591,6 +595,7 @@ export default { getCurrentUnixTime, parseDateFromUnixTime, formatUnixTime, + formatTime, getUnixTime, getYear, getMonth, diff --git a/src/mobile-main.js b/src/mobile-main.js index f2472fba..8e020c16 100644 --- a/src/mobile-main.js +++ b/src/mobile-main.js @@ -3,7 +3,6 @@ import Vuex from 'vuex'; import VueI18n from 'vue-i18n'; import PincodeInput from 'vue-pincode-input'; -import VueMoment from 'vue-moment'; import VueClipboard from 'vue-clipboard2'; import moment from 'moment-timezone'; @@ -69,6 +68,7 @@ import { getAllLanguages, getLanguage, getDefaultLanguage, getI18nOptions, getLo import stores from './store/index.js'; import localizedFilter from './filters/localized.js'; +import momentFilter from './filters/moment.js'; import percentFilter from './filters/percent.js'; import itemFieldContentFilter from './filters/itemFieldContent.js'; import currencyFilter from './filters/currency.js'; @@ -131,7 +131,6 @@ Framework7.use(Framework7Vue); Vue.use(Vuex); Vue.use(VueI18n); -Vue.use(VueMoment, { moment }); Vue.use(VueClipboard); Vue.component('PincodeInput', PincodeInput); @@ -150,6 +149,7 @@ Vue.component('NumberPadSheet', NumberPadSheet); Vue.component('TransactionTagSelectionSheet', TransactionTagSelectionSheet); Vue.filter('localized', (value, options) => localizedFilter({ i18n }, value, options)); +Vue.filter('moment', (value, format) => momentFilter(value, format)); Vue.filter('percent', (value, precision, lowPrecisionValue) => percentFilter(value, precision, lowPrecisionValue)); Vue.filter('itemFieldContent', (value, fieldName, defaultValue, translate) => itemFieldContentFilter({ i18n }, value, fieldName, defaultValue, translate)); Vue.filter('currency', (value, currencyCode) => currencyFilter({ i18n }, value, currencyCode)); diff --git a/third-patry-licenses.json b/third-patry-licenses.json index 89cc681b..fdab60fa 100644 --- a/third-patry-licenses.json +++ b/third-patry-licenses.json @@ -99,12 +99,6 @@ "url": "https://github.com/kazupon/vue-i18n", "licenseUrl": "https://github.com/kazupon/vue-i18n/blob/v8.x/LICENSE" }, - { - "name": "vue-moment", - "copyright": "Copyright (c) 2017 Brock Petrie", - "url": "https://github.com/brockpetrie/vue-moment", - "licenseUrl": "https://github.com/brockpetrie/vue-moment/blob/master/LICENSE" - }, { "name": "vue-clipboard2", "copyright": "Copyright (c) 2017 Inndy ",