]> git.0d.be Git - panikweb.git/commitdiff
Fixing bug with onAir (now working on player! )
authorlaron <simon@surlaterre.org>
Thu, 22 Aug 2013 10:10:47 +0000 (12:10 +0200)
committerlaron <simon@surlaterre.org>
Thu, 22 Aug 2013 10:10:47 +0000 (12:10 +0200)
panikweb_templates/templates/includes/player.html

index e89233f1675794aea20ba13f10a6d83df4dac08c..f54fa377e59f75cf4cd90bfe37b7e1e63dd16a14 100644 (file)
                                        $('#WhatsOnAir').on('load',function(){
                                                var self = $(this);
                                                self.fadeOut();
-                                               $.getJSON('onair.json', function(data) {
-                                                       if(data.episode || data.emission){
-                                                               self.html('<strong>'+data.emission.title+'<strong>'+'&nbsp;<span>'+data.emission.title+'<span>');
+                                               $.getJSON('onair.json', function(onair) {
+                                                       if(onair.data.episode || onair.data.emission){
+                                                               var result = '';
+                                                               result = result + ($.type(onair.data.emission) == 'object'?'<strong>'+onair.data.emission.title+'<strong>&nbsp;':'');
+                                                               result = result +  ($.type(onair.data.episode) == 'object'?'<span>'+onair.data.episode.title+'<span>':'');
+                                                               self.html(result);
                                                        }
                                                        else{self.html('<strong>Unknown (Probably Non-Stop)<strong>');}
                                                        self.fadeIn();