mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-03-06 12:43:06 +08:00
Fixed PR commentaries, updated .gitignore [SCI-10717]
This commit is contained in:
parent
c304277712
commit
61d779c6ed
2 changed files with 10 additions and 7 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -95,3 +95,6 @@ public/marvin4js-license.cxl
|
||||||
|
|
||||||
/app/assets/builds/*
|
/app/assets/builds/*
|
||||||
!/app/assets/builds/.keep
|
!/app/assets/builds/.keep
|
||||||
|
|
||||||
|
# Ignore npm files
|
||||||
|
package-lock.json
|
||||||
|
|
|
@ -57,22 +57,22 @@ export default {
|
||||||
return {
|
return {
|
||||||
resolvePromise: null,
|
resolvePromise: null,
|
||||||
rejectPromise: null
|
rejectPromise: null
|
||||||
}
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
show: function() {
|
show() {
|
||||||
$(this.$refs.modal).modal('show');
|
$(this.$refs.modal).modal('show');
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
this.resolvePromise = resolve
|
this.resolvePromise = resolve;
|
||||||
this.rejectPromise = reject
|
this.rejectPromise = reject;
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
confirm() {
|
confirm() {
|
||||||
this.resolvePromise(true)
|
this.resolvePromise(true);
|
||||||
$(this.$refs.modal).modal('hide');
|
$(this.$refs.modal).modal('hide');
|
||||||
},
|
},
|
||||||
cancel() {
|
cancel() {
|
||||||
this.resolvePromise(false)
|
this.resolvePromise(false);
|
||||||
$(this.$refs.modal).modal('hide');
|
$(this.$refs.modal).modal('hide');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue