Merge feature-nested-sets into develop
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
|
||||
export default {
|
||||
mixins: [treeNodeViewMixin],
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
|
||||
export default {
|
||||
mixins: [treeNodeViewMixin],
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
|
||||
export default {
|
||||
mixins: [treeNodeViewMixin],
|
||||
|
||||
@@ -40,8 +40,8 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import { getPropertyIcon } from '/imports/constants/PROPERTIES.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
import { getPropertyIcon } from '/imports/constants/PROPERTIES';
|
||||
import InlineEffect from '../components/effects/InlineEffect.vue';
|
||||
|
||||
export default {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
|
||||
export default {
|
||||
mixins: [treeNodeViewMixin],
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
|
||||
<script lang="js">
|
||||
// Most of this was copied from EffectViewer and should probably be generalised
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
import getEffectIcon from '/imports/client/ui/utility/getEffectIcon';
|
||||
|
||||
export default {
|
||||
mixins: [treeNodeViewMixin],
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import PROPERTIES from '/imports/constants/PROPERTIES.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
import PROPERTIES from '/imports/constants/PROPERTIES';
|
||||
|
||||
export default {
|
||||
mixins: [treeNodeViewMixin],
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<script lang="js">
|
||||
// Most of this was copied from EffectViewer and should probably be generalised
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
|
||||
|
||||
export default {
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
|
||||
export default {
|
||||
name: 'ReferenceTreeNode',
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
|
||||
import PROPERTIES from '/imports/constants/PROPERTIES.js';
|
||||
import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin';
|
||||
import PROPERTIES from '/imports/constants/PROPERTIES';
|
||||
|
||||
export default {
|
||||
mixins: [treeNodeViewMixin],
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="js">
|
||||
import treeNodeViewIndex from '/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js';
|
||||
import treeNodeViewIndex from '/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex';
|
||||
|
||||
export default {
|
||||
name: 'TreeNodeView',
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import PROPERTIES from '/imports/constants/PROPERTIES.js';
|
||||
import PROPERTIES from '/imports/constants/PROPERTIES';
|
||||
import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
|
||||
|
||||
export default {
|
||||
@@ -15,7 +15,7 @@ export default {
|
||||
showExternalDetails: Boolean,
|
||||
},
|
||||
computed: {
|
||||
title(){
|
||||
title() {
|
||||
let model = this.model;
|
||||
if (!model) return;
|
||||
if (model.name) return model.name;
|
||||
|
||||
Reference in New Issue
Block a user