declared some variables

arenoir · Oct 4, 2012 · 5fc85f4 · 5fc85f4
1 parent db0b9e6
commit 5fc85f4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/common/DayEventRenderer.js b/src/common/DayEventRenderer.js
@@ -174,7 +174,7 @@ function DayEventRenderer() {
 						weekendSumColStart=0	
 						weekendSumColEnd=0
 
-						for(j=0; j<=leftCol; j++) {
+						for(var j=0; j<=leftCol; j++) {
 							weekendTestDate = addDays(cloneDate(t.visStart), j);
 
 							if(weekendTestDate.getDay() == 0 || weekendTestDate.getDay() == 6) {

diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js
@@ -122,7 +122,7 @@ function ResourceEventRenderer() {
 
 	function draggableResourceEvent(event, eventElement) {
 		var hoverListener = getHoverListener();
-		var dayDelta, minuteDelta, resourceDelta, newResourceId, resources, viewName = getViewName(), weekendTestDate, daysToAdd, daysToDel, dayDeltaStart, dayDeltaEnd;
+		var dayDelta, minuteDelta, resourceDelta, newResourceId, resources, viewName = getViewName(), weekendTestDate, daysToAdd, daysToDel, dayDeltaStart, dayDeltaEnd, i;
 		eventElement.draggable({
 			zIndex: 9,
 			delay: 50,
@@ -282,12 +282,14 @@ function ResourceEventRenderer() {
 			var dis = rtl ? -1 : 1;
 			var dit = rtl ? colCnt-1 : 0;
 			var elementTop = element.css('top');
-			var dayDelta;
+			var dayDelta, dayDeltaStart, dayDeltaEnd;
 			var minuteDelta;
 			var helpers;
 			var eventCopy = $.extend({}, event);
 			var minCell = dateCell(event.start);
 			var newEnd;
+			var weekendTestDate;
+
 			clearSelection();
 			$('body')
 				.css('cursor', direction + '-resize')
@@ -308,7 +310,7 @@ function ResourceEventRenderer() {
 						// If weekends is set to false, add or remove days from dayDelta
 						if (!opt('weekends') && (dayDelta > 0 || dayDelta < 0)) {
 							if (dayDelta > 0) {
-								for(i=1; i<=dayDeltaEnd; i++) {
+								for(var i=1; i<=dayDeltaEnd; i++) {
 									weekendTestDate = addDays(cloneDate(event.end), i);
 									if (weekendTestDate.getDay() == 6 || weekendTestDate.getDay() == 0) dayDeltaEnd++;
 								}
@@ -361,15 +363,15 @@ function ResourceEventRenderer() {
 					if (!opt('weekends')) {
 						// We have to add or remove days from event.end. Is there a better way?
 						if (dayDelta > 0) {
-							daysToAdd = 0;
-							for(i=1; i<=dayDelta+daysToAdd; i++) {
+							var daysToAdd = 0;
+							for(var i=1; i<=dayDelta+daysToAdd; i++) {
 								weekendTestDate = addDays(cloneDate(event.end), i);
 								if (weekendTestDate.getDay() == 6 || weekendTestDate.getDay() == 0) daysToAdd++;
 							}
 							if (daysToAdd > 0) event.end = addDays(cloneDate(event.end), daysToAdd, true);
 						}
 						else {
-							daysToDel = 0;
+							var daysToDel = 0;
 							for(i=-1; i>=dayDelta+daysToDel; i--) {
 								weekendTestDate = addDays(cloneDate(event.end), i);
 								if (weekendTestDate.getDay() == 6 || weekendTestDate.getDay() == 0) daysToDel--;

diff --git a/src/resource/ResourceMonthView.js b/src/resource/ResourceMonthView.js
@@ -47,7 +47,7 @@ function ResourceMonthView(element, calendar) {
 		if(!weekends) {
 			// Drop out weekends from cols
 			var weekendCnt = 0;
-			for(i=1; i<=cols; i++) {
+			for(var i=1; i<=cols; i++) {
 				weekendTestDate = addDays(cloneDate(visStart), i);
 				if(weekendTestDate.getDay() == 0 || weekendTestDate.getDay() == 6) {
 					weekendCnt++;

diff --git a/src/resource/ResourceView.js b/src/resource/ResourceView.js
@@ -365,8 +365,8 @@ function ResourceView(element, calendar, viewName) {
 
 				if(!opt('weekends')) {
 					// Drop weekends off
-					var weekendSumColStart=0				
-					for(i=0; i<=colStart; i++) {
+					var weekendSumColStart=0, weekendTestDate;				
+					for(var i=0; i<=colStart; i++) {
 						weekendTestDate = addDays(cloneDate(t.visStart), i);
 
 						if(weekendTestDate.getDay() == 0 || weekendTestDate.getDay() == 6) {
@@ -562,7 +562,7 @@ function ResourceView(element, calendar, viewName) {
 		else {	
 			if (!opt('weekends')) {
 				// no weekends
-				var dateTest;
+				var dateTest, i;
 
 				for (i=0; i <= col; i++) {
 					dateTest = addDays(cloneDate(t.visStart), i);