Skip to content

Commit 0e91f31

Browse files
committed
refactor: Remove Momentjs dependency. Datetime allows use of String, Number and JS Dates instead.
1 parent a8b1813 commit 0e91f31

File tree

19 files changed

+472
-462
lines changed

19 files changed

+472
-462
lines changed

dev/components/components/chat.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
</template>
2121

2222
<script>
23-
import moment from 'moment'
23+
import { format } from 'quasar'
24+
const { formatDate } = format
2425
2526
export default {
2627
data () {
@@ -169,7 +170,7 @@ export default {
169170
text: [this.message],
170171
sent: true,
171172
avatar: '/statics/linux-avatar.png',
172-
stamp: moment().format('HH:mm')
173+
stamp: formatDate(new Date(), 'HH:mm')
173174
})
174175
}
175176
}

dev/components/form/datetime-range.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,25 @@
5757
</template>
5858

5959
<script>
60-
import moment from 'moment'
60+
const day = new Date('2016-10-24T10:40:14.674Z')
6161
6262
export default {
6363
data () {
6464
return {
6565
first: {
66-
min: moment('2016-10-24T10:40:14.674Z').subtract(5, 'days').format(),
67-
max: moment('2016-10-24T10:40:14.674Z').add(4, 'hours').add(10, 'minutes').add(1, 'day').add(1, 'month').format(),
66+
min: new Date(day).setDate(day.getDate() - 5),
67+
max: new Date(new Date(new Date(day).setDate(day.getDate() + 1)).setHours(day.getHours() + 4)).setMinutes(day.getMinutes() + 10),
6868
range: {
69-
from: moment('2016-10-24T10:40:14.674Z').subtract(3, 'days').format(),
70-
to: moment('2016-10-24T10:40:14.674Z').add(4, 'hours').add(10, 'minutes').add(1, 'month').format()
69+
from: new Date(day).setDate(day.getDate() - 3),
70+
to: new Date(new Date(new Date(day).setMonth(day.getMonth() + 1)).setHours(day.getHours() + 4)).setMinutes(day.getMinutes() + 10)
7171
}
7272
},
7373
second: {
74-
min: moment().hour(3).minute(15).format(),
75-
max: moment().hour(22).minute(32).format(),
74+
min: new Date(new Date().setHours(3)).setMinutes(15),
75+
max: new Date(new Date().setHours(22)).setMinutes(32),
7676
range: {
77-
from: '',
78-
to: ''
77+
from: null,
78+
to: null
7979
}
8080
}
8181
}

dev/components/form/datetime.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@
152152
<p class="caption">Date & Time</p>
153153
<q-inline-datetime v-model="model" type="datetime"></q-inline-datetime>
154154

155+
<p class="caption">Date - Monday as First</p>
156+
<q-inline-datetime v-model="model" monday-first type="date"></q-inline-datetime>
157+
155158
<p class="caption">Disabled State</p>
156159
<q-inline-datetime disable v-model="model" type="datetime"></q-inline-datetime>
157160

@@ -165,15 +168,17 @@
165168
</template>
166169

167170
<script>
168-
import moment from 'moment'
171+
const day = new Date('2016-10-24T10:40:14.674Z')
169172
170173
export default {
171174
data () {
172175
return {
173-
model: '2016-09-18T10:45:00.000Z',
174-
minMaxModel: '2016-10-24T10:40:14.674Z',
175-
min: moment('2016-10-24T10:40:14.674Z').subtract(5, 'days').format(),
176-
max: moment('2016-10-24T10:40:14.674Z').add(4, 'hours').add(10, 'minutes').add(1, 'month').format()
176+
// model: '2016-09-18T10:45:00.000Z',
177+
model: undefined,
178+
179+
minMaxModel: day,
180+
min: new Date(day).setDate(day.getDate() - 5),
181+
max: new Date(new Date(day).setHours(day.getHours() + 4)).setMonth(day.getMonth() + 1)
177182
}
178183
}
179184
}

dev/main.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@ require('../src/themes/quasar.' + __THEME + '.styl')
33
import Vue from 'vue'
44
import Quasar, * as Everything from 'quasar'
55
import router from './router'
6-
import moment from 'moment'
76

87
Vue.use(Quasar, {
9-
deps: {
10-
moment
11-
},
128
components: Everything,
139
directives: Everything
1410
})

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
"html-webpack-plugin": "^2.22.0",
7272
"json-loader": "^0.5.4",
7373
"material-design-icons": "^3.0.1",
74-
"moment": "^2.15.1",
7574
"opn": "^4.0.2",
7675
"parse5": "^2.1.0",
7776
"postcss-loader": "^1.0.0",
@@ -90,7 +89,7 @@
9089
"stylus": "^0.54.5",
9190
"stylus-loader": "^3.0.1",
9291
"url-loader": "^0.5.7",
93-
"vue": "^2.2.6",
92+
"vue": "^2.3.0",
9493
"vue-loader": "11.1.4",
9594
"vue-router": "^2.0.0",
9695
"vue-style-loader": "^2.0.0",
@@ -101,6 +100,6 @@
101100
"webpack-merge": "^4.1.0"
102101
},
103102
"peerDependencies": {
104-
"vue": "^2.2.0"
103+
"vue": "^2.3.0"
105104
}
106105
}

src/components/data-table/plugins/sort/sort.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import { moment } from '../../../../deps'
2-
31
const sortMethod = {
42
string: (a, b) => a.localeCompare(b),
53
number: (a, b) => a - b,
64
date: (a, b) => (new Date(a)) - (new Date(b)),
7-
moment: (a, b) => moment(a) - moment(b),
85
boolean: (a, b) => {
96
if (a && !b) { return -1 }
107
if (!a && b) { return 1 }

0 commit comments

Comments
 (0)