Fixed DST issue, Month View height issue on IE

Fixed DST issue - because of DST, some days were appearing twice/ month appring twice or month skipped entirely. Fixed issue of Month View height on IE.
nehakadam · Sep 13, 2016 · 50feca1 · 50feca1
1 parent feeba3c
commit 50feca1
Show file tree

Hide file tree

Showing 65 changed files with 3,774 additions and 3,495 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -27,7 +27,14 @@ module.exports = function(grunt)
 
 	], 
 
-	sAJSCustom = [], 
+	sAJSCustom = [
+		'src/calenstyle-core.js', 
+      	'src/calenstyle-monthview.js', 
+      	'src/calenstyle-detailview.js',
+      	'src/calenstyle-agendaview.js',
+      	'src/calenstyle-quickagendaview.js',
+      	'src/calenstyle-pickers.js'
+	], 
 
 	sACSS = [
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "calenstyle",
 
-    "version": "2.0.3",
+    "version": "2.0.4",
 
     "license" : "See License Information in LICENSE file",
 

diff --git a/demo/CalExample-Filter.htm b/demo/CalExample-Filter.htm
@@ -290,7 +290,7 @@
 						});
 					},
 
-					dayClicked: function(dSelectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDate, bIsAllDay, pClickedAt)
 					{
 						console.log(dSelectedDate);
 						console.log(pClickedAt);

diff --git a/demo/CalExampleAddEventOnViewClick.htm b/demo/CalExampleAddEventOnViewClick.htm
@@ -130,10 +130,10 @@
 						//calObj1.revertToOriginalEvent(oDraggedEvent, startDateBeforeDrop, endDateBeforeDrop);
 					},
 
-					dayClicked: function(selectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDate, bIsAllDay, pClickedAt)
 					{
-						console.log("Day Clicked : " + selectedDate);
-						showModal(true, selectedDate);						
+						console.log("Cell Clicked : " + dSelectedDate);
+						showModal(true, dSelectedDate);						
 					},
 
 					cellClicked: function(selectedDateTime, pClickedAt)

diff --git a/demo/CalExampleCustom-Header2.htm b/demo/CalExampleCustom-Header2.htm
@@ -49,7 +49,7 @@
 
 				$(".calendarContOuter").CalenStyle(
 				{
-				
+
 					headerSectionsList: 
 					{
 						left: ["DatePickerIcon", "FullscreenButton"],

diff --git a/demo/CalExampleCustom-NoHeader.htm b/demo/CalExampleCustom-NoHeader.htm
@@ -357,9 +357,9 @@
 						oCal2.highlightDatesInDatePicker(dCal2Highlight);
 					},
 
-					dayClicked: function(selectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDateTime, bIsAllDay, pClickedAt)
 					{
-						oCal1.setting.selectedDate = selectedDate;
+						oCal1.setting.selectedDate = dSelectedDateTime;
 						oCal1.reloadData();
 						oCal2.highlightDatesInDatePicker(oCal1.getVisibleDates());
 

diff --git a/demo/CalExampleDefault.htm b/demo/CalExampleDefault.htm
@@ -23,7 +23,8 @@
 			/* --------------- Required --------------- */
 			.calendarContOuter
 			{
-				width: 1000px;
+				width: 100%;
+				/*width: 1000px;*/
 				height: 600px;
 				margin: 0px auto;
 
@@ -40,7 +41,7 @@
 				$(".calendarContOuter").CalenStyle(
 				{
 					/* --------------- Required --------------- */
-				
+
 					eventIndicatorInDatePicker: "Dot",
 
 					calDataSource: 

diff --git a/demo/CalExampleDefaultViewWithDatePicker.htm b/demo/CalExampleDefaultViewWithDatePicker.htm
@@ -253,14 +253,14 @@
 						oCal2.highlightDatesInDatePicker(dCal2Highlight);
 					},
 
-					dayClicked: function(selectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDate, bIsAllDay, pClickedAt)
 					{
-						oCal1.setting.selectedDate = selectedDate;
+						oCal1.setting.selectedDate = dSelectedDate;
 						oCal1.reloadData();
 						oCal2.reloadData();
 						//oCal2.highlightDatesInDatePicker(oCal1.getVisibleDates());
 
-						oCal3.setting.selectedDate = selectedDate;
+						oCal3.setting.selectedDate = dSelectedDate;
 						oCal3.tv.oAEvents = oCal1.tv.oAEvents;
 						oCal3.setting.selectedDate = oCal1.tv.dVSDt;
 						oCal3.setting.daysInAgendaView = oCal1.tv.iNoVDay;

diff --git a/demo/CalExampleDynamic.htm b/demo/CalExampleDynamic.htm
@@ -104,12 +104,12 @@
                 };
 
 				displayCalendarBasedOnWidth();
-				adjustList();
+				oAdjustList();
 
 				$(window).resize(function()
 				{
 					displayCalendarBasedOnWidth();
-					adjustList();
+					oAdjustList();
 				});
 
 				function displayCalendarBasedOnWidth()
@@ -192,7 +192,7 @@
 
 				setTimeout(function()
 				{
-					adjustList();
+					oAdjustList();
 				}, 0);
 
 			});

diff --git a/demo/CalExampleExcludeNonBusinessHours.htm b/demo/CalExampleExcludeNonBusinessHours.htm
@@ -81,9 +81,9 @@
 						//calObj1.revertToOriginalEvent(oDraggedEvent, startDateBeforeDrop, endDateBeforeDrop);
 					},
 
-					dayClicked: function(selectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDate, bIsAllDay, pClickedAt)
 					{
-						console.log("Day Clicked : " + selectedDate);
+						console.log("Cell Clicked : " + dSelectedDate);
 					}
 
 				});

