summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-08-23 00:09:06 +0300
committerGitHub <noreply@github.com>2019-08-23 00:09:06 +0300
commit576523021e3640fde3f5ad63cb00c3fd57492b2d (patch)
tree3521145359ea51312b0d3bb991cb40e1adeeefde
parent2c78aab3dc91ee276bfb5e4717ada72dc84ca3b0 (diff)
parent9d8a38f3240bbcf8734d0860db5a6ad1e19562a8 (diff)
downloadwekan-576523021e3640fde3f5ad63cb00c3fd57492b2d.tar.gz
wekan-576523021e3640fde3f5ad63cb00c3fd57492b2d.tar.bz2
wekan-576523021e3640fde3f5ad63cb00c3fd57492b2d.zip
Merge pull request #2645 from justinr1234/master
Fixes #2638 importing trello
-rw-r--r--client/components/import/import.js22
-rw-r--r--client/lib/popup.js2
2 files changed, 11 insertions, 13 deletions
diff --git a/client/components/import/import.js b/client/components/import/import.js
index 62c7e525..6368885b 100644
--- a/client/components/import/import.js
+++ b/client/components/import/import.js
@@ -211,22 +211,20 @@ BlazeComponent.extendComponent({
this.parentComponent().nextStep();
},
- onMapMember(evt) {
- const memberToMap = this.currentData();
- if (memberToMap.wekan) {
- // todo xxx ask for confirmation?
- this.unmapMember(memberToMap.id);
- } else {
- this.setSelectedMember(memberToMap.id);
- Popup.open('importMapMembersAdd')(evt);
- }
- },
-
events() {
return [
{
submit: this.onSubmit,
- 'click .js-select-member': this.onMapMember,
+ 'click .js-select-member'(evt) {
+ const memberToMap = this.currentData();
+ if (memberToMap.wekan) {
+ // todo xxx ask for confirmation?
+ this.unmapMember(memberToMap.id);
+ } else {
+ this.setSelectedMember(memberToMap.id);
+ Popup.open('importMapMembersAdd')(evt);
+ }
+ },
},
];
},
diff --git a/client/lib/popup.js b/client/lib/popup.js
index 6c294d32..8095fbd2 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -67,7 +67,7 @@ window.Popup = new (class {
title: self._getTitle(popupName),
depth: self._stack.length,
offset: self._getOffset(openerElement),
- dataContext: (this.currentData && this.currentData()) || this,
+ dataContext: (this && this.currentData && this.currentData()) || this,
});
// If there are no popup currently opened we use the Blaze API to render