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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-05-04 12:40:52 -04:00
parent 22c5da1629 7f18f3b329
commit c85c44dbb4
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ var AIRTIME = (function(AIRTIME){
$lib, $lib,
$pl, $pl,
widgetHeight, widgetHeight,
resizeTimeout,
width; width;
function isTimeValid(time) { function isTimeValid(time) {
@ -779,7 +780,9 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.onResize = function() { mod.onResize = function() {
setWidgetSize();
clearTimeout(resizeTimeout);
resizeTimeout = setTimeout(setWidgetSize, 100);
}; };
return AIRTIME; return AIRTIME;

9
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -508,8 +508,7 @@ function alertShowErrorAndReload(){
window.location.reload(); window.location.reload();
} }
function windowResize() {
$(window).resize(function(){
var windowWidth = $(this).width(); var windowWidth = $(this).width();
// margin on showform are 16 px on each side // margin on showform are 16 px on each side
if(!$("#schedule-add-show").is(':hidden')){ if(!$("#schedule-add-show").is(':hidden')){
@ -524,4 +523,10 @@ $(window).resize(function(){
$('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight) $('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight)
$("#schedule_calendar").fullCalendar('render'); $("#schedule_calendar").fullCalendar('render');
}
var scheduleResizeTimeout;
$(window).resize(function(){
clearTimeout(scheduleResizeTimeout);
scheduleResizeTimeout = setTimeout(windowResize, 100);
}); });