diff --git a/demo/CalExampleFullscreen.htm b/demo/CalExampleFullscreen.htm
@@ -110,9 +110,9 @@
 						//calObj1.revertToOriginalEvent(oDraggedEvent, startDateBeforeDrop, endDateBeforeDrop);
 					},
 
-					dayClicked: function(selectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDate, bIsAllDay, pClickedAt)
 					{
-						console.log("Day Clicked : " + selectedDate);
+						console.log("Cell Clicked : " + dSelectedDate);
 					}
 
 				});

diff --git a/demo/CalExampleInternationalization.htm b/demo/CalExampleInternationalization.htm
@@ -179,9 +179,9 @@
 						//calObj1.revertToOriginalEvent(oDraggedEvent, startDateBeforeDrop, endDateBeforeDrop);
 					},
 
-					dayClicked: function(selectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDate, bIsAllDay, pClickedAt)
 					{
-						console.log("Day Clicked : " + selectedDate);
+						console.log("Cell Clicked : " + dSelectedDate);
 					}
 
 				});

diff --git a/demo/Data-JSON.htm b/demo/Data-JSON.htm
@@ -127,4 +127,4 @@
 
 	</body>
 
-</html>
+</html>
diff --git a/demo/Mobile/CalExampleActionBarMobile.htm b/demo/Mobile/CalExampleActionBarMobile.htm
@@ -136,9 +136,9 @@
 						adjustList();
 					},
 
-					dayClicked: function(selectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDate, bIsAllDay, pClickedAt)
 					{
-						console.log("Day Clicked : " + selectedDate);
+						console.log("Cell Clicked : " + dSelectedDate);
 					},
 
                     eventClicked: function()

diff --git a/demo/Mobile/CalExampleMonthEventListMobile.htm b/demo/Mobile/CalExampleMonthEventListMobile.htm
@@ -112,9 +112,9 @@
 						adjustList();
 					},
 
-					dayClicked: function(selectedDate, pClickedAt)
+					cellClicked: function(sView, dSelectedDate, bIsAllDay, pClickedAt)
 					{
-						console.log("Day Clicked : " + selectedDate);
+						console.log("Cell Clicked : " + dSelectedDate);
 					},
 
                     eventClicked: function()

diff --git a/demo/Mobile/ionic/config.xml b/demo/Mobile/ionic/config.xml
@@ -1,20 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version='1.0' encoding='utf-8'?>
 <widget id="com.ionicframework.csexample766484" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <name>cs_example</name>
-  <description>
+    <name>cs_example</name>
+    <description>
         An Ionic Framework and Cordova project.
     </description>
