diff options
| author | Piotr Dabrowski <p.dabrowski2@samsung.com> | 2013-09-11 09:03:49 +0200 |
|---|---|---|
| committer | Piotr Dabrowski <p.dabrowski2@samsung.com> | 2013-09-11 09:03:49 +0200 |
| commit | 0e72ac185d67b3fb096bbc646dd46f20a3034f4a (patch) | |
| tree | 5c06621c564c2601aa4275553db959875cc0f418 | |
| parent | caebbf73ea9d5d1ab685a39f64a14421eb50b14b (diff) | |
| download | EventManager-0e72ac185d67b3fb096bbc646dd46f20a3034f4a.tar.gz EventManager-0e72ac185d67b3fb096bbc646dd46f20a3034f4a.tar.bz2 EventManager-0e72ac185d67b3fb096bbc646dd46f20a3034f4a.zip | |
[EventManager] updated EventManager sources
Change-Id: I09b516a1729e8ee69eb34b47f8d43eb1a5997a9a
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | js/app.ui.js | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -7,7 +7,7 @@ <content src="index.html" /> <icon src="icon.png" /> <name>Event Manager</name> - <feature name="http://tizen.org/feature/screen.size.all"/> + <feature name="http://tizen.org/feature/screen.size.normal.720.1280"/> <tizen:privilege name="http://tizen.org/privilege/application.launch" /> <tizen:privilege name="http://tizen.org/privilege/calendar.read" /> <tizen:privilege name="http://tizen.org/privilege/calendar.write" /> diff --git a/js/app.ui.js b/js/app.ui.js index 65c9e2a..4e94b35 100644 --- a/js/app.ui.js +++ b/js/app.ui.js @@ -645,6 +645,7 @@ function Ui() { $('#add-alarm').on('click', app.switchAlarm.bind(app)); // go to alarm selection $('#add_alarm').on('click', function (e) { + app.ui.alarm.disableCustomDuration(); alarm = parseInt($('#alarm').text(), 10); if (alarm === 0) { app.ui.alarm.setValue(0); @@ -652,7 +653,6 @@ function Ui() { app.ui.alarm.setValue(alarm || -1); } e.preventDefault(); - app.ui.alarm.disableCustomDuration(); $.mobile.changePage('#new_alarm'); }); }, @@ -718,7 +718,6 @@ function Ui() { updateDateFormat: function (fast) { var date = tizen.time.getDateFormat(true), time = tizen.time.getTimeFormat(); - $("#title").blur(); if (this.allday.val() === '1') { this.format = "MMM dd yyyy"; this.end.parent().parent().hide(); @@ -736,6 +735,7 @@ function Ui() { this.start.datetimepicker("option", "format", this.format); this.end.datetimepicker("option", "format", this.format); } else { + $("#title").blur(); this.start.datetimepicker("option", "format", this.format) .datetimepicker(); this.end.datetimepicker("option", "format", this.format) |