Merge pull request #270 from adrianhara/master

45kb · web-flow · commit 793972c4333e · 2017-06-07T11:34:21.000+02:00
Fixed: date parse error when opening calendar with "special" date format string
diff --git a/src/js/angular-datepicker.js b/src/js/angular-datepicker.js
@@ -313,15 +313,15 @@
 
               switch (true) {
                 case el.indexOf('d') !== -1: {
-                  d = dateSplit[index];
+                  d = dateSplit[index - (formatDate.length - dateSplit.length)];
                   break;
                 }
                 case el.indexOf('M') !== -1: {
-                  m = dateSplit[index];
+                  m = dateSplit[index - (formatDate.length - dateSplit.length)];
                   break;
                 }
                 case el.indexOf('y') !== -1: {
-                  y = dateSplit[index];
+                  y = dateSplit[index - (formatDate.length - dateSplit.length)];
                   break; 
                 }
                 default: {

Original file line number	Diff line number	Diff line change
`@@ -313,15 +313,15 @@`
`313`	`313`
`314`	`314`	`switch (true) {`
`315`	`315`	`case el.indexOf('d') !== -1: {`
`316`		`- d = dateSplit[index];`
	`316`	`+ d = dateSplit[index - (formatDate.length - dateSplit.length)];`
`317`	`317`	`break;`
`318`	`318`	`}`
`319`	`319`	`case el.indexOf('M') !== -1: {`
`320`		`- m = dateSplit[index];`
	`320`	`+ m = dateSplit[index - (formatDate.length - dateSplit.length)];`
`321`	`321`	`break;`
`322`	`322`	`}`
`323`	`323`	`case el.indexOf('y') !== -1: {`
`324`		`- y = dateSplit[index];`
	`324`	`+ y = dateSplit[index - (formatDate.length - dateSplit.length)];`
`325`	`325`	`break;`
`326`	`326`	`}`
`327`	`327`	`default: {`