From b441a5881914cf428da04f47a1653db11dc1db6c Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Mon, 2 Nov 2015 20:15:26 -0800
Subject: [PATCH] #4: Keep the dropdown menu open after selecting a track or
 album download in a cacheable format.

---
 public/templates/albums/show.html             |  2 +-
 public/templates/tracks/show.html             |  2 +-
 .../scripts/app/controllers/album.coffee      |  2 +-
 .../scripts/app/controllers/track.coffee      | 20 +++++++++----------
 .../scripts/base/ui-bootstrap-tpls-0.4.0.js   | 19 ++++++++++++++++++
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/public/templates/albums/show.html b/public/templates/albums/show.html
index ea5c3c5f..530c70ac 100644
--- a/public/templates/albums/show.html
+++ b/public/templates/albums/show.html
@@ -1,7 +1,7 @@
 <div class="resource-details album-details" bindonce="album">
     <ul class="dropdowns">
         <li class="dropdown">
-            <a href="#" class="btn btn-small btn-info dropdown-toggle" ng-disabled="album.is_downloadable == 0">
+            <a href="#" class="btn btn-small btn-info dropdown-toggle" ng-disabled="album.is_downloadable == 0" auto-close="outsideClick">
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="album.is_downloadable == 1">
diff --git a/public/templates/tracks/show.html b/public/templates/tracks/show.html
index 9ef0ec11..d7bac977 100644
--- a/public/templates/tracks/show.html
+++ b/public/templates/tracks/show.html
@@ -1,7 +1,7 @@
 <div class="resource-details track-details" bindonce="track">
     <ul class="dropdowns">
         <li class="dropdown">
-            <a href="#" class="btn btn-small btn-info dropdown-toggle" ng-disabled="track.is_downloadable == 0">
+            <a href="#" class="btn btn-small btn-info dropdown-toggle" ng-disabled="track.is_downloadable == 0" auto-close="outsideClick">
                 Downloads
             </a>
             <ul class="dropdown-menu" ng-show="track.is_downloadable == 1">
diff --git a/resources/assets/scripts/app/controllers/album.coffee b/resources/assets/scripts/app/controllers/album.coffee
index 3f5fd837..6e1db071 100644
--- a/resources/assets/scripts/app/controllers/album.coffee
+++ b/resources/assets/scripts/app/controllers/album.coffee
@@ -52,5 +52,5 @@ angular.module('ponyfm').controller "album", [
                     $timeout $scope.getCachedAlbum(id, format), 5000
                 else
                     $scope.isInProgress = false
-                    $window.open $scope.albumUrl, '_blank'
+                    $window.open $scope.albumUrl
 ]
diff --git a/resources/assets/scripts/app/controllers/track.coffee b/resources/assets/scripts/app/controllers/track.coffee
index 369d4def..97393695 100644
--- a/resources/assets/scripts/app/controllers/track.coffee
+++ b/resources/assets/scripts/app/controllers/track.coffee
@@ -74,15 +74,15 @@ angular.module('ponyfm').controller "track", [
                 playlist.message = res.message
 
         $scope.getCachedTrack = (id, format) ->
-          $scope.isInProgress = true
+            $scope.isInProgress = true
 
-          cachedTrack.download('tracks', id, format).then (response) ->
-            $scope.trackUrl = response
-            if $scope.trackUrl == 'error'
-              $scope.isInProgress = false
-            else if $scope.trackUrl == 'pending'
-              $timeout $scope.getCachedTrack(id, format), 5000
-            else
-              $scope.isInProgress = false
-              $window.open $scope.trackUrl, '_blank'
+            cachedTrack.download('tracks', id, format).then (response) ->
+                $scope.trackUrl = response
+                if $scope.trackUrl == 'error'
+                    $scope.isInProgress = false
+                else if $scope.trackUrl == 'pending'
+                    $timeout $scope.getCachedTrack(id, format), 5000
+                else
+                    $scope.isInProgress = false
+                    $window.location = $scope.trackUrl#, '_blank'
 ]
diff --git a/resources/assets/scripts/base/ui-bootstrap-tpls-0.4.0.js b/resources/assets/scripts/base/ui-bootstrap-tpls-0.4.0.js
index 2e9eeb98..5c639c73 100644
--- a/resources/assets/scripts/base/ui-bootstrap-tpls-0.4.0.js
+++ b/resources/assets/scripts/base/ui-bootstrap-tpls-0.4.0.js
@@ -1269,10 +1269,29 @@ angular.module('ui.bootstrap.dropdownToggle', []).directive('dropdownToggle', ['
           element.parent().addClass('open');
           openElement = element;
           closeMenu = function (event) {
+
+            // Dropdowns with with the `auto-close="outsideClick"` attribute are handled differently.
+            // They will only close if the user clicks somewhere outside of the dropdown menu.
+            //
+            // => Partially backported from: https://github.com/angular-ui/bootstrap/pull/3045/files
+            if ('autoClose' in attrs && attrs.autoClose === 'outsideClick') {
+              if (typeof event !== 'undefined' && !element.parent()[0].contains(event.target)) {
+                // Only close the menu if we detect a click outside the element.
+                $document.unbind('click', closeMenu);
+                element.parent().removeClass('open');
+                closeMenu = angular.noop;
+                openElement = null;
+              }
+
+              return;
+            }
+
+            // If this isn't an "outside click", handle it as usual.
             if (event) {
               event.preventDefault();
               event.stopPropagation();
             }
+
             $document.unbind('click', closeMenu);
             element.parent().removeClass('open');
             closeMenu = angular.noop;