yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better click detection for closing dialogs

Browse Source
This commit is contained in:
perploug
2013-09-18 13:11:19 +02:00
parent 2cea746644
commit c5000b9656
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.UI.Client/src/views/common/main.controller.js
View File

@@ -33,21 +33,24 @@ function MainController($scope, $routeParams, $rootScope, $timeout, $http, $log,
};
$scope.closeDialogs = function (event) {
//only close dialogs if non-lin and non-buttons are clicked
//only close dialogs if non-link and non-buttons are clicked
var el = event.target.nodeName;
var pEl = event.target.parentElement.nodeName;
var close = $(event.target).closest("#navigation");
var parents = $(event.target).parents("#navigation");
var els = ["INPUT","A","BUTTON"];
//SD: I've updated this so that we don't close the dialog when clicking inside of the dialog
if (parents.length === 1) {
if(els.indexOf(el) >= 0){return;}
var parents = $(event.target).parents("a,button");
if(parents.length > 0){
return;
}
//SD: I've added a check for INPUT elements too
if(el != "I" && el != "A" && el != "BUTTON" && pEl != "A" && pEl != "BUTTON" && el != "INPUT" && pEl != "INPUT"){
$rootScope.$emit("closeDialogs", event);
//SD: I've updated this so that we don't close the dialog when clicking inside of the dialog
var nav = $(event.target).parents("#navigation");
if (nav.length === 1) {
return;
}
$rootScope.$emit("closeDialogs", event);
};
//fetch the authorized status