diff --git a/scripts/system/inventory/public/index.html b/scripts/system/inventory/public/index.html index 5319044edc..51e1aa18f5 100644 --- a/scripts/system/inventory/public/index.html +++ b/scripts/system/inventory/public/index.html @@ -11,20 +11,20 @@ --> - - - - - - <%= htmlWebpackPlugin.options.title %> - - - - - -
- - + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + + +
+ + diff --git a/scripts/system/inventory/public/inventory.js b/scripts/system/inventory/public/inventory.js index 4915aeb6a1..12ecba1546 100644 --- a/scripts/system/inventory/public/inventory.js +++ b/scripts/system/inventory/public/inventory.js @@ -267,11 +267,9 @@ Tablet Vec3 Window */ } function onOpened() { - console.log("hello world!"); } function onClosed() { - console.log("hello world!"); } function startup() { diff --git a/scripts/system/inventory/src/App.vue b/scripts/system/inventory/src/App.vue index 258bf57f7c..f9bc35988b 100644 --- a/scripts/system/inventory/src/App.vue +++ b/scripts/system/inventory/src/App.vue @@ -703,27 +703,25 @@ if (!browserDevelopment()) { receivedCommand = JSON.parse(receivedCommand); // alert("RECEIVED COMMAND:" + receivedCommand.command) if (receivedCommand.app === "inventory") { - // We route the data based on the command given. - if (receivedCommand.command === 'script-to-web-inventory') { - // alert("INVENTORY RECEIVED ON APP:" + JSON.stringify(receivedCommand.data)); - vue_this.receiveInventory(receivedCommand.data); + // We route the data based on the command given. + switch (receivedCommand.command) { + case 'script-to-web-inventory': + // alert("INVENTORY RECEIVED ON APP:" + JSON.stringify(receivedCommand.data)); + vue_this.receiveInventory(receivedCommand.data); + break; + case 'script-to-web-receiving-item-queue': + // alert("RECEIVING ITEM QUEUE:" + JSON.stringify(receivedCommand.data)); + vue_this.receiveReceivingItemQueue(receivedCommand.data); + break; + case 'script-to-web-nearby-users': + // alert("RECEIVING NEARBY USERS:" + JSON.stringify(receivedCommand.data)); + vue_this.receiveNearbyUsers(receivedCommand.data); + break; + case 'script-to-web-settings': + // alert("RECEIVING SETTINGS:" + JSON.stringify(receivedCommand.data)); + vue_this.receiveSettings(receivedCommand.data); + break; } - - if (receivedCommand.command === 'script-to-web-receiving-item-queue') { - // alert("RECEIVING ITEM QUEUE:" + JSON.stringify(receivedCommand.data)); - vue_this.receiveReceivingItemQueue(receivedCommand.data); - } - - if (receivedCommand.command === 'script-to-web-nearby-users') { - // alert("RECEIVING NEARBY USERS:" + JSON.stringify(receivedCommand.data)); - vue_this.receiveNearbyUsers(receivedCommand.data); - } - - if (receivedCommand.command === 'script-to-web-settings') { - // alert("RECEIVING SETTINGS:" + JSON.stringify(receivedCommand.data)); - vue_this.receiveSettings(receivedCommand.data); - } - } }); @@ -1156,7 +1154,7 @@ export default { "returnedItem": foundItem.returnedItem, "iteration": foundItem.iteration, "parentArray": foundItem.parentArray, - "itemUUID": uuid, + "itemUUID": uuid } } }, @@ -1166,7 +1164,7 @@ export default { var foundItem = { "returnedItem": indexToSearch[i], "iteration": i, - "parentArray": indexToSearch, + "parentArray": indexToSearch } return foundItem; } else if (Object.prototype.hasOwnProperty.call(indexToSearch[i], "items") && indexToSearch[i].items.length > 0) { @@ -1187,7 +1185,7 @@ export default { // console.info("AvoidFolder", avoidFolder, "indexToSearch[i].uuid", indexToSearch[i].uuid); this.recursiveFolderHoldingList.push({ "name": indexToSearch[i].name, - "uuid": indexToSearch[i].uuid, + "uuid": indexToSearch[i].uuid }); this.recursiveFolderPopulate(indexToSearch[i].items, avoidFolder); @@ -1269,7 +1267,7 @@ export default { property: 'items', with: value }); - }, + } }, addDialogStore: { get() { @@ -1280,7 +1278,7 @@ export default { property: 'addDialog', with: value }); - }, + } }, editDialogStore: { get() { @@ -1291,7 +1289,7 @@ export default { property: 'editDialog', with: value }); - }, + } }, editDialogShow: function() { return this.$store.state.editDialog.show; @@ -1305,7 +1303,7 @@ export default { property: 'editFolderDialog', with: value }); - }, + } }, editFolderDialogShow: function() { return this.$store.state.editFolderDialog.show; @@ -1313,13 +1311,13 @@ export default { createFolderDialogStore: { get() { return this.$store.state.createFolderDialog; - }, + } set(value) { this.$store.commit('mutate', { property: 'createFolderDialog', with: value }); - }, + } }, receiveDialogStore: { get() { @@ -1330,7 +1328,7 @@ export default { property: 'receiveDialog', with: value }); - }, + } }, shareDialogShow: function() { return this.$store.state.shareDialog.show; @@ -1344,7 +1342,7 @@ export default { property: 'shareDialog', with: value }); - }, + } }, removeFolderDialogStore: { get() { @@ -1355,7 +1353,7 @@ export default { property: 'removeFolderDialog', with: value }); - }, + } }, removeDialogStore: { get() { @@ -1366,7 +1364,7 @@ export default { property: 'removeDialog', with: value }); - }, + } }, receivingItemQueue: { get() { diff --git a/scripts/system/inventory/src/assets/styles/styles.css b/scripts/system/inventory/src/assets/styles/styles.css index c1c100f873..f02ab825f7 100644 --- a/scripts/system/inventory/src/assets/styles/styles.css +++ b/scripts/system/inventory/src/assets/styles/styles.css @@ -75,4 +75,4 @@ background-color: rgba(0, 0, 0, 0.3); } -.inventoryApp::-webkit-scrollbar { width: 0 !important } \ No newline at end of file +.inventoryApp::-webkit-scrollbar { width: 0 !important } diff --git a/scripts/system/inventory/src/components/ItemIterator.vue b/scripts/system/inventory/src/components/ItemIterator.vue index 989b268100..9a42f6600e 100644 --- a/scripts/system/inventory/src/components/ItemIterator.vue +++ b/scripts/system/inventory/src/components/ItemIterator.vue @@ -241,7 +241,7 @@ export default { property: 'editDialog', with: value }); - }, + } }, editFolderDialogStore: { get() { @@ -252,7 +252,7 @@ export default { property: 'editFolderDialog', with: value }); - }, + } }, shareDialogStore: { get() { @@ -263,7 +263,7 @@ export default { property: 'shareDialog', with: value }); - }, + } }, removeFolderDialogStore: { get() { @@ -274,7 +274,7 @@ export default { property: 'removeFolderDialog', with: value }); - }, + } }, removeDialogStore: { get() { @@ -285,7 +285,7 @@ export default { property: 'removeDialog', with: value }); - }, + } } }, watch: { diff --git a/scripts/system/inventory/src/main.js b/scripts/system/inventory/src/main.js index e412e1e6a3..f90d693c52 100644 --- a/scripts/system/inventory/src/main.js +++ b/scripts/system/inventory/src/main.js @@ -16,7 +16,7 @@ import { store } from './plugins/store'; Vue.config.productionTip = false; window.vm = new Vue({ - vuetify, - store, - render: h => h(App) + vuetify, + store, + render: h => h(App) }).$mount('#app'); diff --git a/scripts/system/inventory/vue.config.js b/scripts/system/inventory/vue.config.js index bc5c4f0723..8202ad2805 100644 --- a/scripts/system/inventory/vue.config.js +++ b/scripts/system/inventory/vue.config.js @@ -14,4 +14,4 @@ module.exports = { "transpileDependencies": [ "vuetify" ] -} \ No newline at end of file +}