[EventManager] updated EventManager sources

Change-Id: I54c157fc2ef340cef0962adf623e47b1d58d294f

1 files changed, 18 insertions, 9 deletions

diff --git a/js/app.ui.js b/js/app.ui.js
index 66e3ca1..1bc9daf 100644
--- a/js/app.ui.js
+++ b/js/app.ui.js
@@ -97,14 +97,17 @@ function Ui() {
 				});
 			});
 			$(".customDuration, #customDuration").on("tap change", function (e) {
-				$("#yes_1").attr('checked', true).checkboxradio('refresh');
-				$.each($('#new_alarm input:radio'), function () {
-					$(this).attr('checked', $(this).val() === 'Yes')
-						.checkboxradio('refresh');
-				});
-				$("#customDuration").removeClass('ui-disabled');
-				$("#customDuration").prop('disabled', false);
-				$("#customDuration").trigger("focus");
+				if ($(this).attr("checked")) {
+					$("#yes_1").attr('checked', true).checkboxradio('refresh');
+					$.each($('#new_alarm input:radio'), function () {
+						$(this).attr('checked', $(this).val() === 'Yes')
+							.checkboxradio('refresh');
+					});
+					$("#customDuration")
+						.removeClass('ui-disabled')
+						.prop('disabled', false)
+						.trigger("focus");
+				}
 			});
 
 			document.addEventListener('webkitvisibilitychange', function (event) {
@@ -122,7 +125,13 @@ function Ui() {
 				}
 			});
 
-			$("input#customDuration").on("input keypress keyup", function (e) {
+			$("input#customDuration").on("keypress",function (e) {
+				if(/[^0-9]/.test(String.fromCharCode(e.keyCode))) {
+					e.preventDefault();
+					e.stopPropagation();
+				}
+			});
+			$("input#customDuration").on("input keyup", function (e) {
 				var val = parseInt($(this).val(), 10),
 					max = parseInt($(this).attr("max"), 10),
 					min = 0;