Merge infinite loop fix

eternicode · eternicode · commit 04126e37d3e3 · 2012-11-15T13:35:15.000-05:00
diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js
@@ -662,7 +662,7 @@
 		}
 	}
 
-	var DPGlobal = {
+	var DPGlobal = window.dpg = {
 		modes: [
 			{
 				clsName: 'days',
@@ -774,7 +774,7 @@
 				}
 				for (var i=0, s; i<setters_order.length; i++){
 					s = setters_order[i];
-					if (s in parsed)
+					if (s in parsed && !isNaN(parsed[s]))
 						setters_map[s](date, parsed[s])
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@`
`662`	`662`	`}`
`663`	`663`	`}`
`664`	`664`
`665`		`- var DPGlobal = {`
	`665`	`+ var DPGlobal = window.dpg = {`
`666`	`666`	`modes: [`
`667`	`667`	`{`
`668`	`668`	`clsName: 'days',`
`@@ -774,7 +774,7 @@`
`774`	`774`	`}`
`775`	`775`	`for (var i=0, s; i<setters_order.length; i++){`
`776`	`776`	`s = setters_order[i];`
`777`		`- if (s in parsed)`
	`777`	`+ if (s in parsed && !isNaN(parsed[s]))`
`778`	`778`	`setters_map[s](date, parsed[s])`
`779`	`779`	`}`
`780`	`780`	`}`