foundation-datetimepicker-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3941b14c28a26201d9b2681a552e35d3172d40d5
+  data.tar.gz: d941402997cdde5058c7c893deca40c9c72bbda1
+SHA512:
+  metadata.gz: 8ae29558c3798e8d9aa66deb0dc73a7e564df4789cf5d0a6df86bde5b0cda222883a9f05abed4c98f4fe81b87c5725526fcb2cee84f132db76709e95880ea372
+  data.tar.gz: c4cb9c8617aca85e6d5fe3a961dda5590b4d05fbbe71136f68a6430d913a62037fcc424a545b4f226db045a9eb21321a37fa0dd1e874db4f2b93ba06aeb34d61

data/README.md

@@ -19,6 +19,17 @@ Add the following line to your stylesheet file (`foundation_and_overrides.scss`)
 @import 'foundation-datetimepicker';
 ```
 
+##Quick instructions
+
+Call the datetimepicker via javascript:
+
+    $('.datetimepicker').fdatetimepicker()
+
+
+Call the datepicker via javascript:
+
+    $('.datepicker').fdatepicker()
+
 ## Usage
 
 See the excellent demo provided by plugin's author - [here](http://foundation-datepicker.peterbeno.com/example/example.html).

data/lib/foundation-datetimepicker-rails/version.rb

@@ -1,5 +1,5 @@
 module FoundationDatetimepicker
   module Rails
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/vendor/assets/javascripts/foundation-datetimepicker.js

@@ -1,12 +1,11 @@
 /* =========================================================
- * foundation-datepicker.js
- * Copyright 2013 Peter Beno, najlepsiwebdesigner@gmail.com, @benopeter
- * project website http://foundation-datepicker.peterbeno.com
- * 
- * original project:
- * 		Copyright 2012 Stefan Petre
- * 		Improvements by Andrew Rowls
- * 		Improvements by Sébastien Malot
+ * bootstrap-datetimepicker.js
+ * =========================================================
+ * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
+ * Improvements by Sébastien Malot
+ * Improvements by Yun Lai
+ * Project URL : http://www.malot.fr/bootstrap-datetimepicker
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,42 +20,58 @@
  * limitations under the License.
  * ========================================================= */
 
-!function( $ ) {
 
-	function UTCDate(){
+!function ($) {
+
+	function UTCDate() {
 		return new Date(Date.UTC.apply(Date, arguments));
 	}
-	function UTCToday(){
+
+	function UTCToday() {
 		var today = new Date();
-		return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate(), today.getUTCHours(), today.getUTCMinutes(), today.getUTCSeconds());
+		return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate(), today.getUTCHours(), today.getUTCMinutes(), today.getUTCSeconds(), 0);
 	}
 
 	// Picker object
 
-	var Datetimepicker = function(element, options) {
+	var Datetimepicker = function (element, options) {
 		var that = this;
 
 		this.element = $(element);
-		this.closeButton = options.closeButton;
+
 		this.language = options.language || this.element.data('date-language') || "en";
 		this.language = this.language in dates ? this.language : "en";
 		this.isRTL = dates[this.language].rtl || false;
-		this.format = DPGlobal.parseFormat(options.format || this.element.data('date-format') || 'yyyy-mm-dd hh:ii');
+		this.formatType = options.formatType || this.element.data('format-type') || 'standard';
+		this.format = DPGlobal.parseFormat(options.format || this.element.data('date-format') || dates[this.language].format || DPGlobal.getDefaultFormat(this.formatType, 'input'), this.formatType);
 		this.isInline = false;
+		this.isVisible = false;
 		this.isInput = this.element.is('input');
-		this.component = this.element.is('.date') ? this.element.find('.prefix').parent() : false;
-		this.componentReset = this.element.is('.date') ? this.element.find('.prefix').parent() : false;
+
+		this.bootcssVer = this.isInput ? (this.element.is('.form-control') ? 3 : 2) : ( this.bootcssVer = this.element.is('.input-group') ? 3 : 2 );
+
+		this.component = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar').parent() : this.element.find('.add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar').parent()) : false;
+		this.componentReset = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-remove').parent() : this.element.find('.add-on .icon-remove').parent()) : false;
 		this.hasInput = this.component && this.element.find('input').length;
 		if (this.component && this.component.length === 0) {
 			this.component = false;
 		}
 		this.linkField = options.linkField || this.element.data('link-field') || false;
-		this.linkFormat = DPGlobal.parseFormat(options.linkFormat || this.element.data('link-format') || 'yyyy-mm-dd hh:ii:ss');
+		this.linkFormat = DPGlobal.parseFormat(options.linkFormat || this.element.data('link-format') || DPGlobal.getDefaultFormat(this.formatType, 'link'), this.formatType);
 		this.minuteStep = options.minuteStep || this.element.data('minute-step') || 5;
 		this.pickerPosition = options.pickerPosition || this.element.data('picker-position') || 'bottom-right';
+		this.showMeridian = options.showMeridian || this.element.data('show-meridian') || false;
+		this.initialDate = options.initialDate || new Date();
 
 		this._attachEvents();
 
+		this.formatViewType = "datetime";
+		if ('formatViewType' in options) {
+			this.formatViewType = options.formatViewType;
+		} else if ('formatViewType' in this.element.data()) {
+			this.formatViewType = this.element.data('formatViewType');
+		}
+
 		this.minView = 0;
 		if ('minView' in options) {
 			this.minView = options.minView;
@@ -65,7 +80,7 @@
 		}
 		this.minView = DPGlobal.convertViewMode(this.minView);
 
-		this.maxView = DPGlobal.modes.length-1;
+		this.maxView = DPGlobal.modes.length - 1;
 		if ('maxView' in options) {
 			this.maxView = options.maxView;
 		} else if ('maxView' in this.element.data()) {
@@ -73,6 +88,28 @@
 		}
 		this.maxView = DPGlobal.convertViewMode(this.maxView);
 
+		this.wheelViewModeNavigation = false;
+		if ('wheelViewModeNavigation' in options) {
+			this.wheelViewModeNavigation = options.wheelViewModeNavigation;
+		} else if ('wheelViewModeNavigation' in this.element.data()) {
+			this.wheelViewModeNavigation = this.element.data('view-mode-wheel-navigation');
+		}
+
+		this.wheelViewModeNavigationInverseDirection = false;
+
+		if ('wheelViewModeNavigationInverseDirection' in options) {
+			this.wheelViewModeNavigationInverseDirection = options.wheelViewModeNavigationInverseDirection;
+		} else if ('wheelViewModeNavigationInverseDirection' in this.element.data()) {
+			this.wheelViewModeNavigationInverseDirection = this.element.data('view-mode-wheel-navigation-inverse-dir');
+		}
+
+		this.wheelViewModeNavigationDelay = 100;
+		if ('wheelViewModeNavigationDelay' in options) {
+			this.wheelViewModeNavigationDelay = options.wheelViewModeNavigationDelay;
+		} else if ('wheelViewModeNavigationDelay' in this.element.data()) {
+			this.wheelViewModeNavigationDelay = this.element.data('view-mode-wheel-navigation-delay');
+		}
+
 		this.startViewMode = 2;
 		if ('startView' in options) {
 			this.startViewMode = options.startView;
@@ -82,6 +119,14 @@
 		this.startViewMode = DPGlobal.convertViewMode(this.startViewMode);
 		this.viewMode = this.startViewMode;
 
+		this.viewSelect = this.minView;
+		if ('viewSelect' in options) {
+			this.viewSelect = options.viewSelect;
+		} else if ('viewSelect' in this.element.data()) {
+			this.viewSelect = this.element.data('view-select');
+		}
+		this.viewSelect = DPGlobal.convertViewMode(this.viewSelect);
+
 		this.forceParse = true;
 		if ('forceParse' in options) {
 			this.forceParse = options.forceParse;
@@ -89,30 +134,37 @@
 			this.forceParse = this.element.data('date-force-parse');
 		}
 
-		this.picker = $(DPGlobal.template)
-							.appendTo(this.isInline ? this.element : 'body')
-							.on({
-								click: $.proxy(this.click, this),
-								mousedown: $.proxy(this.mousedown, this)
-							});
-		if (this.closeButton){
-			this.picker.find('a.datetimepicker-close').show();
+		this.picker = $((this.bootcssVer == 3) ? DPGlobal.templateV3 : DPGlobal.template)
+			.appendTo(this.isInline ? this.element : 'body')
+			.on({
+				click:     $.proxy(this.click, this),
+				mousedown: $.proxy(this.mousedown, this)
+			});
+
+		if (this.wheelViewModeNavigation) {
+			if ($.fn.mousewheel) {
+				this.picker.on({mousewheel: $.proxy(this.mousewheel, this)});
+			} else {
+				console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option");
+			}
 		}
-		
+
 		if (this.isInline) {
 			this.picker.addClass('datetimepicker-inline');
-			
 		} else {
-			if (this.component && this.pickerPosition == 'bottom-left') {
-				this.picker.addClass('datetimepicker-dropdown-left dropdown-menu');
-			} else {
-				this.picker.addClass('datetimepicker-dropdown dropdown-menu');
-			}
+			this.picker.addClass('datetimepicker-dropdown-' + this.pickerPosition + ' dropdown-menu');
 		}
-		if (this.isRTL){
+		if (this.isRTL) {
 			this.picker.addClass('datetimepicker-rtl');
-			this.picker.find('.prev i, .next i')
-						.toggleClass('icon-chevron-left icon-chevron-right');
+			if (this.bootcssVer == 3) {
+				this.picker.find('.prev span, .next span')
+					.toggleClass('glyphicon-arrow-left glyphicon-arrow-right');
+			} else {
+				this.picker.find('.prev i, .next i')
+					.toggleClass('icon-arrow-left icon-arrow-right');
+			}
+			;
+
 		}
 		$(document).on('mousedown', function (e) {
 			// Clicked outside the datetimepicker, hide it
@@ -121,7 +173,7 @@
 			}
 		});
 
-		this.autoclose = true;
+		this.autoclose = false;
 		if ('autoclose' in options) {
 			this.autoclose = options.autoclose;
 		} else if ('dateAutoclose' in this.element.data()) {
@@ -151,32 +203,32 @@
 		this.update();
 		this.showMode();
 
-		if(this.isInline) {
-			this.picker.show();
+		if (this.isInline) {
+			this.show();
 		}
 	};
 
 	Datetimepicker.prototype = {
 		constructor: Datetimepicker,
 
-		_events: [],
-		_attachEvents: function(){
+		_events:       [],
+		_attachEvents: function () {
 			this._detachEvents();
 			if (this.isInput) { // single input
 				this._events = [
 					[this.element, {
-						focus: $.proxy(this.show, this),
-						keyup: $.proxy(this.update, this),
+						focus:   $.proxy(this.show, this),
+						keyup:   $.proxy(this.update, this),
 						keydown: $.proxy(this.keydown, this)
 					}]
 				];
 			}
-			else if (this.component && this.hasInput){ // component: input + button
+			else if (this.component && this.hasInput) { // component: input + button
 				this._events = [
 					// For components that are not readonly, allow keyboard nav
 					[this.element.find('input'), {
-						focus: $.proxy(this.show, this),
-						keyup: $.proxy(this.update, this),
+						focus:   $.proxy(this.show, this),
+						keyup:   $.proxy(this.update, this),
 						keydown: $.proxy(this.keydown, this)
 					}],
 					[this.component, {
@@ -200,15 +252,15 @@
 					}]
 				];
 			}
-			for (var i=0, el, ev; i<this._events.length; i++){
+			for (var i = 0, el, ev; i < this._events.length; i++) {
 				el = this._events[i][0];
 				ev = this._events[i][1];
 				el.on(ev);
 			}
 		},
-		
-		_detachEvents: function(){
-			for (var i=0, el, ev; i<this._events.length; i++){
+
+		_detachEvents: function () {
+			for (var i = 0, el, ev; i < this._events.length; i++) {
 				el = this._events[i][0];
 				ev = this._events[i][1];
 				el.off(ev);
@@ -216,7 +268,7 @@
 			this._events = [];
 		},
 
-		show: function(e) {
+		show: function (e) {
 			this.picker.show();
 			this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
 			if (this.forceParse) {
@@ -228,14 +280,16 @@
 				e.stopPropagation();
 				e.preventDefault();
 			}
+			this.isVisible = true;
 			this.element.trigger({
 				type: 'show',
 				date: this.date
 			});
 		},
 
-		hide: function(e){
-			if(this.isInline) return;
+		hide: function (e) {
+			if (!this.isVisible) return;
+			if (this.isInline) return;
 			this.picker.hide();
 			$(window).off('resize', this.place);
 			this.viewMode = this.startViewMode;
@@ -246,38 +300,40 @@
 
 			if (
 				this.forceParse &&
-				(
-					this.isInput && this.element.val()  || 
-					this.hasInput && this.element.find('input').val()
+					(
+						this.isInput && this.element.val() ||
+							this.hasInput && this.element.find('input').val()
+						)
 				)
-			)
 				this.setValue();
+			this.isVisible = false;
 			this.element.trigger({
 				type: 'hide',
 				date: this.date
 			});
 		},
 
-		remove: function() {
+		remove: function () {
 			this._detachEvents();
 			this.picker.remove();
+			delete this.picker;
 			delete this.element.data().datetimepicker;
 		},
 
-		getDate: function() {
+		getDate: function () {
 			var d = this.getUTCDate();
-			return new Date(d.getTime() + (d.getTimezoneOffset()*60000));
+			return new Date(d.getTime() + (d.getTimezoneOffset() * 60000));
 		},
 
-		getUTCDate: function() {
+		getUTCDate: function () {
 			return this.date;
 		},
 
-		setDate: function(d) {
-			this.setUTCDate(new Date(d.getTime() - (d.getTimezoneOffset()*60000)));
+		setDate: function (d) {
+			this.setUTCDate(new Date(d.getTime() - (d.getTimezoneOffset() * 60000)));
 		},
 
-		setUTCDate: function(d) {
+		setUTCDate: function (d) {
 			if (d >= this.startDate && d <= this.endDate) {
 				this.date = d;
 				this.setValue();
@@ -285,53 +341,66 @@
 				this.fill();
 			} else {
 				this.element.trigger({
-					type: 'outOfRange',
-					date: d,
+					type:      'outOfRange',
+					date:      d,
 					startDate: this.startDate,
-					endDate: this.endDate
+					endDate:   this.endDate
 				});
 			}
 		},
 
-		setValue: function() {
+		setFormat: function (format) {
+			this.format = DPGlobal.parseFormat(format, this.formatType);
+			var element;
+			if (this.isInput) {
+				element = this.element;
+			} else if (this.component) {
+				element = this.element.find('input');
+			}
+			if (element && element.val()) {
+				this.setValue();
+			}
+		},
+
+		setValue: function () {
 			var formatted = this.getFormattedDate();
 			if (!this.isInput) {
-				if (this.component){
-					this.element.find('input').prop('value', formatted);
+				if (this.component) {
+					this.element.find('input').val(formatted);
 				}
 				this.element.data('date', formatted);
 			} else {
-				this.element.prop('value', formatted);
+				this.element.val(formatted);
 			}
 			if (this.linkField) {
 				$('#' + this.linkField).val(this.getFormattedDate(this.linkFormat));
 			}
 		},
 
-		getFormattedDate: function(format) {
-			if(format == undefined) format = this.format;
-			return DPGlobal.formatDate(this.date, format, this.language);
+		getFormattedDate: function (format) {
+			if (format == undefined) format = this.format;
+			return DPGlobal.formatDate(this.date, format, this.language, this.formatType);
 		},
 
-		setStartDate: function(startDate){
+		setStartDate: function (startDate) {
 			this.startDate = startDate || -Infinity;
 			if (this.startDate !== -Infinity) {
-				this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language);
+				this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language, this.formatType);
 			}
 			this.update();
 			this.updateNavArrows();
 		},
 
-		setEndDate: function(endDate){
+		setEndDate: function (endDate) {
 			this.endDate = endDate || Infinity;
 			if (this.endDate !== Infinity) {
-				this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language);
+				this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language, this.formatType);
 			}
 			this.update();
 			this.updateNavArrows();
 		},
 
-		setDaysOfWeekDisabled: function(daysOfWeekDisabled){
+		setDaysOfWeekDisabled: function (daysOfWeekDisabled) {
 			this.daysOfWeekDisabled = daysOfWeekDisabled || [];
 			if (!$.isArray(this.daysOfWeekDisabled)) {
 				this.daysOfWeekDisabled = this.daysOfWeekDisabled.split(/,\s*/);
@@ -343,41 +412,61 @@
 			this.updateNavArrows();
 		},
 
-		place: function(){
-			if(this.isInline) return;
-			var zIndex = parseInt(this.element.parents().filter(function() {
-							return $(this).css('z-index') != 'auto';
-						}).first().css('z-index'))+10;
-			var offset, left;
+		place: function () {
+			if (this.isInline) return;
+
+			var index_highest = 0;
+			$('div').each(function () {
+				var index_current = parseInt($(this).css("zIndex"), 10);
+				if (index_current > index_highest) {
+					index_highest = index_current;
+				}
+			});
+			var zIndex = index_highest + 10;
+
+			var offset, top, left;
 			if (this.component) {
 				offset = this.component.offset();
 				left = offset.left;
-				if (this.pickerPosition == 'bottom-left') {
+				if (this.pickerPosition == 'bottom-left' || this.pickerPosition == 'top-left') {
 					left += this.component.outerWidth() - this.picker.outerWidth();
 				}
 			} else {
 				offset = this.element.offset();
 				left = offset.left;
 			}
+			if (this.pickerPosition == 'top-left' || this.pickerPosition == 'top-right') {
+				top = offset.top - this.picker.outerHeight();
+			} else {
+				top = offset.top + this.height;
+			}
 			this.picker.css({
-				top: offset.top + this.height,
-				left: left,
+				top:    top,
+				left:   left,
 				zIndex: zIndex
 			});
 		},
 
-		update: function(){
+		update: function () {
 			var date, fromArgs = false;
-			if(arguments && arguments.length && (typeof arguments[0] === 'string' || arguments[0] instanceof Date)) {
+			if (arguments && arguments.length && (typeof arguments[0] === 'string' || arguments[0] instanceof Date)) {
 				date = arguments[0];
 				fromArgs = true;
 			} else {
-				date = this.isInput ? this.element.prop('value') : this.element.data('date') || this.element.find('input').prop('value');
+				date = this.element.data('date') || (this.isInput ? this.element.val() : this.element.find('input').val()) || this.initialDate;
+				if (typeof date == 'string' || date instanceof String) {
+				  date = date.replace(/^\s+|\s+$/g,'');
+				}
+			}
+
+			if (!date) {
+				date = new Date();
+				fromArgs = false;
 			}
-			
-			this.date = DPGlobal.parseDate(date, this.format, this.language);
 
-			if(fromArgs) this.setValue();
+			this.date = DPGlobal.parseDate(date, this.format, this.language, this.formatType);
+
+			if (fromArgs) this.setValue();
 
 			if (this.date < this.startDate) {
 				this.viewDate = new Date(this.startDate);
@@ -389,30 +478,29 @@
 			this.fill();
 		},
 
-		fillDow: function(){
+		fillDow: function () {
 			var dowCnt = this.weekStart,
-			html = '<tr>';
+				html = '<tr>';
 			while (dowCnt < this.weekStart + 7) {
-				html += '<th class="dow">'+dates[this.language].daysMin[(dowCnt++)%7]+'</th>';
+				html += '<th class="dow">' + dates[this.language].daysMin[(dowCnt++) % 7] + '</th>';
 			}
 			html += '</tr>';
 			this.picker.find('.datetimepicker-days thead').append(html);
 		},
 
-		fillMonths: function(){
+		fillMonths: function () {
 			var html = '',
-			i = 0;
+				i = 0;
 			while (i < 12) {
-				html += '<span class="month">'+dates[this.language].monthsShort[i++]+'</span>';
+				html += '<span class="month">' + dates[this.language].monthsShort[i++] + '</span>';
 			}
 			this.picker.find('.datetimepicker-months td').html(html);
 		},
 
-		fill: function() {
+		fill: function () {
 			if (this.date == null || this.viewDate == null) {
 				return;
 			}
-			
 			var d = new Date(this.viewDate),
 				year = d.getUTCFullYear(),
 				month = d.getUTCMonth(),
@@ -426,24 +514,39 @@
 				currentDate = (new UTCDate(this.date.getUTCFullYear(), this.date.getUTCMonth(), this.date.getUTCDate())).valueOf(),
 				today = new Date();
 			this.picker.find('.datetimepicker-days thead th:eq(1)')
-						.text(dates[this.language].months[month]+' '+year);
-			this.picker.find('.datetimepicker-hours thead th:eq(1)')
-						.text(dayMonth+' '+dates[this.language].months[month]+' '+year);
-			this.picker.find('.datetimepicker-minutes thead th:eq(1)')
-						.text(dayMonth+' '+dates[this.language].months[month]+' '+year);
+				.text(dates[this.language].months[month] + ' ' + year);
+			if (this.formatViewType == "time") {
+				var hourConverted = hours % 12 ? hours % 12 : 12;
+				var hoursDisplay = (hourConverted < 10 ? '0' : '') + hourConverted;
+				var minutesDisplay = (minutes < 10 ? '0' : '') + minutes;
+				var meridianDisplay = dates[this.language].meridiem[hours < 12 ? 0 : 1];
+				this.picker.find('.datetimepicker-hours thead th:eq(1)')
+					.text(hoursDisplay + ':' + minutesDisplay + ' ' + meridianDisplay.toUpperCase());
+				this.picker.find('.datetimepicker-minutes thead th:eq(1)')
+					.text(hoursDisplay + ':' + minutesDisplay + ' ' + meridianDisplay.toUpperCase());
+			} else {
+				this.picker.find('.datetimepicker-hours thead th:eq(1)')
+					.text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year);
+				this.picker.find('.datetimepicker-minutes thead th:eq(1)')
+					.text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year);
+			}
 			this.picker.find('tfoot th.today')
-						.text(dates[this.language].today)
-						.toggle(this.todayBtn !== false);
+				.text(dates[this.language].today)
+				.toggle(this.todayBtn !== false);
 			this.updateNavArrows();
 			this.fillMonths();
-			var prevMonth = UTCDate(year, month, 0,0,0,0,0);
-			prevMonth.setUTCDate(prevMonth.getDate() - (prevMonth.getUTCDay() - this.weekStart + 7)%7);
+			/*var prevMonth = UTCDate(year, month, 0,0,0,0,0);
+			 prevMonth.setUTCDate(prevMonth.getDate() - (prevMonth.getUTCDay() - this.weekStart + 7)%7);*/
+			var prevMonth = UTCDate(year, month - 1, 28, 0, 0, 0, 0),
+				day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth());
+			prevMonth.setUTCDate(day);
+			prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.weekStart + 7) % 7);
 			var nextMonth = new Date(prevMonth);
 			nextMonth.setUTCDate(nextMonth.getUTCDate() + 42);
 			nextMonth = nextMonth.valueOf();
 			var html = [];
 			var clsName;
-			while(prevMonth.valueOf() < nextMonth) {
+			while (prevMonth.valueOf() < nextMonth) {
 				if (prevMonth.getUTCDay() == this.weekStart) {
 					html.push('<tr>');
 				}
@@ -463,51 +566,89 @@
 				if (prevMonth.valueOf() == currentDate) {
 					clsName += ' active';
 				}
-				if ((prevMonth.valueOf() + 86400000) < this.startDate || prevMonth.valueOf() > this.endDate ||
+				if ((prevMonth.valueOf() + 86400000) <= this.startDate || prevMonth.valueOf() > this.endDate ||
 					$.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1) {
 					clsName += ' disabled';
 				}
-				html.push('<td class="day'+clsName+'">'+prevMonth.getUTCDate() + '</td>');
+				html.push('<td class="day' + clsName + '">' + prevMonth.getUTCDate() + '</td>');
 				if (prevMonth.getUTCDay() == this.weekEnd) {
 					html.push('</tr>');
 				}
-				prevMonth.setUTCDate(prevMonth.getUTCDate()+1);
+				prevMonth.setUTCDate(prevMonth.getUTCDate() + 1);
 			}
 			this.picker.find('.datetimepicker-days tbody').empty().append(html.join(''));
 
 			html = [];
-			for (var i=0;i<24;i++) {
+			var txt = '', meridian = '', meridianOld = '';
+			for (var i = 0; i < 24; i++) {
 				var actual = UTCDate(year, month, dayMonth, i);
 				clsName = '';
 				// We want the previous hour for the startDate
-				if ((actual.valueOf() + 3600000) < this.startDate || actual.valueOf() > this.endDate) {
+				if ((actual.valueOf() + 3600000) <= this.startDate || actual.valueOf() > this.endDate) {
 					clsName += ' disabled';
 				} else if (hours == i) {
 					clsName += ' active';
 				}
-				html.push('<span class="hour'+clsName+'">'+i+':00</span>');
+				if (this.showMeridian && dates[this.language].meridiem.length == 2) {
+					meridian = (i < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]);
+					if (meridian != meridianOld) {
+						if (meridianOld != '') {
+							html.push('</fieldset>');
+						}
+						html.push('<fieldset class="hour"><legend>' + meridian.toUpperCase() + '</legend>');
+					}
+					meridianOld = meridian;
+					txt = (i % 12 ? i % 12 : 12);
+					html.push('<span class="hour' + clsName + ' hour_' + (i < 12 ? 'am' : 'pm') + '">' + txt + '</span>');
+					if (i == 23) {
+						html.push('</fieldset>');
+					}
+				} else {
+					txt = i + ':00';
+					html.push('<span class="hour' + clsName + '">' + txt + '</span>');
+				}
 			}
 			this.picker.find('.datetimepicker-hours td').html(html.join(''));
 
 			html = [];
-			for(var i=0;i<60;i+=this.minuteStep) {
-				var actual = UTCDate(year, month, dayMonth, hours, i);
+			txt = '', meridian = '', meridianOld = '';
+			for (var i = 0; i < 60; i += this.minuteStep) {
+				var actual = UTCDate(year, month, dayMonth, hours, i, 0);
 				clsName = '';
 				if (actual.valueOf() < this.startDate || actual.valueOf() > this.endDate) {
 					clsName += ' disabled';
-				} else if (Math.floor(minutes/this.minuteStep) == Math.floor(i/this.minuteStep)) {
+				} else if (Math.floor(minutes / this.minuteStep) == Math.floor(i / this.minuteStep)) {
 					clsName += ' active';
 				}
-				html.push('<span class="minute'+clsName+'">'+hours+':'+(i<10?'0'+i:i)+'</span>');
+				if (this.showMeridian && dates[this.language].meridiem.length == 2) {
+					meridian = (hours < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]);
+					if (meridian != meridianOld) {
+						if (meridianOld != '') {
+							html.push('</fieldset>');
+						}
+						html.push('<fieldset class="minute"><legend>' + meridian.toUpperCase() + '</legend>');
+					}
+					meridianOld = meridian;
+					txt = (hours % 12 ? hours % 12 : 12);
+					//html.push('<span class="minute'+clsName+' minute_'+(hours<12?'am':'pm')+'">'+txt+'</span>');
+					html.push('<span class="minute' + clsName + '">' + txt + ':' + (i < 10 ? '0' + i : i) + '</span>');
+					if (i == 59) {
+						html.push('</fieldset>');
+					}
+				} else {
+					txt = i + ':00';
+					//html.push('<span class="hour'+clsName+'">'+txt+'</span>');
+					html.push('<span class="minute' + clsName + '">' + hours + ':' + (i < 10 ? '0' + i : i) + '</span>');
+				}
 			}
 			this.picker.find('.datetimepicker-minutes td').html(html.join(''));
 
 			var currentYear = this.date.getUTCFullYear();
 			var months = this.picker.find('.datetimepicker-months')
-						.find('th:eq(1)')
-						.text(year)
-						.end()
-						.find('span').removeClass('active');
+				.find('th:eq(1)')
+				.text(year)
+				.end()
+				.find('span').removeClass('active');
 			if (currentYear == year) {
 				months.eq(this.date.getUTCMonth()).addClass('active');
 			}
@@ -518,25 +659,26 @@
 				months.slice(0, startMonth).addClass('disabled');
 			}
 			if (year == endYear) {
-				months.slice(endMonth+1).addClass('disabled');
+				months.slice(endMonth + 1).addClass('disabled');
 			}
 
 			html = '';
-			year = parseInt(year/10, 10) * 10;
+			year = parseInt(year / 10, 10) * 10;
 			var yearCont = this.picker.find('.datetimepicker-years')
-								.find('th:eq(1)')
-								.text(year + '-' + (year + 9))
-								.end()
-								.find('td');
+				.find('th:eq(1)')
+				.text(year + '-' + (year + 9))
+				.end()
+				.find('td');
 			year -= 1;
 			for (var i = -1; i < 11; i++) {
-				html += '<span class="year'+(i == -1 || i == 10 ? ' old' : '')+(currentYear == year ? ' active' : '')+(year < startYear || year > endYear ? ' disabled' : '')+'">'+year+'</span>';
+				html += '<span class="year' + (i == -1 || i == 10 ? ' old' : '') + (currentYear == year ? ' active' : '') + (year < startYear || year > endYear ? ' disabled' : '') + '">' + year + '</span>';
 				year += 1;
 			}
 			yearCont.html(html);
+			this.place();
 		},
 
-		updateNavArrows: function() {
+		updateNavArrows: function () {
 			var d = new Date(this.viewDate),
 				year = d.getUTCFullYear(),
 				month = d.getUTCMonth(),
@@ -544,48 +686,48 @@
 				hour = d.getUTCHours();
 			switch (this.viewMode) {
 				case 0:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() 
-													 && month <= this.startDate.getUTCMonth()
-													 && day <= this.startDate.getUTCDate()
-													 && hour <= this.startDate.getUTCHours()) {
+					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
+						&& month <= this.startDate.getUTCMonth()
+						&& day <= this.startDate.getUTCDate()
+						&& hour <= this.startDate.getUTCHours()) {
 						this.picker.find('.prev').css({visibility: 'hidden'});
 					} else {
 						this.picker.find('.prev').css({visibility: 'visible'});
 					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() 
-												  && month >= this.endDate.getUTCMonth()
-												  && day >= this.endDate.getUTCDate()
-												  && hour >= this.endDate.getUTCHours()) {
+					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
+						&& month >= this.endDate.getUTCMonth()
+						&& day >= this.endDate.getUTCDate()
+						&& hour >= this.endDate.getUTCHours()) {
 						this.picker.find('.next').css({visibility: 'hidden'});
 					} else {
 						this.picker.find('.next').css({visibility: 'visible'});
 					}
 					break;
 				case 1:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() 
-													 && month <= this.startDate.getUTCMonth()
-													 && day <= this.startDate.getUTCDate()) {
+					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
+						&& month <= this.startDate.getUTCMonth()
+						&& day <= this.startDate.getUTCDate()) {
 						this.picker.find('.prev').css({visibility: 'hidden'});
 					} else {
 						this.picker.find('.prev').css({visibility: 'visible'});
 					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() 
-												  && month >= this.endDate.getUTCMonth()
-												  && day >= this.endDate.getUTCDate()) {
+					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
+						&& month >= this.endDate.getUTCMonth()
+						&& day >= this.endDate.getUTCDate()) {
 						this.picker.find('.next').css({visibility: 'hidden'});
 					} else {
 						this.picker.find('.next').css({visibility: 'visible'});
 					}
 					break;
 				case 2:
-					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() 
-													 && month <= this.startDate.getUTCMonth()) {
+					if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()
+						&& month <= this.startDate.getUTCMonth()) {
 						this.picker.find('.prev').css({visibility: 'hidden'});
 					} else {
 						this.picker.find('.prev').css({visibility: 'visible'});
 					}
-					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() 
-												  && month >= this.endDate.getUTCMonth()) {
+					if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()
+						&& month >= this.endDate.getUTCMonth()) {
 						this.picker.find('.next').css({visibility: 'hidden'});
 					} else {
 						this.picker.find('.next').css({visibility: 'visible'});
@@ -607,35 +749,61 @@
 			}
 		},
 
-		click: function(e) {
-			e.stopPropagation();
+		mousewheel: function (e) {
+
 			e.preventDefault();
-			
-			if ($(e.target).hasClass('datetimepicker-close')){
-				this.hide();
+			e.stopPropagation();
+
+			if (this.wheelPause) {
+				return;
+			}
+
+			this.wheelPause = true;
+
+			var originalEvent = e.originalEvent;
+
+			var delta = originalEvent.wheelDelta;
+
+			var mode = delta > 0 ? 1 : (delta === 0) ? 0 : -1;
+
+			if (this.wheelViewModeNavigationInverseDirection) {
+				mode = -mode;
 			}
-			
-			var target = $(e.target).closest('span, td, th');
+
+			this.showMode(mode);
+
+			setTimeout($.proxy(function () {
+
+				this.wheelPause = false
+
+			}, this), this.wheelViewModeNavigationDelay);
+
+		},
+
+		click: function (e) {
+			e.stopPropagation();
+			e.preventDefault();
+			var target = $(e.target).closest('span, td, th, legend');
 			if (target.length == 1) {
 				if (target.is('.disabled')) {
 					this.element.trigger({
-						type: 'outOfRange',
-						date: this.viewDate,
+						type:      'outOfRange',
+						date:      this.viewDate,
 						startDate: this.startDate,
-						endDate: this.endDate
+						endDate:   this.endDate
 					});
 					return;
 				}
-				switch(target[0].nodeName.toLowerCase()) {
+				switch (target[0].nodeName.toLowerCase()) {
 					case 'th':
-						switch(target[0].className) {
+						switch (target[0].className) {
 							case 'switch':
 								this.showMode(1);
 								break;
 							case 'prev':
 							case 'next':
 								var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1);
-								switch(this.viewMode){
+								switch (this.viewMode) {
 									case 0:
 										this.viewDate = this.moveHour(this.viewDate, dir);
 										break;
@@ -654,48 +822,81 @@
 								break;
 							case 'today':
 								var date = new Date();
-								date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
+								date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0);
+
+								// Respect startDate and endDate.
+								if (date < this.startDate) date = this.startDate;
+								else if (date > this.endDate) date = this.endDate;
 
 								this.viewMode = this.startViewMode;
 								this.showMode(0);
 								this._setDate(date);
+								this.fill();
+								if (this.autoclose) {
+									this.hide();
+								}
 								break;
 						}
 						break;
 					case 'span':
 						if (!target.is('.disabled')) {
+							var year = this.viewDate.getUTCFullYear(),
+								month = this.viewDate.getUTCMonth(),
+								day = this.viewDate.getUTCDate(),
+								hours = this.viewDate.getUTCHours(),
+								minutes = this.viewDate.getUTCMinutes(),
+								seconds = this.viewDate.getUTCSeconds();
+
 							if (target.is('.month')) {
 								this.viewDate.setUTCDate(1);
-								var month = target.parent().find('span').index(target);
+								month = target.parent().find('span').index(target);
+								day = this.viewDate.getUTCDate();
 								this.viewDate.setUTCMonth(month);
 								this.element.trigger({
 									type: 'changeMonth',
 									date: this.viewDate
 								});
+								if (this.viewSelect >= 3) {
+									this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
+								}
 							} else if (target.is('.year')) {
 								this.viewDate.setUTCDate(1);
-								var year = parseInt(target.text(), 10) || 0;
+								year = parseInt(target.text(), 10) || 0;
 								this.viewDate.setUTCFullYear(year);
 								this.element.trigger({
 									type: 'changeYear',
 									date: this.viewDate
 								});
-							} else if (target.is('.hour')){
-								var hours = parseInt(target.text(), 10) || 0;
-								var year = this.viewDate.getUTCFullYear(),
-									month = this.viewDate.getUTCMonth(),
-									day = this.viewDate.getUTCDate(),
-									minutes = this.viewDate.getUTCMinutes(),
-									seconds = this.viewDate.getUTCSeconds();
-								this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
-							} else if (target.is('.minute')){
-								var minutes = parseInt(target.text().substr(target.text().indexOf(':')+1), 10) || 0;
-								var year = this.viewDate.getUTCFullYear(),
-									month = this.viewDate.getUTCMonth(),
-									day = this.viewDate.getUTCDate(),
-									hours = this.viewDate.getUTCHours(),
-									seconds = this.viewDate.getUTCSeconds();
-								this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
+								if (this.viewSelect >= 4) {
+									this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
+								}
+							} else if (target.is('.hour')) {
+								hours = parseInt(target.text(), 10) || 0;
+								if (target.hasClass('hour_am') || target.hasClass('hour_pm')) {
+									if (hours == 12 && target.hasClass('hour_am')) {
+										hours = 0;
+									} else if (hours != 12 && target.hasClass('hour_pm')) {
+										hours += 12;
+									}
+								}
+								this.viewDate.setUTCHours(hours);
+								this.element.trigger({
+									type: 'changeHour',
+									date: this.viewDate
+								});
+								if (this.viewSelect >= 1) {
+									this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
+								}
+							} else if (target.is('.minute')) {
+								minutes = parseInt(target.text().substr(target.text().indexOf(':') + 1), 10) || 0;
+								this.viewDate.setUTCMinutes(minutes);
+								this.element.trigger({
+									type: 'changeMinute',
+									date: this.viewDate
+								});
+								if (this.viewSelect >= 0) {
+									this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
+								}
 							}
 							if (this.viewMode != 0) {
 								var oldViewMode = this.viewMode;
@@ -713,7 +914,7 @@
 						}
 						break;
 					case 'td':
-						if (target.is('.day') && !target.is('.disabled')){
+						if (target.is('.day') && !target.is('.disabled')) {
 							var day = parseInt(target.text(), 10) || 1;
 							var year = this.viewDate.getUTCFullYear(),
 								month = this.viewDate.getUTCMonth(),
@@ -735,7 +936,15 @@
 									month += 1;
 								}
 							}
-							this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
+							this.viewDate.setUTCFullYear(year);
+							this.viewDate.setUTCMonth(month, day);
+							this.element.trigger({
+								type: 'changeDay',
+								date: this.viewDate
+							});
+							if (this.viewSelect >= 2) {
+								this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0));
+							}
 						}
 						var oldViewMode = this.viewMode;
 						this.showMode(-1);
@@ -748,21 +957,17 @@
 			}
 		},
 
-		_setDate: function(date, which){
+		_setDate: function (date, which) {
 			if (!which || which == 'date')
 				this.date = date;
-			if (!which || which  == 'view')
+			if (!which || which == 'view')
 				this.viewDate = date;
 			this.fill();
-			this.element.trigger({
-				type: 'changeDate',
-				date: this.date
-			});
 			this.setValue();
 			var element;
 			if (this.isInput) {
 				element = this.element;
-			} else if (this.component){
+			} else if (this.component) {
 				element = this.element.find('input');
 			}
 			if (element) {
@@ -771,25 +976,37 @@
 					//this.hide();
 				}
 			}
+			this.element.trigger({
+				type: 'changeDate',
+				date: this.date
+			});
 		},
 
-		moveHour: function(date, dir){
+		moveMinute: function (date, dir) {
 			if (!dir) return date;
 			var new_date = new Date(date.valueOf());
-			dir = dir > 0 ? 1 : -1;
+			//dir = dir > 0 ? 1 : -1;
+			new_date.setUTCMinutes(new_date.getUTCMinutes() + (dir * this.minuteStep));
+			return new_date;
+		},
+
+		moveHour: function (date, dir) {
+			if (!dir) return date;
+			var new_date = new Date(date.valueOf());
+			//dir = dir > 0 ? 1 : -1;
 			new_date.setUTCHours(new_date.getUTCHours() + dir);
 			return new_date;
 		},
 
-		moveDate: function(date, dir){
+		moveDate: function (date, dir) {
 			if (!dir) return date;
 			var new_date = new Date(date.valueOf());
-			dir = dir > 0 ? 1 : -1;
+			//dir = dir > 0 ? 1 : -1;
 			new_date.setUTCDate(new_date.getUTCDate() + dir);
 			return new_date;
 		},
 
-		moveMonth: function(date, dir){
+		moveMonth: function (date, dir) {
 			if (!dir) return date;
 			var new_date = new Date(date.valueOf()),
 				day = new_date.getUTCDate(),
@@ -797,14 +1014,18 @@
 				mag = Math.abs(dir),
 				new_month, test;
 			dir = dir > 0 ? 1 : -1;
-			if (mag == 1){
+			if (mag == 1) {
 				test = dir == -1
 					// If going back one month, make sure month is not current month
 					// (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
-					? function(){ return new_date.getUTCMonth() == month; }
+					? function () {
+					return new_date.getUTCMonth() == month;
+				}
 					// If going forward one month, make sure month is as expected
 					// (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
-					: function(){ return new_date.getUTCMonth() != new_month; };
+					: function () {
+					return new_date.getUTCMonth() != new_month;
+				};
 				new_month = month + dir;
 				new_date.setUTCMonth(new_month);
 				// Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
@@ -812,33 +1033,35 @@
 					new_month = (new_month + 12) % 12;
 			} else {
 				// For magnitudes >1, move one month at a time...
-				for (var i=0; i<mag; i++)
+				for (var i = 0; i < mag; i++)
 					// ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
 					new_date = this.moveMonth(new_date, dir);
 				// ...then reset the day, keeping it in the new month
 				new_month = new_date.getUTCMonth();
 				new_date.setUTCDate(day);
-				test = function(){ return new_month != new_date.getUTCMonth(); };
+				test = function () {
+					return new_month != new_date.getUTCMonth();
+				};
 			}
 			// Common date-resetting loop -- if date is beyond end of month, make it
 			// end of month
-			while (test()){
+			while (test()) {
 				new_date.setUTCDate(--day);
 				new_date.setUTCMonth(new_month);
 			}
 			return new_date;
 		},
 
-		moveYear: function(date, dir){
-			return this.moveMonth(date, dir*12);
+		moveYear: function (date, dir) {
+			return this.moveMonth(date, dir * 12);
 		},
 
-		dateWithinRange: function(date){
+		dateWithinRange: function (date) {
 			return date >= this.startDate && date <= this.endDate;
 		},
 
-		keydown: function(e){
-			if (this.picker.is(':not(:visible)')){
+		keydown: function (e) {
+			if (this.picker.is(':not(:visible)')) {
 				if (e.keyCode == 27) // allow escape to hide and re-show picker
 					this.show();
 				return;
@@ -846,7 +1069,7 @@
 			var dateChanged = false,
 				dir, day, month,
 				newDate, newViewDate;
-			switch(e.keyCode){
+			switch (e.keyCode) {
 				case 27: // escape
 					this.hide();
 					e.preventDefault();
@@ -855,19 +1078,29 @@
 				case 39: // right
 					if (!this.keyboardNavigation) break;
 					dir = e.keyCode == 37 ? -1 : 1;
-					if (e.ctrlKey){
+					viewMode = this.viewMode;
+					if (e.ctrlKey) {
+						viewMode += 2;
+					} else if (e.shiftKey) {
+						viewMode += 1;
+					}
+					if (viewMode == 4) {
 						newDate = this.moveYear(this.date, dir);
 						newViewDate = this.moveYear(this.viewDate, dir);
-					} else if (e.shiftKey){
+					} else if (viewMode == 3) {
 						newDate = this.moveMonth(this.date, dir);
 						newViewDate = this.moveMonth(this.viewDate, dir);
-					} else {
-						newDate = new Date(this.date);
-						newDate.setUTCDate(this.date.getUTCDate() + dir);
-						newViewDate = new Date(this.viewDate);
-						newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir);
+					} else if (viewMode == 2) {
+						newDate = this.moveDate(this.date, dir);
+						newViewDate = this.moveDate(this.viewDate, dir);
+					} else if (viewMode == 1) {
+						newDate = this.moveHour(this.date, dir);
+						newViewDate = this.moveHour(this.viewDate, dir);
+					} else if (viewMode == 0) {
+						newDate = this.moveMinute(this.date, dir);
+						newViewDate = this.moveMinute(this.viewDate, dir);
 					}
-					if (this.dateWithinRange(newDate)){
+					if (this.dateWithinRange(newDate)) {
 						this.date = newDate;
 						this.viewDate = newViewDate;
 						this.setValue();
@@ -880,19 +1113,34 @@
 				case 40: // down
 					if (!this.keyboardNavigation) break;
 					dir = e.keyCode == 38 ? -1 : 1;
-					if (e.ctrlKey){
+					viewMode = this.viewMode;
+					if (e.ctrlKey) {
+						viewMode += 2;
+					} else if (e.shiftKey) {
+						viewMode += 1;
+					}
+					if (viewMode == 4) {
 						newDate = this.moveYear(this.date, dir);
 						newViewDate = this.moveYear(this.viewDate, dir);
-					} else if (e.shiftKey){
+					} else if (viewMode == 3) {
 						newDate = this.moveMonth(this.date, dir);
 						newViewDate = this.moveMonth(this.viewDate, dir);
-					} else {
-						newDate = new Date(this.date);
-						newDate.setUTCDate(this.date.getUTCDate() + dir * 7);
-						newViewDate = new Date(this.viewDate);
-						newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir * 7);
+					} else if (viewMode == 2) {
+						newDate = this.moveDate(this.date, dir * 7);
+						newViewDate = this.moveDate(this.viewDate, dir * 7);
+					} else if (viewMode == 1) {
+						if (this.showMeridian) {
+							newDate = this.moveHour(this.date, dir * 6);
+							newViewDate = this.moveHour(this.viewDate, dir * 6);
+						} else {
+							newDate = this.moveHour(this.date, dir * 4);
+							newViewDate = this.moveHour(this.viewDate, dir * 4);
+						}
+					} else if (viewMode == 0) {
+						newDate = this.moveMinute(this.date, dir * 4);
+						newViewDate = this.moveMinute(this.viewDate, dir * 4);
 					}
-					if (this.dateWithinRange(newDate)){
+					if (this.dateWithinRange(newDate)) {
 						this.date = newDate;
 						this.viewDate = newViewDate;
 						this.setValue();
@@ -902,57 +1150,76 @@
 					}
 					break;
 				case 13: // enter
-					this.hide();
+					if (this.viewMode != 0) {
+						var oldViewMode = this.viewMode;
+						this.showMode(-1);
+						this.fill();
+						if (oldViewMode == this.viewMode && this.autoclose) {
+							this.hide();
+						}
+					} else {
+						this.fill();
+						if (this.autoclose) {
+							this.hide();
+						}
+					}
 					e.preventDefault();
 					break;
 				case 9: // tab
 					this.hide();
 					break;
 			}
-			if (dateChanged){
-				this.element.trigger({
-					type: 'changeDate',
-					date: this.date
-				});
+			if (dateChanged) {
 				var element;
 				if (this.isInput) {
 					element = this.element;
-				} else if (this.component){
+				} else if (this.component) {
 					element = this.element.find('input');
 				}
 				if (element) {
 					element.change();
 				}
+				this.element.trigger({
+					type: 'changeDate',
+					date: this.date
+				});
 			}
 		},
 
-		showMode: function(dir) {
+		showMode: function (dir) {
 			if (dir) {
 				var newViewMode = Math.max(0, Math.min(DPGlobal.modes.length - 1, this.viewMode + dir));
 				if (newViewMode >= this.minView && newViewMode <= this.maxView) {
+					this.element.trigger({
+						type:        'changeMode',
+						date:        this.viewDate,
+						oldViewMode: this.viewMode,
+						newViewMode: newViewMode
+					});
+
 					this.viewMode = newViewMode;
 				}
 			}
 			/*
-			  vitalets: fixing bug of very special conditions:
-			  jquery 1.7.1 + webkit + show inline datetimepicker in bootstrap popover.
-			  Method show() does not set display css correctly and datetimepicker is not shown.
-			  Changed to .css('display', 'block') solve the problem.
-			  See https://github.com/vitalets/x-editable/issues/37
-
-			  In jquery 1.7.2+ everything works fine.
-			*/
+			 vitalets: fixing bug of very special conditions:
+			 jquery 1.7.1 + webkit + show inline datetimepicker in bootstrap popover.
+			 Method show() does not set display css correctly and datetimepicker is not shown.
+			 Changed to .css('display', 'block') solve the problem.
+			 See https://github.com/vitalets/x-editable/issues/37
+
+			 In jquery 1.7.2+ everything works fine.
+			 */
 			//this.picker.find('>div').hide().filter('.datetimepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
-			this.picker.find('>div').hide().filter('.datetimepicker-'+DPGlobal.modes[this.viewMode].clsName).css('display', 'block');
+			this.picker.find('>div').hide().filter('.datetimepicker-' + DPGlobal.modes[this.viewMode].clsName).css('display', 'block');
 			this.updateNavArrows();
 		},
-		
-		reset: function(e) {
+
+		reset: function (e) {
 			this._setDate(null, 'date');
 		}
 	};
 
-	$.fn.fdatetimepicker = function ( option ) {
+	$.fn.fdatetimepicker = function (option) {
 		var args = Array.apply(null, arguments);
 		args.shift();
 		return this.each(function () {
@@ -960,7 +1227,7 @@
 				data = $this.data('datetimepicker'),
 				options = typeof option == 'object' && option;
 			if (!data) {
-				$this.data('datetimepicker', (data = new Datetimepicker(this, $.extend({}, $.fn.fdatetimepicker.defaults,options))));
+				$this.data('datetimepicker', (data = new Datetimepicker(this, $.extend({}, $.fn.fdatetimepicker.defaults, options))));
 			}
 			if (typeof option == 'string' && typeof data[option] == 'function') {
 				data[option].apply(data, args);
@@ -973,80 +1240,110 @@
 	$.fn.fdatetimepicker.Constructor = Datetimepicker;
 	var dates = $.fn.fdatetimepicker.dates = {
 		en: {
-			days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
-			daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
-			daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
-			months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+			days:        ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
+			daysShort:   ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+			daysMin:     ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
+			months:      ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
 			monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
-			today: "Today"
+			meridiem:    ["am", "pm"],
+			suffix:      ["st", "nd", "rd", "th"],
+			today:       "Today"
 		}
 	};
 
 	var DPGlobal = {
-		modes: [
+		modes:            [
 			{
 				clsName: 'minutes',
-				navFnc: 'Hours',
+				navFnc:  'Hours',
 				navStep: 1
 			},
 			{
 				clsName: 'hours',
-				navFnc: 'Date',
+				navFnc:  'Date',
 				navStep: 1
 			},
 			{
 				clsName: 'days',
-				navFnc: 'Month',
+				navFnc:  'Month',
 				navStep: 1
 			},
 			{
 				clsName: 'months',
-				navFnc: 'FullYear',
+				navFnc:  'FullYear',
 				navStep: 1
 			},
 			{
 				clsName: 'years',
-				navFnc: 'FullYear',
+				navFnc:  'FullYear',
 				navStep: 10
-		}],
-		isLeapYear: function (year) {
+			}
+		],
+		isLeapYear:       function (year) {
 			return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0))
 		},
-		getDaysInMonth: function (year, month) {
+		getDaysInMonth:   function (year, month) {
 			return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
 		},
-		validParts: /hh?|ii?|ss?|dd?|mm?|MM?|yy(?:yy)?/g,
-		nonpunctuation: /[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,
-		parseFormat: function(format){
+		getDefaultFormat: function (type, field) {
+			if (type == "standard") {
+				if (field == 'input')
+					return 'yyyy-mm-dd hh:ii';
+				else
+					return 'yyyy-mm-dd hh:ii:ss';
+			} else if (type == "php") {
+				if (field == 'input')
+					return 'Y-m-d H:i';
+				else
+					return 'Y-m-d H:i:s';
+			} else {
+				throw new Error("Invalid format type.");
+			}
+		},
+		validParts:       function (type) {
+			if (type == "standard") {
+				return /hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g;
+			} else if (type == "php") {
+				return /[dDjlNwzFmMnStyYaABgGhHis]/g;
+			} else {
+				throw new Error("Invalid format type.");
+			}
+		},
+		nonpunctuation:   /[^ -\/:-@\[-`{-~\t\n\rTZ]+/g,
+		parseFormat:      function (format, type) {
 			// IE treats \0 as a string end in inputs (truncating the value),
 			// so it's a bad format delimiter, anyway
-			var separators = format.replace(this.validParts, '\0').split('\0'),
-				parts = format.match(this.validParts);
-			if (!separators || !separators.length || !parts || parts.length == 0){
+			var separators = format.replace(this.validParts(type), '\0').split('\0'),
+				parts = format.match(this.validParts(type));
+			if (!separators || !separators.length || !parts || parts.length == 0) {
 				throw new Error("Invalid date format.");
 			}
 			return {separators: separators, parts: parts};
 		},
-		parseDate: function(date, format, language) {
-			if (date instanceof Date) return new Date(date.valueOf() - date.getTimezoneOffset() * 60000);
+		parseDate:        function (date, format, language, type) {
+			if (date instanceof Date) {
+				var dateUTC = new Date(date.valueOf() - date.getTimezoneOffset() * 60000);
+				dateUTC.setMilliseconds(0);
+				return dateUTC;
+			}
 			if (/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(date)) {
-				format = this.parseFormat('yyyy-mm-dd');
+				format = this.parseFormat('yyyy-mm-dd', type);
 			}
 			if (/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(date)) {
-				format = this.parseFormat('yyyy-mm-dd hh:ii');
+				format = this.parseFormat('yyyy-mm-dd hh:ii', type);
 			}
 			if (/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(date)) {
-				format = this.parseFormat('yyyy-mm-dd hh:ii:ss');
+				format = this.parseFormat('yyyy-mm-dd hh:ii:ss', type);
 			}
 			if (/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(date)) {
 				var part_re = /([-+]\d+)([dmwy])/,
 					parts = date.match(/([-+]\d+)([dmwy])/g),
 					part, dir;
 				date = new Date();
-				for (var i=0; i<parts.length; i++) {
+				for (var i = 0; i < parts.length; i++) {
 					part = part_re.exec(parts[i]);
 					dir = parseInt(part[1]);
-					switch(part[2]){
+					switch (part[2]) {
 						case 'd':
 							date.setUTCDate(date.getUTCDate() + dir);
 							break;
@@ -1061,44 +1358,72 @@
 							break;
 					}
 				}
-				return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds());
+				return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(), 0);
 			}
 			var parts = date && date.match(this.nonpunctuation) || [],
-				date = new Date(),
+				date = new Date(0, 0, 0, 0, 0, 0, 0),
 				parsed = {},
-				setters_order = ['hh', 'h', 'ii', 'i', 'ss', 's', 'yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'd', 'dd'],
+				setters_order = ['hh', 'h', 'ii', 'i', 'ss', 's', 'yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'D', 'DD', 'd', 'dd', 'H', 'HH', 'p', 'P'],
 				setters_map = {
-					hh: function(d,v){ return d.setUTCHours(v); },
-					h:  function(d,v){ return d.setUTCHours(v); },
-					ii: function(d,v){ return d.setUTCMinutes(v); },
-					i:  function(d,v){ return d.setUTCMinutes(v); },
-					ss: function(d,v){ return d.setUTCSeconds(v); },
-					s:  function(d,v){ return d.setUTCSeconds(v); },
-					yyyy: function(d,v){ return d.setUTCFullYear(v); },
-					yy: function(d,v){ return d.setUTCFullYear(2000+v); },
-					m: function(d,v){
+					hh:   function (d, v) {
+						return d.setUTCHours(v);
+					},
+					h:    function (d, v) {
+						return d.setUTCHours(v);
+					},
+					HH:   function (d, v) {
+						return d.setUTCHours(v == 12 ? 0 : v);
+					},
+					H:    function (d, v) {
+						return d.setUTCHours(v == 12 ? 0 : v);
+					},
+					ii:   function (d, v) {
+						return d.setUTCMinutes(v);
+					},
+					i:    function (d, v) {
+						return d.setUTCMinutes(v);
+					},
+					ss:   function (d, v) {
+						return d.setUTCSeconds(v);
+					},
+					s:    function (d, v) {
+						return d.setUTCSeconds(v);
+					},
+					yyyy: function (d, v) {
+						return d.setUTCFullYear(v);
+					},
+					yy:   function (d, v) {
+						return d.setUTCFullYear(2000 + v);
+					},
+					m:    function (d, v) {
 						v -= 1;
-						while (v<0) v += 12;
+						while (v < 0) v += 12;
 						v %= 12;
 						d.setUTCMonth(v);
 						while (d.getUTCMonth() != v)
-							d.setUTCDate(d.getUTCDate()-1);
+							d.setUTCDate(d.getUTCDate() - 1);
 						return d;
 					},
-					d: function(d,v){ return d.setUTCDate(v); }
+					d:    function (d, v) {
+						return d.setUTCDate(v);
+					},
+					p:    function (d, v) {
+						return d.setUTCHours(v == 1 ? d.getUTCHours() + 12 : d.getUTCHours());
+					}
 				},
 				val, filtered, part;
 			setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
 			setters_map['dd'] = setters_map['d'];
-			date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);//date.getHours(), date.getMinutes(), date.getSeconds());
+			setters_map['P'] = setters_map['p'];
+			date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
 			if (parts.length == format.parts.length) {
-				for (var i=0, cnt = format.parts.length; i < cnt; i++) {
+				for (var i = 0, cnt = format.parts.length; i < cnt; i++) {
 					val = parseInt(parts[i], 10);
 					part = format.parts[i];
 					if (isNaN(val)) {
-						switch(part) {
+						switch (part) {
 							case 'MM':
-								filtered = $(dates[language].months).filter(function(){
+								filtered = $(dates[language].months).filter(function () {
 									var m = this.slice(0, parts[i].length),
 										p = parts[i].slice(0, m.length);
 									return m == p;
@@ -1106,18 +1431,22 @@
 								val = $.inArray(filtered[0], dates[language].months) + 1;
 								break;
 							case 'M':
-								filtered = $(dates[language].monthsShort).filter(function(){
+								filtered = $(dates[language].monthsShort).filter(function () {
 									var m = this.slice(0, parts[i].length),
 										p = parts[i].slice(0, m.length);
 									return m == p;
 								});
 								val = $.inArray(filtered[0], dates[language].monthsShort) + 1;
 								break;
+							case 'p':
+							case 'P':
+								val = $.inArray(parts[i].toLowerCase(), dates[language].meridiem);
+								break;
 						}
 					}
 					parsed[part] = val;
 				}
-				for (var i=0, s; i<setters_order.length; i++){
+				for (var i = 0, s; i < setters_order.length; i++) {
 					s = setters_order[i];
 					if (s in parsed && !isNaN(parsed[s]))
 						setters_map[s](date, parsed[s])
@@ -1125,36 +1454,97 @@
 			}
 			return date;
 		},
-		formatDate: function(date, format, language){
+		formatDate:       function (date, format, language, type) {
 			if (date == null) {
 				return '';
 			}
-			var val = {
-				h: date.getUTCHours(),
-				i: date.getUTCMinutes(),
-				s: date.getUTCSeconds(),
-				d: date.getUTCDate(),
-				m: date.getUTCMonth() + 1,
-				M: dates[language].monthsShort[date.getUTCMonth()],
-				MM: dates[language].months[date.getUTCMonth()],
-				yy: date.getUTCFullYear().toString().substring(2),
-				yyyy: date.getUTCFullYear()
-			};
-			val.hh = (val.h < 10 ? '0' : '') + val.h;
-			val.ii = (val.i < 10 ? '0' : '') + val.i;
-			val.ss = (val.s < 10 ? '0' : '') + val.s;
-			val.dd = (val.d < 10 ? '0' : '') + val.d;
-			val.mm = (val.m < 10 ? '0' : '') + val.m;
+			var val;
+			if (type == 'standard') {
+				val = {
+					// year
+					yy:   date.getUTCFullYear().toString().substring(2),
+					yyyy: date.getUTCFullYear(),
+					// month
+					m:    date.getUTCMonth() + 1,
+					M:    dates[language].monthsShort[date.getUTCMonth()],
+					MM:   dates[language].months[date.getUTCMonth()],
+					// day
+					d:    date.getUTCDate(),
+					D:    dates[language].daysShort[date.getUTCDay()],
+					DD:   dates[language].days[date.getUTCDay()],
+					p:    (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''),
+					// hour
+					h:    date.getUTCHours(),
+					// minute
+					i:    date.getUTCMinutes(),
+					// second
+					s:    date.getUTCSeconds()
+				};
+
+				if (dates[language].meridiem.length == 2) {
+					val.H = (val.h % 12 == 0 ? 12 : val.h % 12);
+				}
+				else {
+					val.H = val.h;
+				}
+				val.HH = (val.H < 10 ? '0' : '') + val.H;
+				val.P = val.p.toUpperCase();
+				val.hh = (val.h < 10 ? '0' : '') + val.h;
+				val.ii = (val.i < 10 ? '0' : '') + val.i;
+				val.ss = (val.s < 10 ? '0' : '') + val.s;
+				val.dd = (val.d < 10 ? '0' : '') + val.d;
+				val.mm = (val.m < 10 ? '0' : '') + val.m;
+			} else if (type == 'php') {
+				// php format
+				val = {
+					// year
+					y: date.getUTCFullYear().toString().substring(2),
+					Y: date.getUTCFullYear(),
+					// month
+					F: dates[language].months[date.getUTCMonth()],
+					M: dates[language].monthsShort[date.getUTCMonth()],
+					n: date.getUTCMonth() + 1,
+					t: DPGlobal.getDaysInMonth(date.getUTCFullYear(), date.getUTCMonth()),
+					// day
+					j: date.getUTCDate(),
+					l: dates[language].days[date.getUTCDay()],
+					D: dates[language].daysShort[date.getUTCDay()],
+					w: date.getUTCDay(), // 0 -> 6
+					N: (date.getUTCDay() == 0 ? 7 : date.getUTCDay()),       // 1 -> 7
+					S: (date.getUTCDate() % 10 <= dates[language].suffix.length ? dates[language].suffix[date.getUTCDate() % 10 - 1] : ''),
+					// hour
+					a: (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''),
+					g: (date.getUTCHours() % 12 == 0 ? 12 : date.getUTCHours() % 12),
+					G: date.getUTCHours(),
+					// minute
+					i: date.getUTCMinutes(),
+					// second
+					s: date.getUTCSeconds()
+				};
+				val.m = (val.n < 10 ? '0' : '') + val.n;
+				val.d = (val.j < 10 ? '0' : '') + val.j;
+				val.A = val.a.toString().toUpperCase();
+				val.h = (val.g < 10 ? '0' : '') + val.g;
+				val.H = (val.G < 10 ? '0' : '') + val.G;
+				val.i = (val.i < 10 ? '0' : '') + val.i;
+				val.s = (val.s < 10 ? '0' : '') + val.s;
+			} else {
+				throw new Error("Invalid format type.");
+			}
 			var date = [],
 				seps = $.extend([], format.separators);
-			for (var i=0, cnt = format.parts.length; i < cnt; i++) {
-				if (seps.length)
-					date.push(seps.shift())
+			for (var i = 0, cnt = format.parts.length; i < cnt; i++) {
+				if (seps.length) {
+					date.push(seps.shift());
+				}
 				date.push(val[format.parts[i]]);
 			}
+			if (seps.length) {
+				date.push(seps.shift());
+			}
 			return date.join('');
 		},
-		convertViewMode: function(viewMode){
+		convertViewMode:  function (viewMode) {
 			switch (viewMode) {
 				case 4:
 				case 'decade':
@@ -1180,55 +1570,124 @@
 
 			return viewMode;
 		},
-		headTemplate: '<thead>'+
-							'<tr>'+
-								'<th class="prev"><i class="icon-chevron-left"/></th>'+
-								'<th colspan="5" class="switch"></th>'+
-								'<th class="next"><i class="icon-chevron-right"/></th>'+
-							'</tr>'+
-						'</thead>',
-		contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>',
-		footTemplate: '<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>'
+		headTemplate:     '<thead>' +
+							  '<tr>' +
+							  '<th class="prev"><i class="fi-arrow-left"/></th>' +
+							  '<th colspan="5" class="switch"></th>' +
+							  '<th class="next"><i class="fi-arrow-right"/></th>' +
+							  '</tr>' +
+			'</thead>',
+		headTemplateV3:   '<thead>' +
+							  '<tr>' +
+							  '<th class="prev"><i class="icon-arrow-left"></i> </th>' +
+							  '<th colspan="5" class="switch"></th>' +
+							  '<th class="next"><i class="icon-arrow-right"></i> </th>' +
+							  '</tr>' +
+			'</thead>',
+		contTemplate:     '<tbody><tr><td colspan="7"></td></tr></tbody>',
+		footTemplate:     '<tfoot><tr><th colspan="7" class="today"></th></tr></tfoot>'
 	};
-	DPGlobal.template = '<div class="datetimepicker">'+
-							'<div class="datetimepicker-minutes">'+
-								'<table class=" table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datetimepicker-hours">'+
-								'<table class=" table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datetimepicker-days">'+
-								'<table class=" table-condensed">'+
-									DPGlobal.headTemplate+
-									'<tbody></tbody>'+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datetimepicker-months">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datetimepicker-years">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<a class="button datetimepicker-close small alert right" style="width:auto;"><i class="icon-remove"></i></a>'+
-						'</div>';
-
+	DPGlobal.template = '<div class="datetimepicker">' +
+		'<div class="datetimepicker-minutes">' +
+		'<table class=" table-condensed">' +
+		DPGlobal.headTemplate +
+		DPGlobal.contTemplate +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'<div class="datetimepicker-hours">' +
+		'<table class=" table-condensed">' +
+		DPGlobal.headTemplate +
+		DPGlobal.contTemplate +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'<div class="datetimepicker-days">' +
+		'<table class=" table-condensed">' +
+		DPGlobal.headTemplate +
+		'<tbody></tbody>' +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'<div class="datetimepicker-months">' +
+		'<table class="table-condensed">' +
+		DPGlobal.headTemplate +
+		DPGlobal.contTemplate +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'<div class="datetimepicker-years">' +
+		'<table class="table-condensed">' +
+		DPGlobal.headTemplate +
+		DPGlobal.contTemplate +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'</div>';
+	DPGlobal.templateV3 = '<div class="datetimepicker">' +
+		'<div class="datetimepicker-minutes">' +
+		'<table class=" table-condensed">' +
+		DPGlobal.headTemplateV3 +
+		DPGlobal.contTemplate +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'<div class="datetimepicker-hours">' +
+		'<table class=" table-condensed">' +
+		DPGlobal.headTemplateV3 +
+		DPGlobal.contTemplate +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'<div class="datetimepicker-days">' +
+		'<table class=" table-condensed">' +
+		DPGlobal.headTemplateV3 +
+		'<tbody></tbody>' +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'<div class="datetimepicker-months">' +
+		'<table class="table-condensed">' +
+		DPGlobal.headTemplateV3 +
+		DPGlobal.contTemplate +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'<div class="datetimepicker-years">' +
+		'<table class="table-condensed">' +
+		DPGlobal.headTemplateV3 +
+		DPGlobal.contTemplate +
+		DPGlobal.footTemplate +
+		'</table>' +
+		'</div>' +
+		'</div>';
 	$.fn.fdatetimepicker.DPGlobal = DPGlobal;
 
-}( window.jQuery );
+	/* DATETIMEPICKER NO CONFLICT
+	 * =================== */
+
+	$.fn.fdatetimepicker.noConflict = function () {
+		$.fn.fdatetimepicker = old;
+		return this;
+	};
+
+	/* DATETIMEPICKER DATA-API
+	 * ================== */
+
+	$(document).on(
+		'focus.datetimepicker.data-api click.datetimepicker.data-api',
+		'[data-provide="datetimepicker"]',
+		function (e) {
+			var $this = $(this);
+			if ($this.data('datetimepicker')) return;
+			e.preventDefault();
+			// component click requires us to explicitly show it
+			$this.fdatetimepicker('show');
+		}
+	);
+	$(function () {
+		$('[data-provide="datetimepicker-inline"]').fdatetimepicker();
+	});
+
+}(window.jQuery);
+