ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix visual appearance for manual "next/previous" press in power video

merge-requests/93/head
Moe 2019-08-04 09:51:15 -07:00
parent f2ce3ef7ed
commit 84229aa972
3 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/libs/js/dash2.elementbuilder.js
View File

@ -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"
},

16
web/libs/js/dash2.elements.js
View File

@ -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'});

2
web/libs/js/dash2.powerVideo2.js
View File

@ -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)
})