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

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
This commit is contained in:
martin 2011-09-09 15:07:43 -04:00
commit 9c7bab616d
50 changed files with 205 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ function deleteAudioClip(json) {
}
deleteItem("au", json.id);
location.reload(true);
}
//callbacks called by jjmenu

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

@ -303,6 +303,9 @@ function addSPLItem(event, ui){
function deleteSPLItem(event){
event.stopPropagation();
// stop any preview playing
$('#jquery_jplayer_1').jPlayer('stop');
var url, pos;
@ -399,7 +402,7 @@ function newSPL() {
function deleteSPL() {
var url;
// stop any preview playing
$('#jquery_jplayer_1').jPlayer('stop');