-  <author email="[email protected]" href="http://example.com.com/">
+    <author email="[email protected]" href="http://example.com.com/">
       Your Name Here
     </author>
-  <content src="index.html"/>
-  <access origin="*"/>
-  <preference name="webviewbounce" value="false"/>
-  <preference name="UIWebViewBounce" value="false"/>
-  <preference name="DisallowOverscroll" value="true"/>
-  <preference name="android-minSdkVersion" value="16"/>
-  <preference name="BackupWebStorage" value="none"/>
-  <feature name="StatusBar">
-    <param name="ios-package" value="CDVStatusBar" onload="true"/>
-  </feature>
-</widget>
+    <content src="index.html" />
+    <access origin="*" />
+    <preference name="webviewbounce" value="false" />
+    <preference name="UIWebViewBounce" value="false" />
+    <preference name="DisallowOverscroll" value="true" />
+    <preference name="android-minSdkVersion" value="16" />
+    <preference name="BackupWebStorage" value="none" />
+    <feature name="StatusBar">
+        <param name="ios-package" onload="true" value="CDVStatusBar" />
+    </feature>
+    <engine name="android" spec="~5.1.1" />
+</widget>
diff --git a/demo/QuickUse-Default.htm b/demo/QuickUse-Default.htm
@@ -46,6 +46,8 @@
 				{
 					/* --------------- Required --------------- */
 
+					fixedNumOfWeeksInMonthView: true,
+
 					calDataSource: 
 					[
 						{

diff --git a/dist/calenstyle-agendaview.js b/dist/calenstyle-agendaview.js
@@ -1,7 +1,7 @@
 /* ----------------------------------------------------------------------------- 
 
   CalenStyle - Responsive Event Calendar
-  Version 2.0.3
+  Version 2.0.4
   Copyright (c)2016 Curious Solutions LLP
   https://curioussolutions.in/libraries/calenstyle/content/license.htm
   See License Information in LICENSE file.

diff --git a/dist/calenstyle-appointmentview.js b/dist/calenstyle-appointmentview.js
@@ -1,7 +1,7 @@
 /* ----------------------------------------------------------------------------- 
 
   CalenStyle - Responsive Event Calendar
-  Version 2.0.3
+  Version 2.0.4
   Copyright (c)2016 Curious Solutions LLP
   https://curioussolutions.in/libraries/calenstyle/content/license.htm
   See License Information in LICENSE file.

diff --git a/dist/calenstyle-core.js b/dist/calenstyle-core.js
@@ -1,7 +1,7 @@
 /* ----------------------------------------------------------------------------- 
 
   CalenStyle - Responsive Event Calendar
-  Version 2.0.3
+  Version 2.0.4
   Copyright (c)2016 Curious Solutions LLP
   https://curioussolutions.in/libraries/calenstyle/content/license.htm
   See License Information in LICENSE file.
@@ -2464,10 +2464,15 @@ CalenStyle.prototype = {
 		iCalendarContWidth = $occCalendarContInner.outerWidth(),
 		iCalendarContHeight = $occCalendarContInner.outerHeight();
 
+		// if(iCalendarContWidth > 410 || iCalendarContHeight > 410)
+		// 	$(to.elem).find(".cContHeader, .cContHeaderSections, .cContHeaderDatePickerIcon, .cContHeaderFullscreen, .cContHeaderNavButton").css({"height": 45, "line-height": 45+"px"});
+		// else
+		// 	$(to.elem).find(".cContHeader, .cContHeaderSections, .cContHeaderDatePickerIcon, .cContHeaderFullscreen, .cContHeaderNavButton").css({"height": 45, "line-height": 45+"px"});
+
 		if(iCalendarContWidth > 410 || iCalendarContHeight > 410)
-			$(to.elem).find(".cContHeader, .cContHeaderSections, .cContHeaderDatePickerIcon, .cContHeaderFullscreen, .cContHeaderNavButton").css({"height": 45, "line-height": 45+"px"});
+			$(to.elem).find(".cContHeader, .cContHeaderDatePickerIcon, .cContHeaderFullscreen, .cContHeaderNavButton").css({"height": 45, "line-height": 45+"px"});
 		else
-			$(to.elem).find(".cContHeader, .cContHeaderSections, .cContHeaderDatePickerIcon, .cContHeaderFullscreen, .cContHeaderNavButton").css({"height": 45, "line-height": 45+"px"});
+			$(to.elem).find(".cContHeader, .cContHeaderDatePickerIcon, .cContHeaderFullscreen, .cContHeaderNavButton").css({"height": 45, "line-height": 45+"px"});
 	},
 
 	//--------------------------------- Header Related Functions End ---------------------------------
@@ -3159,7 +3164,10 @@ CalenStyle.prototype = {
 		if(sDateType === "[object Date]")
 			dTempDate = (bIsAllDay ? to.convertToUTC(sDate, sIpTZOffset) : to.normalizeDateTimeWithOffset(sDate, sIpTZOffset, to.setting.outputTZOffset));
 		else if(sDateType === "[object Number]")
-			dTempDate = (bIsAllDay ? to.convertToUTC(new Date(sDate), sIpTZOffset) : to.normalizeDateTimeWithOffset(new Date(sDate), sIpTZOffset, to.setting.outputTZOffset));
+		{
+			// dTempDate = (bIsAllDay ? to.convertToUTC(new Date(sDate), sIpTZOffset) : to.normalizeDateTimeWithOffset(new Date(sDate), sIpTZOffset, to.setting.outputTZOffset));
+			dTempDate = (bIsAllDay ? to.convertToUTC(new Date(sDate), "+00:00") : to.normalizeDateTimeWithOffset(new Date(sDate), "+00:00", to.setting.outputTZOffset));
+		}
 		else
 		{
 			var iDay = 0, iMonth = 0, iYear = 0, iHours = 0, iMinutes = 0, iSeconds = 0;
@@ -3367,14 +3375,19 @@ CalenStyle.prototype = {
 
 				to.tv.dVSDt = to.setDateInFormat({"date": to._getWeekForDate(dMonthStartDate, false)[0]}, "START");
 				if(!to.setting.fixedNumOfWeeksInMonthView)
-					to.tv.iWkInMonth = ((to._getWeekForDate(dMonthEndDate, false)[0].getTime() - to.tv.dVSDt.getTime())/$.CalenStyle.extra.iMS.w) + 1;
+					to.tv.iWkInMonth = Math.round((to._getWeekForDate(dMonthEndDate, false)[0].getTime() - to.tv.dVSDt.getTime())/$.CalenStyle.extra.iMS.w) + 1;
 
 				to.tv.iNoVDay = 0;
 				var iDateMS = to.tv.dVSDt.getTime(),
 				iNumMonthDays = (to.setting.excludeNonBusinessHours) ? (to.tv.iBsDays * to.tv.iWkInMonth) : (7 * to.tv.iWkInMonth);
+				var iStartTZOffset = to.tv.dVSDt.getTimezoneOffset();
 				for(var iTempIndex = 0; iTempIndex < (7 * to.tv.iWkInMonth); iTempIndex++)
 				{
 					var dTempDate = new Date(iDateMS);
+					var iThisTZOffset = dTempDate.getTimezoneOffset();
+					if(iStartTZOffset !== iThisTZOffset)
+						dTempDate = new Date(iDateMS + ((iThisTZOffset - iStartTZOffset) * $.CalenStyle.extra.iMS.m));
+
 					if(!to.setting.excludeNonBusinessHours)
 					{
 						to.tv.dAVDt.push(dTempDate);
@@ -3604,9 +3617,15 @@ CalenStyle.prototype = {
 		var to = this;
 		var iDVDateMS = dStartDate.getTime(),
 		oArrDates = [];
+
+		var iStartTZOffset = dStartDate.getTimezoneOffset();
 		for(var iDateIndex = 0; iDateIndex < iNoOfDays; iDateIndex++)
 		{
 			var dTempDate = new Date(iDVDateMS);
+			var iThisTZOffset = dTempDate.getTimezoneOffset();
+			if(iStartTZOffset !== iThisTZOffset)
+				dTempDate = new Date(iDVDateMS + ((iThisTZOffset - iStartTZOffset) * $.CalenStyle.extra.iMS.m));
+
 			//if(dEndDate !== null && to.compareDates(dTempDate, dEndDate) === 0)
 			//	break;