wassname/fullcalendar
1
0
Fork 0
mirror of https://github.com/wassname/fullcalendar.git synced 2026-07-31 12:20:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Sean Kenny
2014-07-26 15:01:11 +01:00
parent 7f7e945a33
commit 58fdc57018
9 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+1 -1
View File
@@ -63,7 +63,7 @@ module.exports = function(grunt) {
'clean:modules',
'lumbar:build',
'concat:moduleVariables',
'jshint:builtModules',
//'jshint:builtModules',
'uglify:modules'
]);
src/Calendar.js
+1
View File
@@ -517,6 +517,7 @@ function Calendar(element, instanceOptions) {
-----------------------------------------------------------------------------*/
// TODO: going forward, most of this stuff should be directly handled by the view
function refetchEvents() { // can be called as an API method
clearEvents();
fetchAndRenderEvents();
src/EventManager.js
-1
View File
@@ -1,4 +1,3 @@
/// <reference path="../build/out/fullcalendar.min.js" />
fc.sourceNormalizers = [];
fc.sourceFetchers = [];
src/ResourceManager.js
+2 -2
View File
@@ -98,11 +98,11 @@ function ResourceManager(options) {
data: data,
dataType: 'json',
cache: false,
success: function (res) {
success: function(res) {
res = res || [];
resources = res;
},
error: function () {
error: function() {
alert("ajax error getting json from " + url);
},
async: false // too much work coordinating callbacks so dumb it down
src/common/View.js
+1 -3
View File
@@ -446,9 +446,7 @@ function View(element, calendar, viewName) {
function rangeToSegments(start, end) {
var rowCnt = t.getRowCnt();
// HAAAACK! Can't really think of a way yet to get this working.
var colCnt = t.name === 'resourceDay' ? 1 : t.getColCnt();
var colCnt = t.getColCnt();
var segments = []; // array of segments to return
// day offset for given date range
src/resource/ResourceDayView.js
+1 -1
View File
@@ -26,7 +26,7 @@ function ResourceDayView(element, calendar) {
}
skipHiddenDays(date, delta < 0 ? -1 : 1);
var start = cloneDate(date, true);
var start = date.cloneDate().stripTime();
var end = addDays(cloneDate(start), 1);
t.title = formatDate(date, opt('titleFormat'));
src/resource/ResourceEventRenderer.js
+6 -6
View File
@@ -237,8 +237,8 @@ function ResourceEventRenderer() {
}
}
left = leftmost + // leftmost possible
(availWidth / (levelI + forward + 1) * levelI) // indentation
* dis + (rtl ? availWidth - outerWidth : 0); // rtl
(availWidth / (levelI + forward + 1) * levelI) * // indentation
dis + (rtl ? availWidth - outerWidth : 0); // rtl
seg.top = top;
seg.left = left;
seg.outerWidth = outerWidth;
@@ -460,10 +460,10 @@ function ResourceEventRenderer() {
// changed!
var minuteDelta = 0;
if (!allDay) {
minuteDelta = Math.round((eventElement.offset().top - getSlotContainer().offset().top) / snapHeight)
* snapMinutes
+ minMinute
- (event.start.getHours() * 60 + event.start.getMinutes());
minuteDelta = Math.round((eventElement.offset().top - getSlotContainer().offset().top) / snapHeight) *
snapMinutes +
minMinute -
(event.start.getHours() * 60 + event.start.getMinutes());
}
eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui);
}
src/resource/ResourceView.js
-1
View File
@@ -1,4 +1,3 @@
setDefaults({
allDaySlot: true,
allDayText: 'all-day',
tests/resourceDayView.html
+14 -8
View File
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<link href='../build/out/fullcalendar.css' rel='stylesheet' />
<link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
<link href='../dist/fullcalendar.css' rel='stylesheet' />
<link href='../dist/fullcalendar.print.css' rel='stylesheet' media='print' />
<style>
@@ -62,18 +62,22 @@
<div id='calendar' style='width:70%;margin:20px auto 0;font-family:arial'></div>
<script src='../build/out/jquery.js'></script>
<script src='../build/out/jquery-ui.js'></script>
<script src='../lib/jquery/dist/jquery.js'></script>
<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
<script src='../lib/moment/moment.js'></script>
<!--<script src='../src/intro.js'></script> -->
// <!-- <script src='../src/intro.js'></script> -->
<script src='../src/defaults.js'></script>
<script src='../src/main.js'></script>
<script src='../src/lang.js'></script>
<script src='../src/Calendar.js'></script>
<script src='../src/Header.js'></script>
<script src='../src/EventManager.js'></script>
<script src='../src/ResourceManager.js'></script>
<script src='../src/date_util.js'></script>
<script src='../src/util.js'></script>
<script src='../src/moment-ext.js'></script>
<script src='../src/date-formatting.js'></script>
<script src='../src/basic/MonthView.js'></script>
<script src='../src/basic/BasicWeekView.js'></script>
<script src='../src/basic/BasicDayView.js'></script>
@@ -89,11 +93,13 @@
<script src='../src/common/View.js'></script>
<script src='../src/common/DayEventRenderer.js'></script>
<script src='../src/common/SelectionManager.js'></script>
<script src='../src/common/OverlayManager.js'></script>
<script src='../src/common/OverlayManager.js'></script>
<script src='../src/common/CoordinateGrid.js'></script>
<script src='../src/common/HoverListener.js'></script>
<script src='../src/common/HorizontalPositionCache.js'></script>
<script src='../build/out/gcal.js'></script>
// <!-- <script src='../src/outro.js'></script> -->
<script src='../dist/gcal.js'></script>
<script>
function showModal(a, b, c) {