tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Continues refactoring of terms list.

This commit is contained in:
Mateus Machado Luna 2018-08-10 10:24:24 -03:00
parent 8ee7fea7ef
commit d1491312b9
2 changed files with 32 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/admin/components/lists/recursive-terms-list.vue
View File

@ -45,7 +45,9 @@
size="is-small"
icon="plus-circle"/>
</a>
<a @click.prevent="editTerm(term, index)">
<a
:disabled="isEditingTerm"
@click.prevent="editTerm(term, index)">
<b-icon
type="is-secondary"
icon="pencil"/>
@ -151,6 +153,7 @@ export default {
},
editTerm(term, index) {
// Position edit form in a visible area
let container = document.getElementById('repository-container');
if (container && container.scrollTop && container.scrollTop > 80)
this.termEditionFormTop = container.scrollTop - 80;
@ -161,31 +164,31 @@ export default {
if (!term.opened) {
for (let i = 0; i < this.orderedTermsList.length; i++) {
// Checks if other terms are opened
if (term.id != this.orderedTermsList[i].id && this.orderedTermsList[i].opened) {
let otherTerm = this.orderedTermsList[i];
// for (let i = 0; i < this.orderedTermsList.length; i++) {
// // Checks if other terms are opened
// if (term.id != this.orderedTermsList[i].id && this.orderedTermsList[i].opened) {
// let otherTerm = this.orderedTermsList[i];
// Checks there's an original version of term (wasn't saved)
let originalIndex = this.termsList.findIndex(anOriginalTerm => anOriginalTerm.id === otherTerm.id);
if (originalIndex >= 0) {
let originalTerm = JSON.parse(JSON.stringify(this.termsList[originalIndex]));
originalTerm.saved = otherTerm.saved;
originalTerm.opened = otherTerm.opened;
if (JSON.stringify(otherTerm) != JSON.stringify(originalTerm)) {
otherTerm.saved = false;
} else {
otherTerm.saved = true;
}
// A new term is being closed
} else {
otherTerm.saved = false;
}
// // Checks there's an original version of term (wasn't saved)
// let originalIndex = this.termsList.findIndex(anOriginalTerm => anOriginalTerm.id === otherTerm.id);
// if (originalIndex >= 0) {
// let originalTerm = JSON.parse(JSON.stringify(this.termsList[originalIndex]));
// originalTerm.saved = otherTerm.saved;
// originalTerm.opened = otherTerm.opened;
// if (JSON.stringify(otherTerm) != JSON.stringify(originalTerm)) {
// otherTerm.saved = false;
// } else {
// otherTerm.saved = true;
// }
// // A new term is being closed
// } else {
// otherTerm.saved = false;
// }
otherTerm.opened = false;
this.orderedTermsList.splice(i, 1, otherTerm);
}
}
// otherTerm.opened = false;
// this.orderedTermsList.splice(i, 1, otherTerm);
// }
// }
} else {
let originalIndex = this.termsList.findIndex(anOriginalTerm => anOriginalTerm.id === term.id);
if (originalIndex >= 0) {
@ -206,7 +209,8 @@ export default {
}
term.opened = !term.opened;
this.orderedTermsList.splice(index, 1, term);
this.$emit('')
// this.orderedTermsList.splice(index, 1, term);
},
},

68
src/admin/components/lists/terms-list.vue
View File

@ -61,11 +61,10 @@
:key="term.id">
<recursive-terms-list
:term="term"
:index="index"
:taxonomy-id="taxonomyId"/>
:term="term"
:index="index"
:taxonomy-id="taxonomyId"/>
</div>
</div>
<div
class="column is-4 edit-forms-list"
@ -176,67 +175,6 @@ export default {
this.orderedTermsList.push(newTerm);
this.editTerm(newTerm, this.orderedTermsList.length - 1);
},
editTerm(term, index) {
let container = document.getElementById('repository-container');
if (container && container.scrollTop && container.scrollTop > 80)
this.termEditionFormTop = container.scrollTop - 80;
else
this.termEditionFormTop = 0;
this.isEditingTerm = true;
if (!term.opened) {
for (let i = 0; i < this.orderedTermsList.length; i++) {
// Checks if other terms are opened
if (term.id != this.orderedTermsList[i].id && this.orderedTermsList[i].opened) {
let otherTerm = this.orderedTermsList[i];
// Checks there's an original version of term (wasn't saved)
let originalIndex = this.termsList.findIndex(anOriginalTerm => anOriginalTerm.id === otherTerm.id);
if (originalIndex >= 0) {
let originalTerm = JSON.parse(JSON.stringify(this.termsList[originalIndex]));
originalTerm.saved = otherTerm.saved;
originalTerm.opened = otherTerm.opened;
if (JSON.stringify(otherTerm) != JSON.stringify(originalTerm)) {
otherTerm.saved = false;
} else {
otherTerm.saved = true;
}
// A new term is being closed
} else {
otherTerm.saved = false;
}
otherTerm.opened = false;
this.orderedTermsList.splice(i, 1, otherTerm);
}
}
} else {
let originalIndex = this.termsList.findIndex(anOriginalTerm => anOriginalTerm.id === term.id);
if (originalIndex >= 0) {
let originalTerm = JSON.parse(JSON.stringify(this.termsList[originalIndex]));
originalTerm.saved = term.saved;
originalTerm.opened = term.opened;
if (JSON.stringify(term) != JSON.stringify(originalTerm))
term.saved = false;
else
term.saved = true;
} else {
term.saved = false;
}
this.isEditingTerm = false;
}
term.opened = !term.opened;
this.orderedTermsList.splice(index, 1, term);
},
getOriginalTerm(termId){
let index = this.orderedTermsList.findIndex(originalTerm => originalTerm.id == termId);
if (index >= 0) {