fullcalendar-bootstrap-rails 2.3.1.0 → 2.3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40dcb1d050843c5a126bc6cc9bb3cf4d9ff7b21f
-  data.tar.gz: 30e7a8703b92e16d9a8ac651868857f5b3f6811c
+  metadata.gz: 8a5e75b6d752de15a27f2d5d88d6d5267c40728a
+  data.tar.gz: 8df7cd6a3ce8859f25b6100b86c58ac00923f5ce
 SHA512:
-  metadata.gz: ff9c7ec1eb1fbc8df650603be496f2c0f5eaee2ca492b662f9c43833eceecb7775ebd1370ea6690184956054523e8e6bdcf38c99b7a1c8127b432196c04eb222
-  data.tar.gz: 8f2e6081d7bdef42764c93c55d2d4b5bd96f3b62f51c733f2a4ab67c12f2e0b0c3a332a31b8f442d0431a98d5a358d17488f7b9cc01316deeca8973e7521b6cc
+  metadata.gz: 22b4a997e9acddf441a25180dde1591eb03efd0ea030ccb522e87e93199dd7a5eef79f2c04d2ac3d73a6097191efe3b3de1f451649d77b50f08e67ff3152d204
+  data.tar.gz: 4e7a9a210a40ccf62eb5be05229bec9c1f2b98f7efbef6dccef3c2dec655647dc51810f7c701bbfaf7406cb6dfa43b5e524ebb9527d317e2ab01a44b628fc5ea

data/lib/fullcalendar/bootstrap/rails/version.rb

@@ -1,7 +1,7 @@
 module Fullcalendar
   module Bootstrap
     module Rails
-      VERSION = '2.3.1.0'
+      VERSION = '2.3.1.1'
     end
   end
 end

data/vendor/assets/javascripts/fullcalendar.js

@@ -50,7 +50,7 @@ $.fn.fullCalendar = function(options) {
 			calendar.render();
 		}
 	});
-	
+
 	return res;
 };
 
