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:
James 2012-09-17 12:29:07 -04:00
commit 54c3c13754
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1023,7 +1023,7 @@ var AIRTIME = (function(AIRTIME){
}); });
//delete overbooked tracks. //delete overbooked tracks.
$toolbar.find('.icon-cut') $toolbar.find('.icon-cut').parent()
.click(function() { .click(function() {
if (AIRTIME.button.isDisabled('icon-cut') === true) { if (AIRTIME.button.isDisabled('icon-cut') === true) {
@ -1043,7 +1043,7 @@ var AIRTIME = (function(AIRTIME){
}); });
//delete selected tracks //delete selected tracks
$toolbar.find('.icon-trash') $toolbar.find('.icon-trash').parent()
.click(function() { .click(function() {
if (AIRTIME.button.isDisabled('icon-trash') === true) { if (AIRTIME.button.isDisabled('icon-trash') === true) {
@ -1087,13 +1087,6 @@ var AIRTIME = (function(AIRTIME){
$ch.removeAttr("disabled"); $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. //begin context menu initialization.