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

CC-2184: Hardcoded CSS path should be relative path instead

Browse source
This commit is contained in:
denise 2012-10-19 11:09:34 -04:00
parent 7165d1fa2e
commit d32495d100
47 changed files with 366 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,7 +310,7 @@ var AIRTIME = (function(AIRTIME) {
mod.fnDeleteItems = function(aMedia) {
$.post("/library/delete",
$.post(baseUrl+"/library/delete",
{"format": "json", "media": aMedia},
function(json){
if (json.message !== undefined) {
@ -479,7 +479,7 @@ var AIRTIME = (function(AIRTIME) {
"fnStateSave": function (oSettings, oData) {
localStorage.setItem('datatables-library', JSON.stringify(oData));
$.ajax({
url: "/usersettings/set-library-datatable",
url: baseUrl+"/usersettings/set-library-datatable",
type: "POST",
data: {settings : oData, format: "json"},
dataType: "json"
@ -520,7 +520,7 @@ var AIRTIME = (function(AIRTIME) {
oData.iCreate = parseInt(oData.iCreate, 10);
},
"sAjaxSource": "/Library/contents-feed",
"sAjaxSource": baseUrl+"/Library/contents-feed",
"sAjaxDataProp": "files",
"fnServerData": function ( sSource, aoData, fnCallback ) {
@ -604,7 +604,7 @@ var AIRTIME = (function(AIRTIME) {
text: aData.track_title
},
ajax: {
url: "/Library/get-file-metadata",
url: baseUrl+"/Library/get-file-meta-data",
type: "get",
data: ({format: "html", id : aData.id, type: aData.ftype}),
success: function(data, status) {
@ -770,13 +770,13 @@ var AIRTIME = (function(AIRTIME) {
};
} else if (data.ftype === "playlist" || data.ftype === "block") {
callback = function() {
var url = '/Playlist/edit';
var url = baseUrl+'/Playlist/edit';
AIRTIME.playlist.fnEdit(data.id, data.ftype, url);
AIRTIME.playlist.validatePlaylistElements();
};
} else if (data.ftype === "stream") {
callback = function() {
var url = '/Webstream/edit';
var url = baseUrl+'/Webstream/edit';
AIRTIME.playlist.fnEdit(data.id, data.ftype, url);
}
} else {
@ -882,7 +882,7 @@ var AIRTIME = (function(AIRTIME) {
}
request = $.ajax({
url: "/library/context-menu",
url: baseUrl+"/library/context-menu",
type: "GET",
data: {id : data.id, type: data.ftype, format: "json", "screen": screen},
dataType: "json",
@ -905,7 +905,7 @@ var AIRTIME = (function(AIRTIME) {
}(AIRTIME || {}));
function checkImportStatus() {
$.getJSON('/Preference/is-import-in-progress', function(data){
$.getJSON(baseUrl+'/Preference/is-import-in-progress', function(data){
var div = $('#import_status');
var table = $('#library_display').dataTable();
if (data == true){
@ -938,7 +938,7 @@ function addProgressIcon(id) {
function checkLibrarySCUploadStatus(){
var url = '/Library/get-upload-to-soundcloud-status',
var url = baseUrl+'/Library/get-upload-to-soundcloud-status',
span,
id;
@ -993,7 +993,7 @@ function addQtipToSCIcons(){
content: {
text: "Retrieving data from the server...",
ajax: {
url: "/Library/get-upload-to-soundcloud-status",
url: baseUrl+"/Library/get-upload-to-soundcloud-status",
type: "post",
data: ({format: "json", id : id, type: "file"}),
success: function(json, status){
@ -1019,7 +1019,7 @@ function addQtipToSCIcons(){
content: {
text: "Retreiving data from the server...",
ajax: {
url: "/Library/get-upload-to-soundcloud-status",
url: baseUrl+"/Library/get-upload-to-soundcloud-status",
type: "post",
data: ({format: "json", id : id, type: "file"}),
success: function(json, status){

9
airtime_mvc/public/js/airtime/library/plupload.js
View file

@ -1,10 +1,11 @@
$(document).ready(function() {
var uploader;
$("#plupload_files").pluploadQueue({
// General settings
runtimes : 'gears, html5, html4',
url : '/Plupload/upload/format/json',
url : baseUrl+'/Plupload/upload/format/json',
chunk_size : '5mb',
unique_names : 'true',
multiple_queues : 'true',
@ -27,9 +28,9 @@ $(document).ready(function() {
$("#plupload_error table").css("display", "inline-table");
}else{
var tempFileName = j.tempfilepath;
$.get('/Plupload/copyfile/format/json/name/' +
encodeURIComponent(file.name)+'/tempname/' +
encodeURIComponent(tempFileName), function(json){
$.get(baseUrl+'/Plupload/copyfile/format/json/name/'+
encodeURIComponent(file.name)+'/tempname/' +
encodeURIComponent(tempFileName), function(json){
var jr = jQuery.parseJSON(json);
if(jr.error !== undefined) {
var row = $("<tr/>")

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

@ -66,121 +66,121 @@ var AIRTIME = (function(AIRTIME){
event.stopPropagation();
var span = $(this),
id = span.parent().attr("id").split("_").pop(),
url = "/Playlist/set-cue",
url = baseUrl+"/Playlist/set-cue",
cueIn = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
lastMod = getModified(),
type = $('#obj_type').val();
if (!isTimeValid(cueIn)){
showError(span, "please put in a time '00:00:00 (.0)'");
return;
}
$.post(url,
{format: "json", cueIn: cueIn, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
playlistError(json);
if (!isTimeValid(cueIn)){
showError(span, "please put in a time '00:00:00 (.0)'");
return;
}
$.post(url,
{format: "json", cueIn: cueIn, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
playlistError(json);
return;
}
if (json.cue_error !== undefined) {
showError(span, json.cue_error);
return;
}
setPlaylistContent(json);
li = $('#side_playlist li[unqid='+unqid+']');
li.find(".cue-edit").toggle();
highlightActive(li);
highlightActive(li.find('.spl_cue'));
});
}
if (json.cue_error !== undefined) {
showError(span, json.cue_error);
return;
}
setPlaylistContent(json);
li = $('#side_playlist li[unqid='+unqid+']');
li.find(".cue-edit").toggle();
highlightActive(li);
highlightActive(li.find('.spl_cue'));
});
}
function changeCueOut(event) {
event.stopPropagation();
var span = $(this),
id = span.parent().attr("id").split("_").pop(),
url = "/Playlist/set-cue",
url = baseUrl+"/Playlist/set-cue",
cueOut = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
lastMod = getModified(),
type = $('#obj_type').val();
if (!isTimeValid(cueOut)){
showError(span, "please put in a time '00:00:00 (.0)'");
return;
}
if (!isTimeValid(cueOut)){
showError(span, "please put in a time '00:00:00 (.0)'");
return;
}
$.post(url,
{format: "json", cueOut: cueOut, id: id, modified: lastMod, type: type},
function(json){
$.post(url,
{format: "json", cueOut: cueOut, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
playlistError(json);
return;
if (json.error !== undefined){
playlistError(json);
return;
}
if (json.cue_error !== undefined) {
showError(span, json.cue_error);
return;
}
if (json.cue_error !== undefined) {
showError(span, json.cue_error);
return;
}
setPlaylistContent(json);
li = $('#side_playlist li[unqid='+unqid+']');
li.find(".cue-edit").toggle();
highlightActive(li);
highlightActive(li.find('.spl_cue'));
});
}
function changeFadeIn(event) {
event.preventDefault();
setPlaylistContent(json);
var span = $(this),
id = span.parent().attr("id").split("_").pop(),
url = "/Playlist/set-fade",
fadeIn = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
lastMod = getModified(),
li = $('#side_playlist li[unqid='+unqid+']');
li.find(".cue-edit").toggle();
highlightActive(li);
highlightActive(li.find('.spl_cue'));
});
}
function changeFadeIn(event) {
event.preventDefault();
var span = $(this),
id = span.parent().attr("id").split("_").pop(),
url = baseUrl+"/Playlist/set-fade",
fadeIn = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
lastMod = getModified(),
type = $('#obj_type').val();
if (!isFadeValid(fadeIn)){
showError(span, "please put in a time in seconds '00 (.0)'");
return;
}
if (!isFadeValid(fadeIn)){
showError(span, "please put in a time in seconds '00 (.0)'");
return;
}
$.post(url,
{format: "json", fadeIn: fadeIn, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
playlistError(json);
return;
$.post(url,
{format: "json", fadeIn: fadeIn, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
playlistError(json);
return;
}
if (json.fade_error !== undefined) {
showError(span, json.fade_error);
return;
}
setPlaylistContent(json);
li = $('#side_playlist li[unqid='+unqid+']');
li.find('.crossfade').toggle();
highlightActive(li.find('.spl_fade_control'));
});
}
if (json.fade_error !== undefined) {
showError(span, json.fade_error);
return;
}
setPlaylistContent(json);
li = $('#side_playlist li[unqid='+unqid+']');
li.find('.crossfade').toggle();
highlightActive(li.find('.spl_fade_control'));
});
}
function changeFadeOut(event) {
event.stopPropagation();
var span = $(this),
id = span.parent().attr("id").split("_").pop(),
url = "/Playlist/set-fade",
url = baseUrl+"/Playlist/set-fade",
fadeOut = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
@ -264,7 +264,8 @@ var AIRTIME = (function(AIRTIME){
nameElement.text(nameElement.text().replace("\n", ""));
/* --until we decide whether Playlist name should autosave or not
url = '/Playlist/set-playlist-name';
url = baseUrl+'/Playlist/set-playlist-name';
$.post(url,
{format: "json", name: nameElement.text(), modified: lastMod, type: type},
@ -501,9 +502,9 @@ var AIRTIME = (function(AIRTIME){
else {
$(this).addClass("ui-state-active");
var url = '/Playlist/get-playlist-fades';
var url = baseUrl+'/Playlist/get-playlist-fades';
$.post(url,
{format: "json", modified: lastMod, type: type},
{format: "json", modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
playlistError(json);
@ -538,7 +539,7 @@ var AIRTIME = (function(AIRTIME){
$pl.on("blur", "span.spl_main_fade_in", function(event){
event.stopPropagation();
var url = "/Playlist/set-playlist-fades",
var url = baseUrl+"/Playlist/set-playlist-fades",
span = $(this),
fadeIn = $.trim(span.text()),
lastMod = getModified(),
@ -562,7 +563,7 @@ var AIRTIME = (function(AIRTIME){
$pl.on("blur", "span.spl_main_fade_out", function(event){
event.stopPropagation();
var url = "/Playlist/set-playlist-fades",
var url = baseUrl+"/Playlist/set-playlist-fades",
span = $(this),
fadeOut = $.trim(span.text()),
lastMod = getModified(),
@ -623,7 +624,7 @@ var AIRTIME = (function(AIRTIME){
//hide any previous errors (if any)
$("#side_playlist .errors").empty().hide();
var url = 'Webstream/save';
var url = baseUrl+'/Webstream/save';
$.post(url,
{format: "json", id:id, description: description, url:streamurl, length: length, name: name},
function(json){
@ -668,7 +669,7 @@ var AIRTIME = (function(AIRTIME){
var criteria = $('form').serializeArray(),
block_name = $('#playlist_name_display').text(),
block_desc = $('textarea[name="description"]').val(),
save_action = 'Playlist/save',
save_action = baseUrl+'/Playlist/save',
obj_id = $('input[id="obj_id"]').val(),
obj_type = $('#obj_type').val(),
lastMod = getModified(),
@ -793,7 +794,7 @@ var AIRTIME = (function(AIRTIME){
}
mod.fnNew = function() {
var url = '/Playlist/new';
var url = baseUrl+'/Playlist/new';
stopAudioPreview();
@ -806,7 +807,7 @@ var AIRTIME = (function(AIRTIME){
};
mod.fnWsNew = function() {
var url = '/Webstream/new';
var url = baseUrl+'/Webstream/new';
stopAudioPreview();
@ -818,8 +819,9 @@ var AIRTIME = (function(AIRTIME){
});
};
mod.fnNewBlock = function() {
var url = '/Playlist/new';
var url = baseUrl+'/Playlist/new';
stopAudioPreview();
@ -850,7 +852,7 @@ var AIRTIME = (function(AIRTIME){
id = (plid === undefined) ? getId() : plid;
lastMod = getModified();
type = $('#obj_type').val();
url = '/Playlist/delete';
url = baseUrl+'/Playlist/delete';
$.post(url,
{format: "json", ids: id, modified: lastMod, type: type},
@ -867,7 +869,7 @@ var AIRTIME = (function(AIRTIME){
id = (wsid === undefined) ? getId() : wsid;
lastMod = getModified();
type = $('#obj_type').val();
url = '/Webstream/delete';
url = baseUrl+'/Webstream/delete';
$.post(url,
{format: "json", ids: id, modified: lastMod, type: type},
@ -940,20 +942,20 @@ var AIRTIME = (function(AIRTIME){
}
mod.fnAddItems = function(aItems, iAfter, sAddType) {
var sUrl = "/playlist/add-items";
var sUrl = baseUrl+"/playlist/add-items";
oData = {"aItems": aItems, "afterItem": iAfter, "type": sAddType};
playlistRequest(sUrl, oData);
};
mod.fnMoveItems = function(aIds, iAfter) {
var sUrl = "/playlist/move-items",
var sUrl = baseUrl+"/playlist/move-items",
oData = {"ids": aIds, "afterItem": iAfter};
playlistRequest(sUrl, oData);
};
mod.fnDeleteItems = function(aItems) {
var sUrl = "/playlist/delete-items",
var sUrl = baseUrl+"/playlist/delete-items",
oData = {"ids": aItems};
playlistRequest(sUrl, oData);