@@ -209,7 +209,7 @@ function enableCursor() {
 
 // Given a total available height to fill, have `els` (essentially child rows) expand to accomodate.
 // By default, all elements that are shorter than the recommended height are expanded uniformly, not considering
-// any other els that are already too tall. if `shouldRedistribute` is on, it considers these tall rows and 
+// any other els that are already too tall. if `shouldRedistribute` is on, it considers these tall rows and
 // reduces the available height.
 function distributeHeight(els, availableHeight, shouldRedistribute) {
 
@@ -5055,7 +5055,7 @@ DayGrid.mixin({
 			'<span class="fc-title">' +
 				(htmlEscape(event.title || '') || '&nbsp;') + // we always want one line of height
 			'</span>';
-		
+
 		return '<a class="' + classes.join(' ') + '"' +
 				(event.url ?
 					' href="' + htmlEscape(event.url) + '"' :
@@ -5184,7 +5184,7 @@ DayGrid.mixin({
 		// Give preference to elements with certain criteria, so they have
 		// a chance to be closer to the top.
 		segs.sort(compareSegs);
-		
+
 		for (i = 0; i < segs.length; i++) {
 			seg = segs[i];
 
@@ -7659,7 +7659,7 @@ function Calendar_constructor(element, overrides) {
 	t.initOptions(overrides || {});
 	var options = this.options;
 
-	
+
 	// Exports
 	// -----------------------------------------------------------------------------------
 
@@ -7832,7 +7832,7 @@ function Calendar_constructor(element, overrides) {
 	};
 
 
-	
+
 	// Imports
 	// -----------------------------------------------------------------------------------
 
@@ -7859,9 +7859,9 @@ function Calendar_constructor(element, overrides) {
 	var ignoreWindowResize = 0;
 	var date;
 	var events = [];
-	
-	
-	
+
+
+
 	// Main Rendering
 	// -----------------------------------------------------------------------------------
 
@@ -7872,8 +7872,8 @@ function Calendar_constructor(element, overrides) {
 	else {
 		date = t.getNow();
 	}
-	
-	
+
+
 	function render() {
 		if (!content) {
 			initialRender();
@@ -7884,8 +7884,8 @@ function Calendar_constructor(element, overrides) {
 			renderView();
 		}
 	}
-	
-	
+
+
 	function initialRender() {
 		tm = options.theme ? 'ui' : 'fc';
 		element.addClass('fc');
@@ -7919,8 +7919,8 @@ function Calendar_constructor(element, overrides) {
 			$(window).resize(windowResizeProxy);
 		}
 	}
-	
-	
+
+
 	function destroy() {
 
 		if (currentView) {
@@ -7938,13 +7938,13 @@ function Calendar_constructor(element, overrides) {
 			$(window).unbind('resize', windowResizeProxy);
 		}
 	}
-	
-	
+
+
 	function elementVisible() {
 		return element.is(':visible');
 	}
-	
-	
+
+
 
 	// View Rendering
 	// -----------------------------------------------------------------------------------
@@ -8004,7 +8004,7 @@ function Calendar_constructor(element, overrides) {
 		ignoreWindowResize--;
 	}
 
-	
+
 
 	// Resizing
 	// -----------------------------------------------------------------------------------
@@ -8021,8 +8021,8 @@ function Calendar_constructor(element, overrides) {
 	t.isHeightAuto = function() {
 		return options.contentHeight === 'auto' || options.height === 'auto';
 	};
-	
-	
+
+
 	function updateSize(shouldRecalc) {
 		if (elementVisible()) {
 
@@ -8044,8 +8044,8 @@ function Calendar_constructor(element, overrides) {
 			_calcSize();
 		}
 	}
-	
-	
+
+
 	function _calcSize() { // assumes elementVisible
 		if (typeof options.contentHeight === 'number') { // exists and not 'auto'
 			suggestedViewHeight = options.contentHeight;
@@ -8057,8 +8057,8 @@ function Calendar_constructor(element, overrides) {
 			suggestedViewHeight = Math.round(content.width() / Math.max(options.aspectRatio, .5));
 		}
 	}
-	
-	
+
+
 	function windowResize(ev) {
 		if (
 			!ignoreWindowResize &&
@@ -8070,9 +8070,9 @@ function Calendar_constructor(element, overrides) {
 			}
 		}
 	}
-	
-	
-	
+
+
+
 	/* Event Fetching/Rendering
 	-----------------------------------------------------------------------------*/
 	// TODO: going forward, most of this stuff should be directly handled by the view
@@ -8098,7 +8098,7 @@ function Calendar_constructor(element, overrides) {
 		currentView.clearEvents();
 		unfreezeContentHeight();
 	}
-	
+
 
 	function getAndRenderEvents() {
 		if (!options.lazyFetching || isFetchNeeded(currentView.start, currentView.end)) {
@@ -8116,7 +8116,7 @@ function Calendar_constructor(element, overrides) {
 			// ... which will call renderEvents
 	}
 
-	
+
 	// called when event data arrives
 	function reportEvents(_events) {
 		events = _events;
@@ -8149,12 +8149,12 @@ function Calendar_constructor(element, overrides) {
 			header.enableButton('today');
 		}
 	}
-	
+
 
 
 	/* Selection
 	-----------------------------------------------------------------------------*/
-	
+
 
 	function select(start, end) {
 
@@ -8171,56 +8171,56 @@ function Calendar_constructor(element, overrides) {
 
 		currentView.select({ start: start, end: end }); // accepts a range
 	}
-	
+
 
 	function unselect() { // safe to be called before renderView
 		if (currentView) {
 			currentView.unselect();
 		}
 	}
-	
-	
-	
+
+
+
 	/* Date
 	-----------------------------------------------------------------------------*/
-	
-	
+
+
 	function prev() {
 		date = currentView.computePrevDate(date);
 		renderView();
 	}
-	
-	
+
+
 	function next() {
 		date = currentView.computeNextDate(date);
 		renderView();
 	}
-	
-	
+
+
 	function prevYear() {
 		date.add(-1, 'years');
 		renderView();
 	}
-	
-	
+
+
 	function nextYear() {
 		date.add(1, 'years');
 		renderView();
 	}
-	
-	
+
+
 	function today() {
 		date = t.getNow();
 		renderView();
 	}
-	
-	
+
+
 	function gotoDate(dateInput) {
 		date = t.moment(dateInput);
 		renderView();
 	}
-	
-	
+
+
 	function incrementDate(delta) {
 		date.add(moment.duration(delta));
 		renderView();
@@ -8238,8 +8238,8 @@ function Calendar_constructor(element, overrides) {
 		date = newDate;
 		renderView(spec ? spec.type : null);
 	}
-	
-	
+
+
 	function getDate() {
 		return date.clone();
 	}
@@ -8267,23 +8267,23 @@ function Calendar_constructor(element, overrides) {
 			overflow: ''
 		});
 	}
-	
-	
-	
+
+
+
 	/* Misc
 	-----------------------------------------------------------------------------*/
-	
+
 
 	function getCalendar() {
 		return t;
 	}
 
-	
+
 	function getView() {
 		return currentView;
 	}
-	
-	
+
+
 	function option(name, value) {
 		if (value === undefined) {
 			return options[name];
@@ -8293,8 +8293,8 @@ function Calendar_constructor(element, overrides) {
 			updateSize(true); // true = allow recalculation of height
 		}
 	}
-	
-	
+
+
 	function trigger(name, thisObj) {
 		if (options[name]) {
 			return options[name].apply(
@@ -8331,9 +8331,9 @@ Calendar.defaults = {
 
 	weekNumberTitle: 'W',
 	weekNumberCalculation: 'local',
-	
+
 	//editable: false,
-	
+
 	// event ajax
 	lazyFetching: true,
 	startParam: 'start',
@@ -8364,7 +8364,7 @@ Calendar.defaults = {
 		prevYear: 'left-double-arrow',
 		nextYear: 'right-double-arrow'
 	},
-	
+
 	// jquery-ui theming
 	theme: false,
 	themeButtonIcons: {
@@ -8378,20 +8378,20 @@ Calendar.defaults = {
 	dragOpacity: .75,
 	dragRevertDuration: 500,
 	dragScroll: true,
-	
+
 	//selectable: false,
 	unselectAuto: true,
-	
+
 	dropAccept: '*',
 
 	eventLimit: false,
 	eventLimitText: 'more',
 	eventLimitClick: 'popover',
 	dayPopoverFormat: 'LL',
-	
+
 	handleWindowResize: true,
 	windowResizeDelay: 200 // milliseconds before an updateSize happens
-	
+
 };
 
 
@@ -8628,7 +8628,7 @@ fc.lang('en', Calendar.englishDefaults);
 
 function Header(calendar, options) {
 	var t = this;
-	
+
 	// exports
 	t.render = render;
 	t.destroy = destroy;
@@ -8638,7 +8638,7 @@ function Header(calendar, options) {
 	t.disableButton = disableButton;
 	t.enableButton = enableButton;
 	t.getViewsWithButtons = getViewsWithButtons;
-	
+
 	// locals
 	var el = $();
 	var viewsWithButtons = [];
@@ -8660,15 +8660,21 @@ function Header(calendar, options) {
 			return el;
 		}
 	}
-	
-	
+
+
 	function destroy() {
 		el.remove();
 	}
-	
-	
+
+
 	function renderSection(position) {
-		var sectionEl = $('<div class="fc-' + position + '"/>');
+		var positioningClass;
+		if('center' == position) {
+			positioningClass = 'fc-' + position;
+		} else {
+			positioningClass = 'pull-' + position;
+		}
+		var sectionEl = $('<div class="' + positioningClass + '"/>');
 		var buttonStr = options.header[position];
 
 		if (buttonStr) {
@@ -8731,8 +8737,10 @@ function Header(calendar, options) {
 
 							classes = [
 								'fc-' + buttonName + '-button',
-								tm + '-button',
-								tm + '-state-default'
+								// tm + '-button',
+								// tm + '-state-default'
+								'btn',
+								'btn-default'
 							];
 
 							button = $( // type="button" so that it doesn't submit a form
@@ -8745,61 +8753,72 @@ function Header(calendar, options) {
 									if (!button.hasClass(tm + '-state-disabled')) {
 
 										buttonClick();
-
-										// after the click action, if the button becomes the "active" tab, or disabled,
-										// it should never have a hover class, so remove it now.
-										if (
-											button.hasClass(tm + '-state-active') ||
-											button.hasClass(tm + '-state-disabled')
-										) {
-											button.removeClass(tm + '-state-hover');
-										}
+								//
+								// 		Bootstrap hadles disabled buttons gracefully enough.
+								//
+								// 		// after the click action, if the button becomes the "active" tab, or disabled,
+								// 		// it should never have a hover class, so remove it now.
+								// 		if (
+								// 			button.hasClass(tm + '-state-active') ||
+								// 			button.hasClass(tm + '-state-disabled')
+								// 		) {
+								// 			button.removeClass(tm + '-state-hover');
+								// 		}
 									}
-								})
-								.mousedown(function() {
-									// the *down* effect (mouse pressed in).
-									// only on buttons that are not the "active" tab, or disabled
-									button
-										.not('.' + tm + '-state-active')
-										.not('.' + tm + '-state-disabled')
-										.addClass(tm + '-state-down');
-								})
-								.mouseup(function() {
-									// undo the *down* effect
-									button.removeClass(tm + '-state-down');
-								})
-								.hover(
-									function() {
-										// the *hover* effect.
-										// only on buttons that are not the "active" tab, or disabled
-										button
-											.not('.' + tm + '-state-active')
-											.not('.' + tm + '-state-disabled')
-											.addClass(tm + '-state-hover');
-									},
-									function() {
-										// undo the *hover* effect
-										button
-											.removeClass(tm + '-state-hover')
-											.removeClass(tm + '-state-down'); // if mouseleave happens before mouseup
-									}
-								);
+								});
+								//
+								// Bootstrap hadles the *down* effect gracefully enough.
+								//
+								// .mousedown(function() {
+								// 	// the *down* effect (mouse pressed in).
+								// 	// only on buttons that are not the "active" tab, or disabled
+								// 	button
+								// 		.not('.' + tm + '-state-active')
+								// 		.not('.' + tm + '-state-disabled')
+								// 		.addClass(tm + '-state-down');
+								// })
+								// .mouseup(function() {
+								// 	// undo the *down* effect
+								// 	button.removeClass(tm + '-state-down');
+								// })
+								//
+								// Bootstrap hadles the *hover* effect gracefully enough.
+								//
+								// .hover(
+								// 	function() {
+								// 		// the *hover* effect.
+								// 		// only on buttons that are not the "active" tab, or disabled
+								// 		button
+								// 			.not('.' + tm + '-state-active')
+								// 			.not('.' + tm + '-state-disabled')
+								// 			.addClass(tm + '-state-hover');
+								// 	},
+								// 	function() {
+								// 		// undo the *hover* effect
+								// 		button
+								// 			.removeClass(tm + '-state-hover')
+								// 			.removeClass(tm + '-state-down'); // if mouseleave happens before mouseup
+								// 	}
+								// );
 
 							groupChildren = groupChildren.add(button);
 						}
 					}
 				});
 
-				if (isOnlyButtons) {
-					groupChildren
-						.first().addClass(tm + '-corner-left').end()
-						.last().addClass(tm + '-corner-right').end();
-				}
+				// Using Bootstrap's btn-group, which handles automatically in CSS
+				//
+				// if (isOnlyButtons) {
+				// 	groupChildren
+				// 		.first().addClass(tm + '-corner-left').end()
+				// 		.last().addClass(tm + '-corner-right').end();
+				// }
 
 				if (groupChildren.length > 1) {
 					groupEl = $('<div/>');
 					if (isOnlyButtons) {
-						groupEl.addClass('fc-button-group');
+						// groupEl.addClass('fc-button-group');
+						groupEl.addClass('btn-group');
 					}
 					groupEl.append(groupChildren);
 					sectionEl.append(groupEl);
@@ -8812,36 +8831,50 @@ function Header(calendar, options) {
 
 		return sectionEl;
 	}
-	
-	
+
+
 	function updateTitle(text) {
 		el.find('h2').text(text);
 	}
-	
-	
+
+
 	function activateButton(buttonName) {
 		el.find('.fc-' + buttonName + '-button')
-			.addClass(tm + '-state-active');
+			// .addClass(tm + '-state-active');
+			.removeClass('btn-default')
+			.addClass('btn-primary');
 	}
-	
-	
+
+
 	function deactivateButton(buttonName) {
 		el.find('.fc-' + buttonName + '-button')
-			.removeClass(tm + '-state-active');
+			// .removeClass(tm + '-state-active');
+			.removeClass('btn-primary')
+			.addClass('btn-default');
 	}
-	
-	
+
+
 	function disableButton(buttonName) {
 		el.find('.fc-' + buttonName + '-button')
 			.attr('disabled', 'disabled')
-			.addClass(tm + '-state-disabled');
+			// .addClass(tm + '-state-disabled');
+			// Such a hack!
+			// Just because of the Slate bootswatch
+			.removeClass('btn-default')
+			.addClass('btn-primary');
+			// Hack over… for now!
 	}
-	
-	
+
+
 	function enableButton(buttonName) {
 		el.find('.fc-' + buttonName + '-button')
 			.removeAttr('disabled')
-			.removeClass(tm + '-state-disabled');
+			// .removeClass(tm + '-state-disabled');
+			// Such a hack!
+			// Just because of the Slate bootswatch
+			.removeClass('btn-primary')
+			.addClass('btn-default');
+			// Hack over…
 	}
 
 
@@ -8866,8 +8899,8 @@ var eventGUID = 1;
 
 function EventManager(options) { // assumed to be a calendar
 	var t = this;
-	
-	
+
+
 	// exports
 	t.isFetchNeeded = isFetchNeeded;
 	t.fetchEvents = fetchEvents;
@@ -8881,14 +8914,14 @@ function EventManager(options) { // assumed to be a calendar
 	t.normalizeEventRange = normalizeEventRange;
 	t.normalizeEventRangeTimes = normalizeEventRangeTimes;
 	t.ensureVisibleEventRange = ensureVisibleEventRange;
-	
-	
+
+
 	// imports
 	var trigger = t.trigger;
 	var getView = t.getView;
 	var reportEvents = t.reportEvents;
-	
-	
+
+
 	// locals
 	var stickySource = { events: [] };
 	var sources = [ stickySource ];
@@ -8908,21 +8941,21 @@ function EventManager(options) { // assumed to be a calendar
 			}
 		}
 	);
-	
-	
-	
+
+
+
 	/* Fetching
 	-----------------------------------------------------------------------------*/
-	
-	
+
+
 	function isFetchNeeded(start, end) {
 		return !rangeStart || // nothing has been fetched yet?
 			// or, a part of the new range is outside of the old range? (after normalizing)
 			start.clone().stripZone() < rangeStart.clone().stripZone() ||
 			end.clone().stripZone() > rangeEnd.clone().stripZone();
 	}
-	
-	
+
+
 	function fetchEvents(start, end) {
 		rangeStart = start;
 		rangeEnd = end;
@@ -8934,8 +8967,8 @@ function EventManager(options) { // assumed to be a calendar
 			fetchEventSource(sources[i], fetchID);
 		}
 	}
-	
-	
+
+
 	function fetchEventSource(source, fetchID) {
 		_fetchEventSource(source, function(eventInputs) {
 			var isArraySource = $.isArray(source.events);
@@ -8971,8 +9004,8 @@ function EventManager(options) { // assumed to be a calendar
 			}
 		});
 	}
-	
-	
+
+
 	function _fetchEventSource(source, callback) {
 		var i;
 		var fetchers = fc.sourceFetchers;
@@ -9081,12 +9114,12 @@ function EventManager(options) { // assumed to be a calendar
 			}
 		}
 	}
-	
-	
-	
+
+
+
 	/* Sources
 	-----------------------------------------------------------------------------*/
-	
+
 
 	function addEventSource(sourceInput) {
 		var source = buildEventSource(sourceInput);
@@ -9168,9 +9201,9 @@ function EventManager(options) { // assumed to be a calendar
 		) ||
 		source; // the given argument *is* the primitive
 	}
-	
-	
-	
+
+
+
 	/* Manipulation
 	-----------------------------------------------------------------------------*/
 
@@ -9212,7 +9245,7 @@ function EventManager(options) { // assumed to be a calendar
 		return !/^_|^(id|allDay|start|end)$/.test(name);
 	}
 
-	
+
 	// returns the expanded events that were created
 	function renderEvent(eventInput, stick) {
 		var abstractEvent = buildEventFromInput(eventInput);
@@ -9241,8 +9274,8 @@ function EventManager(options) { // assumed to be a calendar
 
 		return [];
 	}
-	
-	
+
+
 	function removeEvents(filter) {
 		var eventID;
 		var i;
@@ -9271,8 +9304,8 @@ function EventManager(options) { // assumed to be a calendar
 
 		reportEvents(cache);
 	}
-	
-	
+
+
 	function clientEvents(filter) {
 		if ($.isFunction(filter)) {
 			return $.grep(cache, filter);
@@ -9285,28 +9318,28 @@ function EventManager(options) { // assumed to be a calendar
 		}
 		return cache; // else, return all
 	}
-	
-	
-	
+
+
+
 	/* Loading State
 	-----------------------------------------------------------------------------*/
-	
-	
+
+
 	function pushLoading() {
 		if (!(loadingLevel++)) {
 			trigger('loading', null, true, getView());
 		}
 	}
-	
-	
+
+
 	function popLoading() {
 		if (!(--loadingLevel)) {
 			trigger('loading', null, false, getView());
 		}
 	}
-	
-	
-	
+
+
+
 	/* Event Normalization
 	-----------------------------------------------------------------------------*/
 
@@ -10786,4 +10819,4 @@ fcViews.agendaDay = {
 ;;
 
 return fc; // export for Node/CommonJS
-});
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fullcalendar-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.1.0
+  version: 2.3.1.1
 platform: ruby
 authors:
 - Marius Butuc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler