Merge pull request #4357 from jtomaszewski/patch-1

mlynch · mlynch · commit d884ecbbb668 · 2015-12-06T15:03:59.000-06:00
Fix `e.detail.keyboardHeight` undefined error in keyboardAttach directive
diff --git a/js/angular/directive/keyboardAttach.js b/js/angular/directive/keyboardAttach.js
@@ -46,7 +46,7 @@ IonicModule
       }
 
       //for testing
-      var keyboardHeight = e.keyboardHeight || e.detail.keyboardHeight;
+      var keyboardHeight = e.keyboardHeight || (e.detail && e.detail.keyboardHeight);
       element.css('bottom', keyboardHeight + "px");
       scrollCtrl = element.controller('$ionicScroll');
       if (scrollCtrl) {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ IonicModule`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`//for testing`
`49`		`- var keyboardHeight = e.keyboardHeight \|\| e.detail.keyboardHeight;`
	`49`	`+ var keyboardHeight = e.keyboardHeight \|\| (e.detail && e.detail.keyboardHeight);`
`50`	`50`	`element.css('bottom', keyboardHeight + "px");`
`51`	`51`	`scrollCtrl = element.controller('$ionicScroll');`
`52`	`52`	`if (scrollCtrl) {`