@concretecms/bedrock 1.4.2 → 1.4.4

package/assets/bedrock/js/frontend.js

@@ -2,8 +2,6 @@ import jQuery from 'jquery'
 import 'bootstrap'
 // We will be refactoring this, also it causes problems with installation.
 // import './frontend/async-thumbnail-builder'
-import './frontend/locations/country-data-link'
-import './frontend/locations/country-stateprovince-link'
 
 // Let us use Vue with our theme JS
 import VueManager from '../../../assets/cms/js/vue/Manager'

package/assets/cms/components/BoardInstanceRule.vue

@@ -37,8 +37,6 @@
 }
 </style>
 <script>
-import moment from 'moment-timezone'
-
 export default {
     props: {
         rule: Object,
@@ -82,14 +80,14 @@ export default {
         },
         startDate: function() {
             if (this.rule.startDate > 0) {
-                const momentDate = moment.unix(this.rule.startDate).tz(this.rule.timezone)
-                return momentDate.format('MMMM D, YYYY h:mm a')
+                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.
+                return date.toLocaleString() + ' (' + this.rule.timezone + ')'
             }
         },
         endDate: function() {
             if (this.rule.endDate > 0) {
-                const momentDate = moment.unix(this.rule.endDate).tz(this.rule.timezone)
-                return momentDate.format('MMMM D, YYYY h:mm a')
+                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.
+                return date.toLocaleString() + ' (' + this.rule.timezone + ')'
             }
         }
     },

package/assets/cms/components/index.js

@@ -1,6 +1,3 @@
-import { ToggleButton } from 'vue-js-toggle-button'
-import VCalendar from 'v-calendar/lib/components/calendar.umd'
-import VDatePicker from 'v-calendar/lib/components/date-picker.umd'
 import Toggle from './form/Toggle'
 import ContextMenu from './menu/ContextMenu'
 import MenuButton from './menu/MenuButton'
@@ -35,7 +32,6 @@ import ConcreteThumbnailEditor from './Image/ThumbnailEditor'
 import ConcreteHelpModal from './Help/Modal'
 import Board from './Board'
 import BoardSlot from './BoardSlot'
-import BoardInstanceRule from './BoardInstanceRule'
 import BoardInstanceRuleList from './BoardInstanceRuleList'
 import IconSelector from './form/IconSelector'
 import CompletedProcessList from './CompletedProcessList'
@@ -49,10 +45,7 @@ import PasswordInput from './form/PasswordInput'
 
 // Export our component library
 export default {
-    VCalendar,
-    VDatePicker,
     Toggle,
-    ToggleButton,
     ContextMenu,
     MenuButton,
     MenuDivider,
@@ -86,7 +79,6 @@ export default {
     ConcreteHelpModal,
     Board,
     BoardSlot,
-    BoardInstanceRule,
     BoardInstanceRuleList,
     IconSelector,
     RunningProcessList,

package/assets/cms/js/modal.js

@@ -9,6 +9,9 @@ import bootbox from 'bootbox'
 class ConcreteModal {
     openExternal(url, title, options) {
         var my = this
+        if (!options) {
+            options = {}
+        }
         new ConcreteAjaxRequest({
             url: url,
             dataType: 'html',

package/assets/conversations/js/frontend/conversations.js

@@ -130,7 +130,9 @@ window._ = _
                         var target = $('a' + window.location.hash).offset()
                         $('html, body').animate({ scrollTop: target.top }, 800, 'linear')
                     }
-                    window.obj = oldobj
+                    if (oldobj) {
+                        window.obj = oldobj
+                    }
                     obj.attachBindings()
                     obj.publish('conversationLoaded')
                 })

package/assets/{bedrock/js/frontend/locations → forms/js/frontend}/country-data-link.js

@@ -1,3 +1,4 @@
+/* eslint-disable eqeqeq */
 var USE_MUTATIONOBSERVER = !!(window.MutationObserver && window.MutationObserver.prototype && window.MutationObserver.prototype.observe)
 
 function loadDataForCountry(countryCode, callback) {
@@ -185,7 +186,7 @@ Link.prototype = {
                         .val(spCode)
                         .text(name)
 
-                    if (spCode === selectedStateprovince) {
+                    if (spCode == selectedStateprovince) {
                         $o.attr('selected', 'selected')
                     }
                     me.$stateprovinceSelect.append($o)

package/assets/forms/js/frontend.js

@@ -0,0 +1,2 @@
+import './frontend/country-stateprovince-link'
+import './frontend/country-data-link'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",