diff options
| -rw-r--r-- | LICENSE.Flora | 6 | ||||
| -rw-r--r-- | NOTICE.Flora | 4 | ||||
| -rw-r--r-- | config.xml | 25 | ||||
| -rw-r--r--[-rwxr-xr-x] | icon.png | bin | 17581 -> 13996 bytes | |||
| -rw-r--r-- | js/app.js | 5 | ||||
| -rw-r--r-- | js/app.ui.js | 18 | ||||
| -rw-r--r-- | templates/new_event.tpl | 2 |
7 files changed, 31 insertions, 29 deletions
diff --git a/LICENSE.Flora b/LICENSE.Flora index 9c95663..fd90a36 100644 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, May, 2012 +Version 1.0, April, 2013 http://floralicense.org/license/ @@ -67,8 +67,8 @@ on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. "Tizen Certified Platform" shall mean a software platform that complies -with the standards set forth in the Compatibility Definition Document -and passes the Compatibility Test Suite as defined from time to time +with the standards set forth in the Tizen Compliance Specification +and passes the Tizen Compliance Tests as defined from time to time by the Tizen Technical Steering Group and certified by the Tizen Association or its designated agent. diff --git a/NOTICE.Flora b/NOTICE.Flora deleted file mode 100644 index fdb699a..0000000 --- a/NOTICE.Flora +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. -Please, see the LICENSE file for Flora License terms and conditions. - @@ -1,13 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://sample-web-application.tizen.org/EventManager" version="2.1.0" viewmodes="maximized"> - <tizen:application id="VJTVhzmnwf.EventManager" package="VJTVhzmnwf" required_version="2.1"/> - <content src="index.html"/> - <icon src="icon.png"/> +<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" + id="http://sample-web-application.tizen.org/EventManager" version="2.1.0" + viewmodes="maximized"> + <tizen:application id="VJTVhzmnwf.EventManager" + package="VJTVhzmnwf" required_version="2.1" /> + <content src="index.html" /> + <icon src="icon.png" /> <name>EventManager</name> - <tizen:privilege name="http://tizen.org/privilege/application.launch"/> - <tizen:privilege name="http://tizen.org/privilege/application.read"/> - <tizen:privilege name="http://tizen.org/privilege/calendar.read"/> - <tizen:privilege name="http://tizen.org/privilege/calendar.write"/> - <tizen:privilege name="http://tizen.org/privilege/time"/> - <tizen:setting screen-orientation="portrait" context-menu="disable" background-support="enable" encryption="disable" install-location="auto"/> + <tizen:privilege name="http://tizen.org/privilege/application.launch" /> + <tizen:privilege name="http://tizen.org/privilege/application.read" /> + <tizen:privilege name="http://tizen.org/privilege/calendar.read" /> + <tizen:privilege name="http://tizen.org/privilege/calendar.write" /> + <tizen:privilege name="http://tizen.org/privilege/time" /> + <tizen:setting screen-orientation="portrait" + context-menu="disable" background-support="enable" encryption="disable" + install-location="auto" /> </widget> Binary files differ@@ -94,6 +94,7 @@ var App = null; this.alarmN = this.model.getCalendarAlarm(duration, "EventManager Reminder"); this.alarm = true; } else { + this.alarmN = []; this.alarm = false; } app.ui.alarm.updateDurationLabel(); @@ -157,11 +158,11 @@ var App = null; startDate: this.createTZDateFromString(selectedDate), duration: duration, summary: this.ui.home.getTitle(), + alarms: [], } if (this.alarmN) { - // blocked by api issue - //new_values.alarms = [this.alarmN]; + new_values.alarms = [this.alarmN]; } this.model.updateEvent(app.eventId, new_values); diff --git a/js/app.ui.js b/js/app.ui.js index 3382358..ac69a21 100644 --- a/js/app.ui.js +++ b/js/app.ui.js @@ -77,26 +77,27 @@ function Ui() { $('#events_list').on('click', '.edit_event_btn', function () { var eventId = $(this).parents('.event').data('eventid'), - event = app.model.editEvent(eventId), field, date, duration, key; + event = app.model.editEvent(eventId), field, date, duration, key, prop, + properties = ['summary', 'startDate', 'endDate']; app.ui.new_event.dateResetLock(true); app.eventId = eventId; - for (key in event) { - if (event.hasOwnProperty(key)) { - field = $('#new_event input[name="' + key + '"]'); + for (key in properties) { + prop = properties[key]; + if (event.hasOwnProperty(prop)) { + field = $('#new_event input[name="' + prop + '"]'); if (field.length !== 0) { if (field.attr('type') === 'datetime') { - date = self.TZD2Date(event[key]); + date = self.TZD2Date(event[prop]); field.datetimepicker('value', date); } else { - field.val(event[key]); + field.val(event[prop]); } } } } $('#new_event h1').text('Edit Event'); - $('#add_alarm').hide(); if (event.alarms.length !== 0) { duration = event.alarms[0].before.length; @@ -110,7 +111,6 @@ function Ui() { app.eventId = 0; $('#new_event h1').text('New Event'); $('#title').val(''); - $('#add_alarm').css('display', 'inline-block'); alarm.selectOption(); }); @@ -336,7 +336,7 @@ function Ui() { $(this).attr('checked', parseInt($(this).val(), 10) === val) .checkboxradio('refresh'); }); - this.updateDurationLabel(); + app.switchAlarm(); }, getDuration: function UI_alarm_getDuration() { diff --git a/templates/new_event.tpl b/templates/new_event.tpl index 84893be..b8ae8ea 100644 --- a/templates/new_event.tpl +++ b/templates/new_event.tpl @@ -24,7 +24,7 @@ <input type="datetime" name="endDate" id="demo-date-2" data-format="MMM dd yyyy HH:mm"/> </span> </div> - <label for="title">Alarm</label> + <label for="alarm">Alarm</label> <div> <span id="alarm">-</span> <a id="add_alarm" href="#new_alarm" data-inline="true" data-role="button">change</a> </div> |
