diff --git a/scripts/system/inventory/.eslintrc.js b/scripts/system/inventory/.eslintrc.js deleted file mode 100644 index f2f884bbb2..0000000000 --- a/scripts/system/inventory/.eslintrc.js +++ /dev/null @@ -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": ["/"] } }] - } - -}; diff --git a/scripts/system/inventory/src/App.vue b/scripts/system/inventory/src/App.vue index bbd92187cc..a4cfc266bd 100644 --- a/scripts/system/inventory/src/App.vue +++ b/scripts/system/inventory/src/App.vue @@ -691,9 +691,9 @@ var vue_this; function browserDevelopment() { if (typeof EventBridge !== 'undefined') { - return false; // We are in the browser, probably for development purposes. + return false; // We are in Vircadia. } 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) { 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 (findFolder.returnedItem.folder !=== this.$store.state.editFolderDialog.data.folder && this.$store.state.editFolderDialog.data.folder !=== "No Folder") { + 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") { this.moveFolder(uuid, this.$store.state.editFolderDialog.data.folder); } else if (this.$store.state.editFolderDialog.data.folder === "No Folder") { this.moveFolder(uuid, "top");