diff --git a/app/coffee/modules/base/navurls.coffee b/app/coffee/modules/base/navurls.coffee index 56c17989..dc785247 100644 --- a/app/coffee/modules/base/navurls.coffee +++ b/app/coffee/modules/base/navurls.coffee @@ -70,18 +70,29 @@ NavigationUrlsDirective = ($navurls, $auth, $q, $location) -> return [name, options] link = ($scope, $el, $attrs) -> + parseNav($attrs.tgNav, $scope).then (result) -> + [name, options] = result + user = $auth.getUser() + options.user = user.username if user + + url = $navurls.resolve(name) + fullUrl = $navurls.formatUrl(url, options) + + $el.data("fullUrl", fullUrl) + + if $el.is("a") + $el.attr("href", fullUrl) + $el.on "click", (event) -> event.preventDefault() - parseNav($attrs.tgNav, $scope).then (result) -> - [name, options] = result - user = $auth.getUser() - options.user = user.username if user + fullUrl = $(event.currentTarget).data('fullUrl') - url = $navurls.resolve(name) - - fullUrl = $navurls.formatUrl(url, options) + if event.which != 2 $location.url(fullUrl) + $scope.$apply() + else + window.open fullUrl $scope.$on "$destroy", -> $el.off() diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee index f61bca90..7c5a2e73 100644 --- a/app/coffee/modules/nav.coffee +++ b/app/coffee/modules/nav.coffee @@ -105,7 +105,7 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location) - <% if (project.is_backlog_activated && project.my_permissions.indexOf("view_us") != -1) { %> -