From 950051032e82968b4e8383b3c42918efc3070183 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 14 Aug 2016 12:33:53 +0000 Subject: [PATCH] hide buttons until dialogue has loaded git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3169 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 +- webif/html/js/epg_popup.js | 144 +++++++++++++++++++------------------ 2 files changed, 77 insertions(+), 71 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 4d8d2fd1..89f91c3c 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.3.1-2 +Version: 1.3.1-3 Architecture: mipsel Maintainer: af123@hpkg.tv -Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl +Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.3),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/7116/ diff --git a/webif/html/js/epg_popup.js b/webif/html/js/epg_popup.js index 57f1d29e..dc2628bb 100644 --- a/webif/html/js/epg_popup.js +++ b/webif/html/js/epg_popup.js @@ -1,74 +1,80 @@ $(function() { - function doschedule(type) - { - $('#epginfo_extra').load('/cgi-bin/epg/schedule.jim?' + - 'service=' + - encodeURIComponent($('#epgpopup_dialogue').attr('xs')) + - '&event=' + - encodeURIComponent($('#epgpopup_dialogue').attr('xe')) + - '&type=' + type, function() { - $.getJSON('/cgi-bin/pending.jim', function(data) { - if (data.pending > 0) - $('#restart_block').slideDown('slow'); - }); + +function doschedule(type) +{ + $('#epginfo_extra').load('/cgi-bin/epg/schedule.jim?' + + 'service=' + + encodeURIComponent($('#epgpopup_dialogue').attr('xs')) + + '&event=' + + encodeURIComponent($('#epgpopup_dialogue').attr('xe')) + + '&type=' + type, function() { + $.getJSON('/cgi-bin/pending.jim', function(data) { + if (data.pending > 0) + $('#restart_block').slideDown('slow'); }); - $(":button:contains('Record')").fadeOut('slow'); - $(":button:contains('Reminder')").fadeOut('slow'); - } - - var $buttons1 = { - "Close" : function() {$(this).dialog('close');} - }; - var $buttons2 = $.extend( - {"Record Programme": function() { doschedule(1) }}, - {"Set Reminder": function() { doschedule(3) }}, - $buttons1); - var $buttons3 = $.extend( - {"Record Series": function() { doschedule(2) }}, - $buttons2); - - var $dialog = $('#epgpopup_dialogue').dialog({ - title: "Programme Details", - modal: false, autoOpen: false, - height: 500, width: 700, - show: 'scale', hide: 'fade', - draggable: true, resizable: true, - buttons: $buttons1, - close: function(e,u) { $('#epgpopup_dialogue').empty().html( - 'loading'); } }); + $(":button:contains('Record')").fadeOut('slow'); + $(":button:contains('Reminder')").fadeOut('slow'); +} + +var $buttons1 = { + "Close" : function() {$(this).dialog('close');} +}; +var $buttons2 = $.extend( + {"Record Programme": function() { doschedule(1) }}, + {"Set Reminder": function() { doschedule(3) }}, + $buttons1); +var $buttons3 = $.extend( + {"Record Series": function() { doschedule(2) }}, + $buttons2); + +var $dialog = $('#epgpopup_dialogue').dialog({ + title: "Programme Details", + modal: false, autoOpen: false, + height: 500, width: 700, + show: 'scale', hide: 'fade', + draggable: true, resizable: true, + buttons: $buttons1, + close: function(e,u) { $('#epgpopup_dialogue').empty().html( + 'loading'); } +}); + +function epgpopup(e, o) +{ + e.preventDefault(); + var sch = o.attr('sch'); + var rec = o.attr('rec'); + $dialog.dialog("option", "buttons", $buttons1); + + if (sch != 0) + $buttons = $buttons1; + else if (rec == 2) + $buttons = $buttons3; + else if (rec == 1) + $buttons = $buttons2; + else + $buttons = $buttons1; + + var url = '/cgi-bin/epg/info.jim?service=' + + o.attr('xs') + '&event=' + + o.attr('xe') + '&bare=1'; + $('#epgpopup_dialogue') + .html(' Loading details...' + + ' Please wait...') + .load(url, function() { + $dialog.dialog("option", "buttons", $buttons); + $('#epgpopup_dialogue a.event').click(function(e) { + epgpopup(e, $(this)); + }); + }); + $('#epgpopup_dialogue') + .attr('xs', o.attr('xs')) + .attr('xe', o.attr('xe')); + $dialog.dialog('open'); +} +$('a.event').click(function(e) { + e.preventDefault(); + epgpopup(e, $(this)) +}); - function epgpopup(e, o) - { - e.preventDefault(); - var sch = o.attr('sch'); - var rec = o.attr('rec'); - if (sch != 0) - $dialog.dialog("option", "buttons", $buttons1); - else if (rec == 2) - $dialog.dialog("option", "buttons", $buttons3); - else if (rec == 1) - $dialog.dialog("option", "buttons", $buttons2); - else - $dialog.dialog("option", "buttons", $buttons1); - var url = '/cgi-bin/epg/info.jim?service=' + - o.attr('xs') + '&event=' + - o.attr('xe') + '&bare=1'; - $('#epgpopup_dialogue') - .html(' Loading details...' + - ' Please wait...') - .load(url, function() { - $('#epgpopup_dialogue a.event').click(function(e) { - epgpopup(e, $(this)); - }); - }); - $('#epgpopup_dialogue') - .attr('xs', o.attr('xs')) - .attr('xe', o.attr('xe')); - $dialog.dialog('open'); - } - $('a.event').click(function(e) { - e.preventDefault(); - epgpopup(e, $(this)) - }); });