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:42:11 -04:00
commit 5d60a599a6
14 changed files with 94 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -972,7 +972,7 @@ var AIRTIME = (function(AIRTIME){
$('#timeline-sn').click(function(){mod.selectNone();});
//cancel current show
$toolbar.find('.icon-ban-circle')
$toolbar.find('.icon-ban-circle').parent()
.click(function() {
var $tr,
data,
@ -1006,7 +1006,7 @@ var AIRTIME = (function(AIRTIME){
});
//jump to current
$toolbar.find('.icon-step-forward')
$toolbar.find('.icon-step-forward').parent()
.click(function() {
if (AIRTIME.button.isDisabled('icon-step-forward') === true) {