From 22efee786cd701840270e64a9f2b6a9e938c2c9c Mon Sep 17 00:00:00 2001
From: Gunther Brunner <gunta85@gmail.com>
Date: Mon, 6 Jul 2015 17:22:05 +0900
Subject: [PATCH] Open a new device in Standalone window by pressing
 SHIFT+CLICK when using a device. Use a new device without opening any window
 by pressing ALT+CLICK.

---
 .../details/device-list-details-directive.js         |  8 +++++++-
 .../device-list/icons/device-list-icons-directive.js | 12 ++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/res/app/device-list/details/device-list-details-directive.js b/res/app/device-list/details/device-list-details-directive.js
index b9e47966..d8b10c52 100644
--- a/res/app/device-list/details/device-list-details-directive.js
+++ b/res/app/device-list/details/device-list-details-directive.js
@@ -7,6 +7,7 @@ module.exports = function DeviceListDetailsDirective(
 , GroupService
 , $rootScope
 , LightboxImageService
+, StandaloneService
 ) {
   return {
     restrict: 'E'
@@ -47,11 +48,16 @@ module.exports = function DeviceListDetailsDirective(
           var id = e.target.parentNode.parentNode.id
           var device = mapping[id]
 
-          if (e.shiftKey && device.state === 'available') {
+          if (e.altKey && device.state === 'available') {
             inviteDevice(device)
             e.preventDefault()
           }
 
+          if (e.shiftKey && device.state === 'available') {
+            StandaloneService.open(device)
+            e.preventDefault()
+          }
+
           if ($rootScope.adminMode && device.state === 'busy') {
             kickDevice(device, true)
             e.preventDefault()
diff --git a/res/app/device-list/icons/device-list-icons-directive.js b/res/app/device-list/icons/device-list-icons-directive.js
index 64917e7b..5e2aa8fe 100644
--- a/res/app/device-list/icons/device-list-icons-directive.js
+++ b/res/app/device-list/icons/device-list-icons-directive.js
@@ -138,9 +138,17 @@ module.exports = function DeviceListDetailsDirective(
         //  //StandaloneService.open()
         //  e.preventDefault()
         //}
+        var id
 
-        if (e.target.classList.contains('device-status')) {
-          var id = e.target.parentNode.parentNode.id
+        if (e.target.classList.contains('thumbnail')) {
+          id = e.target.id
+        } else if (e.target.classList.contains('device-status') ||
+          e.target.classList.contains('device-photo-small') ||
+          e.target.classList.contains('device-name')) {
+          id = e.target.parentNode.parentNode.id
+        }
+
+        if (id) {
           var device = mapping[id]
 
           if (e.altKey && device.state === 'available') {