Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 19:09:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some errors, remove eslint file as eslint is already defined.

Browse source
This commit is contained in:
Kasen IO 2020-07-10 20:19:26 -04:00
parent 6d981b25b4
commit 6c5dbb5baf
2 changed files with 4 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scripts/system/inventory/.eslintrc.js
View file

@ -1,31 +0,0 @@
module.exports = {
root: true,
extends: "eslint:recommended",
"parserOptions": {
"ecmaVersion": 5
},
"rules": {
"brace-style": ["error", "1tbs", { "allowSingleLine": false }],
"camelcase": ["error"],
"comma-dangle": ["error", "never"],
"curly": ["error", "all"],
"eqeqeq": ["error", "always"],
"indent": ["error", 4, { "SwitchCase": 1 }],
"key-spacing": ["error", { "beforeColon": false, "afterColon": true, "mode": "strict" }],
"keyword-spacing": ["error", { "before": true, "after": true }],
"max-len": ["error", 128, 4],
"new-cap": ["error"],
"no-console": ["off"],
"no-floating-decimal": ["error"],
"no-magic-numbers": ["error", { "ignore": [0.5, -1, 0, 1, 2], "ignoreArrayIndexes": true }],
"no-multi-spaces": ["error"],
"no-multiple-empty-lines": ["error"],
"no-unused-vars": ["error", { "args": "none", "vars": "local" }],
"semi": ["error", "always"],
"space-before-blocks": ["error"],
"space-before-function-paren": ["error", { "anonymous": "ignore", "named": "never" }],
"spaced-comment": ["error", "always", { "line": { "markers": ["/"] } }]
}
};

8
scripts/system/inventory/src/App.vue
View file

@ -691,9 +691,9 @@ var vue_this;
function browserDevelopment() { function browserDevelopment() {
if (typeof EventBridge !== 'undefined') { if (typeof EventBridge !== 'undefined') {
return false; // We are in the browser, probably for development purposes. return false; // We are in Vircadia.
} else { } else {
return true; // We are in Vircadia. return true; // We are in the browser, probably for development purposes.
} }
} }
@ -914,8 +914,8 @@ export default {
if (findFolder) { if (findFolder) {
findFolder.returnedItem.name = this.$store.state.editFolderDialog.data.name; findFolder.returnedItem.name = this.$store.state.editFolderDialog.data.name;
if (this.$store.state.editFolderDialog.data.folder !=== null && this.$store.state.editFolderDialog.data.folder !=== "No Change") { if (this.$store.state.editFolderDialog.data.folder !== null && this.$store.state.editFolderDialog.data.folder !== "No Change") {
if (findFolder.returnedItem.folder !=== this.$store.state.editFolderDialog.data.folder && this.$store.state.editFolderDialog.data.folder !=== "No Folder") { if (findFolder.returnedItem.folder !== this.$store.state.editFolderDialog.data.folder && this.$store.state.editFolderDialog.data.folder !== "No Folder") {
this.moveFolder(uuid, this.$store.state.editFolderDialog.data.folder); this.moveFolder(uuid, this.$store.state.editFolderDialog.data.folder);
} else if (this.$store.state.editFolderDialog.data.folder === "No Folder") { } else if (this.$store.state.editFolderDialog.data.folder === "No Folder") {
this.moveFolder(uuid, "top"); this.moveFolder(uuid, "top");