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

-implemented UI changes for playlist/block/webstream builder

Browse source
This commit is contained in:
denise 2012-09-14 15:49:39 -04:00
parent 198d15adc8
commit 0524e4e5d2
11 changed files with 97 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,9 +16,9 @@ var AIRTIME = (function(AIRTIME) {
}
if (check === true) {
AIRTIME.button.enableButton("icon-plus", true);
AIRTIME.button.enableButton("btn-group #library-plus", true);
} else {
AIRTIME.button.disableButton("icon-plus", true);
AIRTIME.button.disableButton("btn-group #library-plus", true);
}
};
@ -109,7 +109,7 @@ var AIRTIME = (function(AIRTIME) {
.find('.icon-plus').parent()
.click(function() {
if (AIRTIME.button.isDisabled('icon-plus') === true) {
if (AIRTIME.button.isDisabled('btn-group #library-plus') === true) {
return;
}

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

@ -16,9 +16,9 @@ var AIRTIME = (function(AIRTIME) {
}
if (check === true) {
AIRTIME.button.enableButton("icon-plus", true);
AIRTIME.button.enableButton("btn-group #library-plus", true);
} else {
AIRTIME.button.disableButton("icon-plus", true);
AIRTIME.button.disableButton("btn-group #library-plus", true);
}
};
@ -121,7 +121,7 @@ var AIRTIME = (function(AIRTIME) {
.click(
function() {
if (AIRTIME.button.isDisabled('icon-plus') === true) {
if (AIRTIME.button.isDisabled('btn-group #library-plus') === true) {
return;
}

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

@ -110,7 +110,7 @@ var AIRTIME = (function(AIRTIME) {
"</ul>" +
"</div>")
.append("<div class='btn-group'>" +
"<button class='btn btn-small'>" +
"<button class='btn btn-small' id='library-plus'>" +
"<i class='icon-white icon-plus'></i> Add to current playlist" +
"</button>" +
"</div>")

5
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -943,6 +943,7 @@ var AIRTIME = (function(AIRTIME){
};
mod.init = function() {
/*
$.contextMenu({
selector: '#spl_new, #ws_new',
trigger: "left",
@ -953,6 +954,10 @@ var AIRTIME = (function(AIRTIME){
"ws": {name: "New Webstream", callback: AIRTIME.playlist.fnWsNew}
}
});
*/
$('#lib-new-pl').live('click', function(){AIRTIME.playlist.fnNew();});
$('#lib-new-bl').live('click', function(){AIRTIME.playlist.fnNewBlock();});
$('#lib-new-ws').live('click', function(){AIRTIME.playlist.fnWsNew();});
/*
$pl.delegate("#spl_new",
{"click": AIRTIME.playlist.fnNew});*/