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:
Rudi Grinberg 2012-09-17 11:58:18 -04:00
commit 990bcebfe8
5 changed files with 76 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

25
airtime_mvc/public/js/airtime/library/library.js
View file

@ -381,11 +381,17 @@ var AIRTIME = (function(AIRTIME) {
label = " (Hz)";
}
if (ele.bVisible) {
advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"'><span>"+ele.sTitle+label+"</span> : <span id='"+ele.mDataProp+"'></span></div>");
} else {
advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"' style='display:none;'><span>"+ele.sTitle+label+"</span> : <span id='"+ele.mDataProp+"'></span></div>");
var inputClass = 'filter_column filter_number_text';
if (criteriaTypes[ele.mDataProp] != "s") {
inputClass = 'filterColumn filter_number_range';
}
if (ele.bVisible) {
advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+" class='control-group'><label class='control-label'>"+ele.sTitle+label+" : </label><div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div></div>");
} else {
advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"' class='control-group' style='display:none;'><label class='control-label'>"+ele.sTitle+label+"</label><div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div></div>");
}
if (criteriaTypes[ele.mDataProp] == "s") {
var obj = { sSelector: "#"+ele.mDataProp }
} else {
@ -650,6 +656,17 @@ var AIRTIME = (function(AIRTIME) {
setColumnFilter(oTable);
oTable.fnSetFilteringDelay(350);
$libContent.on("click", "legend", function(){
var $fs = $(this).parents("fieldset");
if ($fs.hasClass("closed")) {
$fs.removeClass("closed");
}
else {
$fs.addClass("closed");
}
});
$libContent.find(".dataTables_scrolling").css("max-height", tableHeight);

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

@ -330,28 +330,6 @@ var AIRTIME = (function(AIRTIME){
$lib = $("#library_content"),
$sbTable = $sbContent.find('table');
/*
* Icon hover states in the toolbar.
*/
$sbContent.on("mouseenter", "#timeline-select .dropdown-toggle", function(ev) {
$el = $(this);
if (!$el.hasClass("ui-state-disabled")) {
$el.addClass("ui-state-hover");
$("#timeline-select .caret").contextMenu(true);
}
else {
$("#timeline-select .caret").contextMenu(false);
}
});
$sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
$el = $(this);
if (!$el.hasClass("ui-state-disabled")) {
$el.removeClass("ui-state-hover");
}
});
oSchedTable = $sbTable.dataTable( {
"aoColumns": [
/* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
@ -1090,6 +1068,29 @@ var AIRTIME = (function(AIRTIME){
return false;
});
/*
* Icon hover states in the toolbar.
*/
$sbContent.on("mouseenter", ".btn-group #timeline-select", function(ev) {
$el = $(this).parent(),
$ch = $el.children('#timeline-select');
if ($el.hasClass("ui-state-disabled")) {
$ch.attr("disabled", "disabled");
}
else {
$ch.removeAttr("disabled");
}
});
$sbContent.on("mouseleave", ".btn-group #timeline-select", function(ev) {
$el = $(this).parent();
if (!$el.hasClass("ui-state-disabled")) {
$el.removeClass("ui-state-hover");
}
});
//begin context menu initialization.
$.contextMenu({
selector: '.sb-content table tbody tr:not(.sb-empty, .sb-footer, .sb-header, .sb-record) td:not(.sb-checkbox, .sb-image)',