Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

This commit is contained in:
James 2012-06-08 10:33:27 -04:00
parent 3b9f6f12de 8fae454db6
commit 5b56f258a4
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -301,6 +301,9 @@ var AIRTIME = (function(AIRTIME){
if (!$el.hasClass("ui-state-disabled")) {
$el.addClass("ui-state-hover");
}
else {
$("#show_builder .ui-icon-document-b").contextMenu(false);
}
});
$sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {

23
airtime_mvc/public/js/fullcalendar/fullcalendar.js
View File

@ -2187,11 +2187,18 @@ function BasicView(element, calendar, viewName) {
}else{
clearEvents();
}
updateCells(firstTime);
getOffset();
}
function getOffset() {
var timezoneOffset;
$.ajax({ url: "/Api/calendar-init/format/json", dataType:"json", success:function(data) {
timezoneOffset = data.calendarInit.timezoneOffset*1000;
var firstTime = !body;
updateCells(firstTime, timezoneOffset);
}, error:function(jqXHR, textStatus, errorThrown){}});
}
function updateOptions() {
rtl = opt('isRTL');
if (rtl) {
@ -2272,15 +2279,17 @@ function BasicView(element, calendar, viewName) {
.appendTo(element);
}
function updateCells(firstTime) {
function updateCells(firstTime, timezoneOffset) {
var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
var month = t.start.getMonth();
var today = clearTime(new Date());
var cell;
var date;
var row;
var today = new Date();
var utc = today.getTime() + (today.getTimezoneOffset()*60000);
var userTime = new Date(utc + timezoneOffset);
today = clearTime(userTime);
if (dowDirty) {
headCells.each(function(i, _cell) {