@concretecms/bedrock 1.4.3 → 1.4.5
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.
|
@@ -37,8 +37,6 @@
|
|
|
37
37
|
}
|
|
38
38
|
</style>
|
|
39
39
|
<script>
|
|
40
|
-
import moment from 'moment-timezone'
|
|
41
|
-
|
|
42
40
|
export default {
|
|
43
41
|
props: {
|
|
44
42
|
rule: Object,
|
|
@@ -82,14 +80,14 @@ export default {
|
|
|
82
80
|
},
|
|
83
81
|
startDate: function() {
|
|
84
82
|
if (this.rule.startDate > 0) {
|
|
85
|
-
|
|
86
|
-
return
|
|
83
|
+
var date = new Date(this.rule.startDate * 1000) // Note: this currently does not take into account timezone. We used to use moment but it was too much.
|
|
84
|
+
return date.toLocaleString() + ' (' + this.rule.timezone + ')'
|
|
87
85
|
}
|
|
88
86
|
},
|
|
89
87
|
endDate: function() {
|
|
90
88
|
if (this.rule.endDate > 0) {
|
|
91
|
-
|
|
92
|
-
return
|
|
89
|
+
var date = new Date(this.rule.endDate * 1000) // Note: this currently does not take into account timezone. We used to use moment but it was too much.
|
|
90
|
+
return date.toLocaleString() + ' (' + this.rule.timezone + ')'
|
|
93
91
|
}
|
|
94
92
|
}
|
|
95
93
|
},
|
|
@@ -79,7 +79,7 @@ export default {
|
|
|
79
79
|
})
|
|
80
80
|
})
|
|
81
81
|
|
|
82
|
-
menu.$menu.find('a[data-menu-action=unpin-item],a[data-menu-action=delete-custom-slot').on('click', function () {
|
|
82
|
+
menu.$menu.find('a[data-menu-action=unpin-item],a[data-menu-action=delete-custom-slot]').on('click', function () {
|
|
83
83
|
new ConcreteAjaxRequest({
|
|
84
84
|
url: CCM_DISPATCHER_FILENAME + '/ccm/system/board/instance/clear_slot',
|
|
85
85
|
data: {
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
import { ToggleButton } from 'vue-js-toggle-button'
|
|
2
|
-
import VCalendar from 'v-calendar/lib/components/calendar.umd'
|
|
3
|
-
import VDatePicker from 'v-calendar/lib/components/date-picker.umd'
|
|
4
1
|
import Toggle from './form/Toggle'
|
|
5
2
|
import ContextMenu from './menu/ContextMenu'
|
|
6
3
|
import MenuButton from './menu/MenuButton'
|
|
@@ -35,7 +32,6 @@ import ConcreteThumbnailEditor from './Image/ThumbnailEditor'
|
|
|
35
32
|
import ConcreteHelpModal from './Help/Modal'
|
|
36
33
|
import Board from './Board'
|
|
37
34
|
import BoardSlot from './BoardSlot'
|
|
38
|
-
import BoardInstanceRule from './BoardInstanceRule'
|
|
39
35
|
import BoardInstanceRuleList from './BoardInstanceRuleList'
|
|
40
36
|
import IconSelector from './form/IconSelector'
|
|
41
37
|
import CompletedProcessList from './CompletedProcessList'
|
|
@@ -49,10 +45,7 @@ import PasswordInput from './form/PasswordInput'
|
|
|
49
45
|
|
|
50
46
|
// Export our component library
|
|
51
47
|
export default {
|
|
52
|
-
VCalendar,
|
|
53
|
-
VDatePicker,
|
|
54
48
|
Toggle,
|
|
55
|
-
ToggleButton,
|
|
56
49
|
ContextMenu,
|
|
57
50
|
MenuButton,
|
|
58
51
|
MenuDivider,
|
|
@@ -86,7 +79,6 @@ export default {
|
|
|
86
79
|
ConcreteHelpModal,
|
|
87
80
|
Board,
|
|
88
81
|
BoardSlot,
|
|
89
|
-
BoardInstanceRule,
|
|
90
82
|
BoardInstanceRuleList,
|
|
91
83
|
IconSelector,
|
|
92
84
|
RunningProcessList,
|
package/package.json
CHANGED