From 84229aa97209f8a95b3ad49d135667316ab0b099 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Sun, 4 Aug 2019 09:51:15 -0700
Subject: [PATCH] fix visual appearance for manual "next/previous" press in
 power video

---
 web/libs/js/dash2.elementbuilder.js | 26 +++++++++++++-------------
 web/libs/js/dash2.elements.js       | 16 ----------------
 web/libs/js/dash2.powerVideo2.js    |  2 ++
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/web/libs/js/dash2.elementbuilder.js b/web/libs/js/dash2.elementbuilder.js
index 7fde57f2..9e67f923 100644
--- a/web/libs/js/dash2.elementbuilder.js
+++ b/web/libs/js/dash2.elementbuilder.js
@@ -43,12 +43,12 @@ $.ccio.tm=function(x,d,z,user){
                       "class": "default",
                       "icon": "external-link"
                    },
-                   "Power Viewer": {
-                      "label": lang['Power Viewer'],
-                      "attr": "monitor=\"powerview\"",
-                      "class": "default",
-                      "icon": "map-marker"
-                   },
+                   // "Power Viewer": {
+                   //    "label": lang['Power Viewer'],
+                   //    "attr": "monitor=\"powerview\"",
+                   //    "class": "default",
+                   //    "icon": "map-marker"
+                   // },
                    "Videos List": {
                       "label": lang['Videos List'],
                       "attr": "monitor=\"videos_table\"",
@@ -129,15 +129,15 @@ $.ccio.tm=function(x,d,z,user){
                       "class": "default ",
                       "icon": "calendar"
                    },
-                   "Power Viewer": {
-                      "label": lang['Power Viewer'],
-                      "attr": "monitor=\"powerview\"",
-                      "class": "default",
-                      "icon": "map-marker"
-                   },
+                   // "Power Viewer": {
+                   //    "label": lang['Power Viewer'],
+                   //    "attr": "monitor=\"powerview\"",
+                   //    "class": "default",
+                   //    "icon": "map-marker"
+                   // },
                    "Time-lapse": {
                       "label": lang['Time-lapse'],
-                      "attr": "monitor=\"timelapse\"",
+                      "attr": "monitor=\"timelapseJpeg\"",
                       "class": "default",
                       "icon": "angle-double-right"
                    },
diff --git a/web/libs/js/dash2.elements.js b/web/libs/js/dash2.elements.js
index 90cb77af..5f99a3ce 100644
--- a/web/libs/js/dash2.elements.js
+++ b/web/libs/js/dash2.elements.js
@@ -365,19 +365,6 @@ $(document).ready(function(e){
                     })
                 }
             break;
-            case'timelapse':
-                $.timelapse.e.modal('show')
-                $.timelapse.monitors.find('.monitor').remove()
-                $.each($.ccio.mon,function(n,v){
-                    $.timelapse.monitors.append('<option class="monitor" value="'+v.mid+'">'+v.name+'</option>')
-                })
-                e.e=$.timelapse.monitors.find('.monitor').prop('selected',false)
-                if(e.mid!==''){
-                    e.e=$.timelapse.monitors.find('.monitor[value="'+e.mid+'"]')
-                }
-                e.e.first().prop('selected',true)
-                $.timelapse.f.submit()
-            break;
             case'timelapseJpeg':
                 $.timelapseJpeg.e.modal('show')
                 $.timelapseJpeg.monitors.find('.monitor').remove()
@@ -390,9 +377,6 @@ $(document).ready(function(e){
                 }
                 e.e.first().prop('selected',true)
             break;
-            case'powerview':
-                $.powerVideoViewer.window.modal('show')
-            break;
             case'region':
                 if(!e.mon){
                     $.ccio.init('note',{title:lang['Unable to Launch'],text:lang.UnabletoLaunchText,type:'error'});
diff --git a/web/libs/js/dash2.powerVideo2.js b/web/libs/js/dash2.powerVideo2.js
index 62eca554..848bfa65 100644
--- a/web/libs/js/dash2.powerVideo2.js
+++ b/web/libs/js/dash2.powerVideo2.js
@@ -439,6 +439,7 @@ $(document).ready(function(e){
     var nextVideoAllSlots = function(){
         Object.keys(currentlyPlayingVideos).forEach(function(monitorId){
             var video = currentlyPlayingVideos[monitorId]
+            visuallyDeselectItemInRow(video)
             visuallySelectItemInRow(video.videoAfter)
             loadVideoIntoMonitorSlot(video.videoAfter,0)
         })
@@ -446,6 +447,7 @@ $(document).ready(function(e){
     var previousVideoAllSlots = function(){
         Object.keys(currentlyPlayingVideos).forEach(function(monitorId){
             var video = currentlyPlayingVideos[monitorId]
+            visuallyDeselectItemInRow(video)
             visuallySelectItemInRow(video.videoBefore)
             loadVideoIntoMonitorSlot(video.videoBefore,0)
         })