ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix appPopoverMenus

Browse Source
This commit is contained in:
Julius Haertl
2016-12-07 01:41:56 +01:00
parent 97df712b11
commit 9ff3a19a9b
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/directive/appPopoverMenuUtils.js
View File

@@ -27,15 +27,17 @@ app.directive('appPopoverMenuUtils', function () {
link: function (scope, elm) { link: function (scope, elm) {
var menu = elm.find('.popovermenu'); var menu = elm.find('.popovermenu');
var button = elm.find('button'); var button = elm.find('button');
button.click(function () { button.click(function (e) {
menu.toggleClass('hidden'); menu.toggleClass('hidden');
if(!menu.hasClass('hidden')) { if(!menu.hasClass('hidden')) {
button.css('display','block'); button.css('display','block');
} else { } else {
button.css('display',''); button.css('display','');
} }
e.stopPropagation();
}); });
scope.$on('documentClicked', function (scope, event) { scope.$on('documentClicked', function (scope, event) {
e.stopPropagation();
if (event.target !== button) { if (event.target !== button) {
menu.addClass('hidden'); menu.addClass('hidden');
} }

4
js/public/app.js
View File

@@ -655,15 +655,17 @@ app.directive('appPopoverMenuUtils', function () {
link: function (scope, elm) { link: function (scope, elm) {
var menu = elm.find('.popovermenu'); var menu = elm.find('.popovermenu');
var button = elm.find('button'); var button = elm.find('button');
button.click(function () { button.click(function (e) {
menu.toggleClass('hidden'); menu.toggleClass('hidden');
if(!menu.hasClass('hidden')) { if(!menu.hasClass('hidden')) {
button.css('display','block'); button.css('display','block');
} else { } else {
button.css('display',''); button.css('display','');
} }
e.stopPropagation();
}); });
scope.$on('documentClicked', function (scope, event) { scope.$on('documentClicked', function (scope, event) {
e.stopPropagation();
if (event.target !== button) { if (event.target !== button) {
menu.addClass('hidden'); menu.addClass('hidden');
} }

4
templates/part.board.mainView.php
View File

@@ -59,9 +59,7 @@
</div> </div>
<div class="app-popover-menu-utils"> <div class="app-popover-menu-utils">
<button class="card-options icon-more" <button class="card-options icon-more" ng-model="card"></button>
ng-click="c.status.showMenu=!c.status.showMenu; $event.stopPropagation();"
ng-model="card" ng-if="boardservice.canEdit()"></button>
<div class="popovermenu bubble hidden"> <div class="popovermenu bubble hidden">
<ul> <ul>
<li ng-if="filter!=='archive'"> <li ng-if="filter!=='archive'">