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

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

Browse source
This commit is contained in:
Martin Konecny 2012-04-20 11:31:37 -04:00
commit 7d6e251adf
13 changed files with 133 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -228,7 +228,8 @@ var AIRTIME = (function(AIRTIME){
//background-color to imitate calendar color.
r,g,b,a,
$nRow = $(nRow),
$image;
$image,
$div;
fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
@ -252,7 +253,25 @@ var AIRTIME = (function(AIRTIME){
node.innerHTML = '';
cl = 'sb-header';
if (aData.record === true) {
$div = $("<div/>", {
"class": "small-icon recording"
});
$(node).append($div);
}
else if(aData.rebroadcast === true) {
$div = $("<div/>", {
"class": "small-icon rebroadcast"
});
$(node).append($div);
}
sSeparatorHTML = '<span class="show-title">'+aData.title+'</span>';
if (aData.rebroadcast === true) {
sSeparatorHTML += '<span>'+aData.rebroadcast_title+'</span>';
}
sSeparatorHTML += '<span class="push-right">';
if (aData.startDate === aData.endDate) {

23
airtime_mvc/public/js/contextmenu/AIRTIME_DEV_README Normal file
View file

@ -0,0 +1,23 @@
Before you overwrite jquery.contextMenu.js, note that we have changed a few lines
in this file.
denise@denise-DX4860:~/airtime/airtime_mvc/public/js/contextmenu$ diff -u jquery.contextMenu_orig.js jquery.contextMenu.js
--- jquery.contextMenu_orig.js 2012-04-20 10:15:59.943215571 -0400
+++ jquery.contextMenu.js 2012-04-20 10:00:18.911178927 -0400
@@ -306,6 +306,15 @@
e.stopImmediatePropagation();
$this.remove();
root.$menu.trigger('contextmenu:hide');
+ /* (Airtime) added this to allow user to exit out of menu.
+ * if ignoreThisClick remains false, every right click
+ * thereafter continues to show the menu
+ */
+ if (ignoreRightClick) {
+ if (e.button == 2) {
+ ignoreThisClick = true;
+ }
+ }
},
// key handled :hover
keyStop: function(e, opt) {

9
airtime_mvc/public/js/contextmenu/jquery.contextMenu.js
View file

@ -306,6 +306,15 @@ var // currently active contextMenu trigger
e.stopImmediatePropagation();
$this.remove();
root.$menu.trigger('contextmenu:hide');
/* (Airtime) added this to allow user to exit out of menu.
* if ignoreThisClick remains false, every right click
* thereafter continues to show the menu
*/
if (ignoreRightClick) {
if (e.button == 2) {
ignoreThisClick = true;
}
}
},
// key handled :hover
keyStop: function(e, opt) {

8
airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
View file

@ -287,15 +287,15 @@ a.jp-mute, a.jp-unmute, a.jp-volume-max {
}
div.jp-audio div.jp-type-single a.jp-mute{
top: 15px;
left: 102px;
left: 106px;
}
div.jp-audio div.jp-type-single a.jp-unmute {
top: 15px;
left: 90px;
left: 95px;
}
div.jp-audio div.jp-type-playlist a.jp-mute, div.jp-audio div.jp-type-playlist a.jp-unmute {
top: 32px;
left: 296px;
left: 297px;
}
div.jp-video a.jp-mute, div.jp-video a.jp-unmute {
top: 27px;
@ -351,7 +351,7 @@ div.jp-volume-bar {
}
div.jp-audio div.jp-type-single div.jp-volume-bar {
top: 24px;
left: 120px;
left: 125px;
}
div.jp-audio div.jp-type-playlist div.jp-volume-bar {
top: 37px;