mirror of
https://github.com/wekan/wekan.git
synced 2026-01-02 07:38:49 +01:00
Merge branch 'upgrade-meteor-2.6' of https://github.com/majus/wekan into upgrade-meteor
This commit is contained in:
commit
0c3ca14699
268 changed files with 3109 additions and 10419 deletions
|
|
@ -1,3 +1,4 @@
|
|||
import { TAPi18n } from '/imports/i18n';
|
||||
import { Spinner } from '/client/lib/spinner';
|
||||
|
||||
const subManager = new SubsManager();
|
||||
|
|
@ -42,7 +43,6 @@ BlazeComponent.extendComponent({
|
|||
const position = this.currentData().position;
|
||||
const title = textarea.val().trim();
|
||||
|
||||
const formComponent = this.childComponents('addCardForm')[0];
|
||||
let sortIndex;
|
||||
if (position === 'top') {
|
||||
sortIndex = Utils.calculateIndex(null, firstCardDom).base;
|
||||
|
|
@ -50,6 +50,7 @@ BlazeComponent.extendComponent({
|
|||
sortIndex = Utils.calculateIndex(lastCardDom, null).base;
|
||||
}
|
||||
|
||||
const formComponent = this.cardFormComponent();
|
||||
const members = formComponent.members.get();
|
||||
const labelIds = formComponent.labels.get();
|
||||
const customFields = formComponent.customFields.get();
|
||||
|
|
@ -131,6 +132,16 @@ BlazeComponent.extendComponent({
|
|||
}
|
||||
},
|
||||
|
||||
cardFormComponent() {
|
||||
for (const inlinedForm of this.childComponents('inlinedForm')) {
|
||||
const [addCardForm] = inlinedForm.childComponents('addCardForm');
|
||||
if (addCardForm) {
|
||||
return addCardForm;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
},
|
||||
|
||||
scrollToBottom() {
|
||||
const container = this.firstNode();
|
||||
$(container).animate({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue