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:
Martin Konecny 2012-08-20 18:36:32 -04:00
commit 337e5fec8a
12 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ var AIRTIME = (function(AIRTIME){
if (aMediaIds.length > 0) {
AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after');
} else {
alert('You can only add tracks to smart playlists.');
alert('You can only add tracks to smart blocks.');
}
});

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

@ -547,7 +547,7 @@ var AIRTIME = (function(AIRTIME) {
.append('<option value="0">All</option>')
.append('<option value="1">Files</option>')
.append('<option value="2">Playlists</option>')
.append('<option value="3">Smart Playlists</option>')
.append('<option value="3">Smart Blocks</option>')
.append('<option value="4">Web Streams</option>')
.end()
.change(function(ev){

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

@ -355,7 +355,7 @@ var AIRTIME = (function(AIRTIME){
setCueEvents();
setFadeEvents();
// functions in smart_playlistbuilder.js
// functions in smart_blockbuilder.js
setupUI();
appendAddButton();
appendModAddButton();
@ -909,7 +909,7 @@ var AIRTIME = (function(AIRTIME){
ignoreRightClick: true,
items: {
"sp": {name: "New Playlist", callback: AIRTIME.playlist.fnNew},
"sb": {name: "New Smart Playlist", callback: AIRTIME.playlist.fnNewBlock},
"sb": {name: "New Smart Block", callback: AIRTIME.playlist.fnNewBlock},
"ws": {name: "New Webstream", callback: AIRTIME.playlist.fnWsNew}
}
});