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:
Paul Baranowski 2012-03-23 16:25:54 -04:00
commit 94d32d90df
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
View file

@ -82,8 +82,8 @@ var AIRTIME = (function(AIRTIME){
$toolbar
.append("<ul />")
.find('ul')
.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="add selected items to playlist"><span class="ui-icon ui-icon-plusthick"></span></li>')
.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="delete selected items"><span class="ui-icon ui-icon-trash"></span></li>');
.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="add selected files to playlist"><span class="ui-icon ui-icon-plusthick"></span></li>')
.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="delete selected files"><span class="ui-icon ui-icon-trash"></span></li>');
//add to playlist button
$toolbar.find('.lib-button-add')

4
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -82,8 +82,8 @@ var AIRTIME = (function(AIRTIME){
$toolbar
.append("<ul />")
.find('ul')
.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="add selected items to playlist"><span class="ui-icon ui-icon-plusthick"></span></li>')
.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="delete selected items"><span class="ui-icon ui-icon-trash"></span></li>');
.append('<li class="ui-state-default ui-state-disabled lib-button-add" title="add files after cursor points"><span class="ui-icon ui-icon-plusthick"></span></li>')
.append('<li class="ui-state-default ui-state-disabled lib-button-delete" title="delete selected files"><span class="ui-icon ui-icon-trash"></span></li>');
//add to timeline button
$toolbar.find('.lib-button-add')

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

@ -732,16 +732,22 @@ var AIRTIME = (function(AIRTIME){
//set things like a reference to the table.
AIRTIME.showbuilder.init(oTable);
//add event to cursors.
//add events to cursors.
$sbTable.find("tbody").on("click", "div.marker", function(event) {
var tr = $(this).parents("tr"),
var $tr = $(this).parents("tr"),
cursorSelClass = "cursor-selected-row";
if (tr.hasClass(cursorSelClass)) {
tr.removeClass(cursorSelClass);
if ($tr.hasClass(cursorSelClass)) {
$tr.removeClass(cursorSelClass);
}
else {
tr.addClass(cursorSelClass);
$tr.addClass(cursorSelClass);
}
if (event.ctrlKey === false) {
$sbTable.find('.'+cursorSelClass)
.not($tr)
.removeClass(cursorSelClass);
}
//check if add button can still be enabled.