mirror of
https://github.com/overte-org/overte.git
synced 2025-04-14 09:07:08 +02:00
Address CR comments.
This commit is contained in:
Kasen IO
parent
770dd83efc
commit
087ede2f91
7 changed files with 57 additions and 61 deletions
|
|
@ -11,20 +11,20 @@
|
|||
-->
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||
<title><%= htmlWebpackPlugin.options.title %></title>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
|
||||
</noscript>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
</body>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||
<title><%= htmlWebpackPlugin.options.title %></title>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
|
||||
</noscript>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -267,11 +267,9 @@ Tablet Vec3 Window */
|
|||
}
|
||||
|
||||
function onOpened() {
|
||||
console.log("hello world!");
|
||||
}
|
||||
|
||||
function onClosed() {
|
||||
console.log("hello world!");
|
||||
}
|
||||
|
||||
function startup() {
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -75,4 +75,4 @@
|
|||
background-color: rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
.inventoryApp::-webkit-scrollbar { width: 0 !important }
|
||||
.inventoryApp::-webkit-scrollbar { width: 0 !important }
|
||||
|
|
|
|||
|
|
@ -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: {
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ module.exports = {
|
|||
"transpileDependencies": [
|
||||
"vuetify"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue