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

Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder

Browse source
This commit is contained in:
Duncan Sommerville 2015-08-25 17:09:17 -04:00
commit afa3b47e42
19 changed files with 422 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -231,7 +231,7 @@ function showHint(h) {
function getUsabilityHint() {
var pathname = window.location.pathname;
$.getJSON("/api/get-usability-hint", {"format": "json", "userPath": pathname}, function(json) {
$.getJSON(baseUrl + "api/get-usability-hint", {"format": "json", "userPath": pathname}, function(json) {
var $hint_div = $('.usability_hint');
var current_hint = $hint_div.html();
if (json === "") {

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

@ -14,10 +14,11 @@ $(document).ready(function() {
Object.freeze(self.IMPORT_STATUS_CODES);
}
console.log(acceptedMimeTypes.join());
Dropzone.options.addMediaDropzone = {
url:'/rest/media',
//clickable: false,
acceptedFiles: acceptedMimeTypes.join(),
acceptedFiles: acceptedMimeTypes.join() + ",.flac",
init: function () {
this.on("sending", function (file, xhr, data) {
data.append("csrf_token", $("#csrf").val());