summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-06-06 12:07:52 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-06-06 12:07:52 +0200
commit49167ccaa91376bf70c400013641f76d1164950e (patch)
treef289737b2097f5f68159faec584fa06e9c29a33a /client/components
parent5cd0ec08aa69bf48a1306b84e0b0bc44ba17d6a4 (diff)
downloadwekan-49167ccaa91376bf70c400013641f76d1164950e.tar.gz
wekan-49167ccaa91376bf70c400013641f76d1164950e.tar.bz2
wekan-49167ccaa91376bf70c400013641f76d1164950e.zip
Improve the card details pane overlay interactions
Diffstat (limited to 'client/components')
-rw-r--r--client/components/boards/boardBody.js10
-rw-r--r--client/components/boards/boardBody.styl1
-rw-r--r--client/components/cards/details.js6
-rw-r--r--client/components/lists/body.js4
4 files changed, 13 insertions, 8 deletions
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index 6de7fba6..e1b39ce8 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -119,6 +119,16 @@ BlazeComponent.extendComponent({
var sidebar = this.componentChildren('sidebar')[0];
if (sidebar && sidebar.isOpen())
return 'next-sidebar';
+ },
+
+ events: function() {
+ return [{
+ // XXX The board-overlay div should probably be moved to the parent
+ // component.
+ 'mouseenter .board-overlay': function() {
+ this.showOverlay.set(false);
+ }
+ }];
}
}).register('boardComponent');
diff --git a/client/components/boards/boardBody.styl b/client/components/boards/boardBody.styl
index 68034a16..d64e1a69 100644
--- a/client/components/boards/boardBody.styl
+++ b/client/components/boards/boardBody.styl
@@ -19,6 +19,7 @@ position()
.board-overlay
position: cover
+ top: -100px
background: black
opacity: 0.33
animation: fadeIn 0.2s
diff --git a/client/components/cards/details.js b/client/components/cards/details.js
index d44adb67..6ab7da22 100644
--- a/client/components/cards/details.js
+++ b/client/components/cards/details.js
@@ -59,12 +59,6 @@ BlazeComponent.extendComponent({
'click .js-add-labels': Popup.open('cardLabels'),
'mouseenter .js-card-details': function() {
this.componentParent().showOverlay.set(true);
- },
- 'mouseleave .js-card-details': function(evt) {
- // We don't want to hide the overlay if the mouse is entering a pop-over
- var $pointedElement = $(evt.toElement || evt.relatedTarget);
- if ($pointedElement.closest('.pop-over').length === 0)
- this.componentParent().showOverlay.set(false);
}
}];
}
diff --git a/client/components/lists/body.js b/client/components/lists/body.js
index 04f122cb..f2d780af 100644
--- a/client/components/lists/body.js
+++ b/client/components/lists/body.js
@@ -78,7 +78,7 @@ BlazeComponent.extendComponent({
// Pressing Enter should submit the card
if (evt.keyCode === 13) {
evt.preventDefault();
- var $form = $(evt.currentTarget).parents('form:first');
+ var $form = $(evt.currentTarget).closest('form');
// XXX For some reason $form.submit() does not work (it's probably a bug
// of blaze-component related to the fact that the submit event is non-
// bubbling). This is why we click on the submit button instead -- which
@@ -93,7 +93,7 @@ BlazeComponent.extendComponent({
var list = $('#js-list-' + this.data().listId);
var listSelector = '.js-list:not(.js-list-composer)';
var nextList = list[isReverse ? 'prev' : 'next'](listSelector).get(0);
- // If there isn't no next list, loop back to the beginning.
+ // If there is no next list, loop back to the beginning.
if (! nextList) {
nextList = $(listSelector + (isReverse ? ':last' : ':first')).get(0);
}