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

Merge branch 'saas' into saas-media-refactor

Browse source 
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/controllers/ApiController.php
This commit is contained in:
Albert Santoni 2015-02-25 13:02:11 -05:00
commit 3a1141d4c8
42 changed files with 9042 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airtime_mvc/public/js/airtime/preferences/preferences.js
View file

@ -88,9 +88,11 @@ function setCollapsibleWidgetJsCode() {
$('#widgetCode-label').show("fast");
$('#widgetCode-element').show("fast");
} else {
//hide js textarea
$('#widgetCode-label').hide("fast");
$('#widgetCode-element').hide("fast");
if ($('#widgetCode-label').is(":visible")) {
//hide js textarea
$('#widgetCode-label').hide();
$('#widgetCode-element').hide();
}
}
}
x();
@ -121,6 +123,10 @@ $(document).ready(function() {
return false;
}).next().hide();
$('#logo-remove-btn').click(function() {
$.post(baseUrl+'Preference/remove-logo', function(json){});
});
/* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
$('#pref_save').live('click', function() {
var data = $('#pref_form').serialize();