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

Merge branch '2.2.x' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
This commit is contained in:
denise 2012-11-07 11:21:36 -05:00
commit b817684972
33 changed files with 167 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,10 +8,16 @@ var AIRTIME = (function(AIRTIME) {
mod = AIRTIME.library;
mod.checkAddButton = function() {
var selected = mod.getChosenItemsLength(), sortable = $('#spl_sortable'), check = false;
// make sure audioclips are selected and a playlist is currently open.
if (selected !== 0 && sortable.length !== 0) {
var selected = mod.getChosenItemsLength(),
sortable = $('#spl_sortable:visible'),
check = false,
blockType = $('input[name=sp_type]:checked', '#smart-block-form').val();
// make sure audioclips are selected and a playlist or static block is currently open.
// static blocks have value of 0
// dynamic blocks have value of 1
if (selected !== 0 && (sortable.length !== 0 || blockType === "0")) {
check = true;
}
@ -96,6 +102,10 @@ var AIRTIME = (function(AIRTIME) {
return container;
},
cursor : 'pointer',
cursorAt: {
top: 30,
left: 100
},
connectToSortable : '#spl_sortable'
});
};

3
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
View file

@ -201,7 +201,8 @@ function setSmartBlockEvents() {
/********** CHANGE PLAYLIST TYPE **********/
form.find('dd[id="sp_type-element"]').live("change", function(){
setupUI();
setupUI();
AIRTIME.library.checkAddButton();
});
/********** CRITERIA CHANGE **********/