Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-09-19 15:03:29 -04:00
parent d70951a334 f717efd7fb
commit dc4e12a0ae
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
View File

@ -7,8 +7,8 @@
<span class='blockId'><?php echo "$this->blockId" ?></span>
<span class='blockIndex'><?php echo "$this->blockIndex" ?></span>
<?php elseif (isset($this->uri)): ?>
<span class='audioUri'><?php echo "$this->uri" ?></span>
<span class='audioMime'><?php echo "$this->mime" ?></span>
<span class='audioUri' style="display: none;"><?php echo "$this->uri" ?></span>
<span class='audioMime' style="display: none;"><?php echo "$this->mime" ?></span>
<span class='audioFileTitle'><?php echo "$this->audioFileTitle" ?></span>
<span class='audioFileArtist'><?php echo "$this->audioFileArtist" ?></span>
<?php elseif (isset($this->showID)): ?>

49
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
View File

@ -8,6 +8,17 @@ var _idToPostionLookUp;
*/
$(document).ready(function(){
$.jPlayer.timeFormat.showHour = true;
var audioUri = $('.audioUri').text();
var audioMime = $('.audioMime').text();
var playlistID = $('.playlistID').text();
var playlistIndex = $('.playlistIndex').text();
var showID = $('.showID').text();
var showIndex = $('.showIndex').text();
var blockId = $('.blockId').text();
var blockIndex = $('.blockIndex').text();
_playlist_jplayer = new jPlayerPlaylist({
jPlayer: "#jquery_jplayer_1",
cssSelectorAncestor: "#jp_container_1"
@ -29,33 +40,20 @@ $(document).ready(function(){
addTime: 0,
removeTime: 0,
shuffleTime: 0
},
ready: function(){
if (playlistID != "" && playlistID !== ""){
playAllPlaylist(playlistID, playlistIndex);
}else if (audioUri != "") {
playOne(audioUri, audioMime);
}else if (showID != "") {
playAllShow(showID, showIndex);
}else if(blockId != "" && blockIndex != ""){
playBlock(blockId, blockIndex);
}
}
});
$.jPlayer.timeFormat.showHour = true;
var audioUri = $('.audioUri').text();
var audioMime = $('.audioMime').text();
var playlistID = $('.playlistID').text();
var playlistIndex = $('.playlistIndex').text();
var showID = $('.showID').text();
var showIndex = $('.showIndex').text();
var blockId = $('.blockId').text();
var blockIndex = $('.blockIndex').text();
var numOfItems = 0;
if (playlistID != "" && playlistID !== ""){
playAllPlaylist(playlistID, playlistIndex);
}else if (audioUri != "") {
playOne(audioUri, audioMime);
}else if (showID != "") {
playAllShow(showID, showIndex);
}else if(blockId != "" && blockIndex != ""){
playBlock(blockId, blockIndex);
}
$("#jp_container_1").on("mouseenter", "ul.jp-controls li", function(ev) {
$(this).addClass("ui-state-hover");
});
@ -63,6 +61,7 @@ $(document).ready(function(){
$("#jp_container_1").on("mouseleave", "ul.jp-controls li", function(ev) {
$(this).removeClass("ui-state-hover");
});
});
/**
@ -223,7 +222,7 @@ function playOne(uri, mime) {
if (media) {
_playlist_jplayer.option("autoPlay", true);
playlist[0] = media;
_playlist_jplayer._initPlaylist(playlist);
_playlist_jplayer.setPlaylist(playlist);
_playlist_jplayer.play(0);
}

3
airtime_mvc/public/js/qtip/jquery.qtip.js
View File

@ -1247,7 +1247,6 @@ function QTip(target, options, id, attr)
position.top -= offset;
}
else if(overflowBottom > 0 && (my.y !== 'bottom' || overflowTop > 0) ) {
console.log('test');
position.top -= isCenter ? -offset : offset;
}
if(position.top !== posTop && isCenter) { position.top -= adjust.y; }
@ -3241,4 +3240,4 @@ PLUGINS.bgiframe = function(api)
PLUGINS.bgiframe.initialize = 'render';
}(jQuery, window));
}(jQuery, window));