Merge branch 'pr/146'

Author: longbill

README.md

@@ -41,5 +41,6 @@ jQuery Date Range Picker is a jQuery plugin that allows user to select a date ra
 * fixed some position issues
 * fixed some time related bugs
 
+
 ###LICENSE###
 This date range picker plugin is under MIT LICENSE

daterangepicker.css

@@ -67,7 +67,6 @@
 {
 	width:190px;
 	float:left;
-	table-layout:fixed;
 }
 .date-picker-wrapper .month-wrapper table.month2
 {

demo.js

@@ -190,11 +190,6 @@ $(function()
 		}
 	});
 
-	$('#date-range104').dateRangePicker(
-	{
-		showShortcuts:false
-	});
-
 	$('#date-range103').dateRangePicker(
 	{
 		autoClose: true
@@ -261,17 +256,6 @@ $(function()
 		format: 'dddd MMM Do, YYYY'  //more formats at http://momentjs.com/docs/#/displaying/format/
 	});
 
-	$('#date-range11').dateRangePicker(
-	{
-		separator : ' ~ '
-	}).bind('datepicker-change',function(e,r)
-	{
-		try
-		{
-			console.log(r);
-		}catch(e){}
-	});
-
 	$('#date-range12').dateRangePicker(
 	{
 		inline:true,

index.html

@@ -291,15 +291,6 @@ <h2>Demonstrations</h2>
 			</div>
 
 
-			<div class="demo">
-				Hide shortcuts: <input id="date-range104" size="60" value="">
-				<a href="#" class="show-option">Show Config</a>
-				<pre class="options">
-{
-	showShortcuts:false
-}				</pre>
-			</div>
-
 			<div class="demo">
 				Auto-close after selection: <input id="date-range103" size="60" value="">
 				<a href="#" class="show-option">Show Config</a>
@@ -309,15 +300,6 @@ <h2>Demonstrations</h2>
 }				</pre>
 			</div>
 
-			<div class="demo">
-				Change the separator between date strings: <input id="date-range11" size="40" value="">
-				<a href="#" class="show-option">Show Config</a>
-				<pre class="options">
-{
-	separator : ' ~ '
-}	</pre>
-			</div>
-
 			<div class="demo">
 				In-line mode: <input id="date-range12" size="40" value="">
 				<a href="#" class="show-option">Show Config</a>
@@ -597,13 +579,13 @@ <h2>Configuration</h2>
 	},
 	minDays: 0,
 	maxDays: 0,
-	showShortcuts: true,
+	showShortcuts: false,
 	shortcuts:
 	{
 		//'prev-days': [1,3,5,7],
-		'next-days': [3,5,7],
+		//'next-days': [3,5,7],
 		//'prev' : ['week','month','year'],
-		'next' : ['week','month','year']
+		//'next' : ['week','month','year']
 	},
 	customShortcuts : [],
 	inline:false,
@@ -623,6 +605,7 @@ <h2>Configuration</h2>
 		return days > 1 ? days + ' ' + lang('days') : '';
 	},
 	showTopbar: true,
+	swapTime: false,
 	selectForward: false,
 	selectBackward: false,
 	showWeekNumbers: false,
@@ -732,6 +715,9 @@ <h3>You can use the following keys in the configObject to overwrite the default
 <b>showTopbar (Boolean)</b>
 	<i>If show the top bar.</i>
 
+<b>swapTime (Boolean)</b>
+	<i>If true and if time is enabled, on choosing first enddate and than startdate, endtime and starttime will be swapped. If this configkey is false, only date will be swapped, time will stay constant. If time is disabled, this config key is not used.</i>
+
 <b>selectForward (Boolean) Default: false</b>
 	<i>If this is true, you can only select second date after the first selected date.</i>
 

jquery.daterangepicker.js

@@ -532,6 +532,7 @@
 				return days > 1 ? days + ' ' + lang('days') : '';
 			},
 			showTopbar: true,
+			swapTime: false,
 			showWeekNumbers: false,
 			getWeekNumber: function(date) //date will be the first day of a week
 			{
@@ -622,11 +623,11 @@
 		$(window).bind('resize.datepicker',calcPosition);
 
 		return this;
-        
-        function IsOwnDatePickerClicked(evt, selfObj)
-        {
-            return ( evt.target == selfObj  || (selfObj.childNodes != undefined && $.inArray(evt.target, selfObj.childNodes)>=0))
-        }
+		
+		function IsOwnDatePickerClicked(evt, selfObj)
+		{
+			return ( evt.target == selfObj  || (selfObj.childNodes != undefined && $.inArray(evt.target, selfObj.childNodes)>=0))
+		}
 
 		function init_datepicker()
 		{
@@ -1213,7 +1214,7 @@
 				var tmp = opt.end;
 				opt.end = handleEnd(opt.start);
 				opt.start = handleStart(tmp);
-				if (opt.time.enabled) {
+				if (opt.time.enabled && opt.swapTime) {
 					swapTime();
 				}
 			}