projects / samples / web / CallLog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 65eeb22)
[CallLog]Updated Private -> RSA
authorji.ji <ji.ji@samsung.com>
Tue, 9 Jul 2013 10:19:54 +0000 (19:19 +0900)
committerji.ji <ji.ji@samsung.com>
Tue, 9 Jul 2013 10:19:54 +0000 (19:19 +0900)
Change-Id: Ief2e114a669012c3a2bae76601bdfb90a3ac4a82

.project patch | blob | history
config.xml patch | blob | history
css/style.css patch | blob | history
index.html patch | blob | history
js/app.js patch | blob | history
js/app.ui.js patch | blob | history
templates/callView.tpl patch | blob | history
templates/callerHistory.tpl patch | blob | history

diff --git a/.project b/.project
index 467793a..0b84754 100644 (file)
--- a/.project
+++ b/.project
@@ -11,11 +11,6 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
                        <name>json.validation.builder</name>
                        <arguments>
                        </arguments>
@@ -40,6 +35,16 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.tizen.web.privilege.nature.PrivilegeBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.tizen.web.editor.css.nature.CSSBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>json.validation.nature</nature>
@@ -48,5 +53,7 @@
                <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
                <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
                <nature>org.tizen.web.project.builder.WebNature</nature>
+               <nature>org.tizen.web.privilege.nature.PrivilegeNature</nature>
+               <nature>org.tizen.web.editor.css.nature.CSSNature</nature>
        </natures>
 </projectDescription>
diff --git a/config.xml b/config.xml
index dfe8b06..b2a6165 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -3,7 +3,7 @@
        <tizen:application id="1I49ZSFY56.CallLog" package="1I49ZSFY56" required_version="2.2"/>
        <content src="index.html"/>
        <icon src="icon.png"/>
-       <name>CallLog</name>
+       <name>Call log</name>
        <tizen:privilege name="http://tizen.org/privilege/application.launch"/>
        <tizen:privilege name="http://tizen.org/privilege/callhistory.read"/>
        <tizen:privilege name="http://tizen.org/privilege/callhistory.write"/>
diff --git a/css/style.css b/css/style.css
index 79009f2..5e00a55 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -54,6 +54,15 @@ li {
        color: #FFF;
 }
 
+.call {
+       -moz-border-radius-bottomleft: 0;
+       -webkit-border-bottom-left-radius: 0;
+       border-bottom-left-radius: 0;
+       -moz-border-radius-bottomright: 0;
+       -webkit-border-bottom-right-radius: 0;
+       border-bottom-right-radius: 0;
+}
+
 .call .callTime {
        font-size: 14px;
        color: #646464;
@@ -181,18 +190,6 @@ li {
        opacity: 0.5;
 }
 
-.exit,.back {
-       background-image: url(../images/exit.png);
-       width: 44px;
-       height: 27px;
-       float: right;
-       border: 0;
-       margin-right: 15px;
-       background-repeat: no-repeat;
-       margin-top: 8px;
-       background-size: 44px;
-}
-
 .cancel {
        width: 64px;
        height: 27px;
@@ -282,7 +279,7 @@ li {
        margin-top: 0px;
        height: 30px;
        width: 40px;
-       padding-left: 10px;
+       padding-left: 4px;
 }
 
 .selectAllBox p {
@@ -352,14 +349,6 @@ li {
        padding: 0px;
 }
 
-#delete {
-       width: 70px;
-}
-
-#delete-toolbar {
-       width: 70px;
-}
-
 .ui-controlbar-s, .ui-controlbar-left, .ui-controlbar-right {
        border: 0px;
 }
@@ -395,4 +384,4 @@ li {
 
 .date.ui-corner-top {
        border-radius: 0;
-}
\ No newline at end of file
+}
diff --git a/index.html b/index.html
index 79ac138..da33ea7 100644 (file)
--- a/index.html
+++ b/index.html
@@ -2,10 +2,10 @@
 <html>
 <head>
        <meta charset="utf-8"/>
-       <meta name="description" content="CallLog Web Sample App"/>
+       <meta name="description" content="Call log Web Sample App"/>
        <meta name="viewport" content="width=360, user-scalable=no"/>
 
-       <title>CallLog</title>
+       <title>Call log</title>
 
        <script src="/usr/share/tizen-web-ui-fw/latest/js/jquery.min.js"></script>
        <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
@@ -15,6 +15,6 @@
        <link rel="stylesheet" type="text/css" href="./css/style.css"/>
 </head>
 <body>
-       <div data-role="page" data-footer-Exist="false" id="callView" data-add-back-btn="header"></div>
+       <div data-role="page" data-footer-Exist="false" id="callView" ></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/js/app.js b/js/app.js
index ab2a1a6..929a27e 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -103,16 +103,20 @@ var App = null;
                                appControl,
                                null,
                                function () {
+                                       app.ui.unlockOptionButtons();
                                },
                                function (e) {
                                        console.error('App_makeCall: CALL service failure', e);
                                        self.ui.showErrorPopup('Call service is unavailable');
+                                       app.ui.unlockOptionButtons();
                                },
                                {
                                        onsuccess: function () {
+                                               app.ui.unlockOptionButtons();
                                        },
                                        onfailure: function (er) {
                                                console.error('Error during call to ' + phoneNumber, er);
+                                               app.ui.unlockOptionButtons();
                                        }
                                }
                        );
@@ -126,7 +130,7 @@ var App = null;
 
                        var self = this,
                                appControl = new tizen.ApplicationControl(
-                                       'http://tizen.org/appcontrol/operation/send_text',
+                                       'http://tizen.org/appcontrol/operation/compose',
                                        'sms:' + phoneNumber
                                );
 
@@ -134,17 +138,21 @@ var App = null;
                                appControl,
                                null,
                                function () {
+                                       app.ui.unlockOptionButtons();
                                },
                                function (e) {
                                        console.error('Message launch error: ', e);
                                        self.ui.showErrorPopup('Message service is unavailable');
+                                       app.ui.unlockOptionButtons();
                                },
                                {
                                        onsuccess: function () {
+                                               app.ui.unlockOptionButtons();
                                        },
                                        onfailure: function (er) {
                                                console.error('Message service launch error: ', er);
                                                self.ui.showErrorPopup('Message service is unavailable');
+                                               app.ui.unlockOptionButtons();
                                        }
                                }
                        );
diff --git a/js/app.ui.js b/js/app.ui.js
index 50da714..651daa3 100644 (file)
--- a/js/app.ui.js
+++ b/js/app.ui.js
@@ -90,6 +90,8 @@ function Ui(contacts) {
                                app.showCallHistory();
                        });
 
+                       $(".ui-scrollview-view").listview();
+
                        $('#historyForCallerView').on('tap', '.ui-btn-back', function (event) {
                                event.preventDefault();
                                event.stopPropagation();
@@ -108,7 +110,6 @@ function Ui(contacts) {
                        $('#historyForCallerView').on('pageshow', function () {
                                $('#content').css('top', '160px');
                                $('#header').css('height', '160px');
-                               $('#delete-toolbar').css('width', '70px');
                                $('#callerListContainer')
                                        .children('.ui-overflow-indicator-top', '.ui-overflow-indicator-bottom')
                                        .hide();
@@ -126,10 +127,6 @@ function Ui(contacts) {
                                        .fadeOut(200);
                        });
 
-                       $(window).on('resize', function () {
-                               $('#delete-toolbar').css('width', '70px');
-                       });
-
                        $('.selectAllBox').children().on('tap', function () {
                                self.selectAll();
                                self.selectAllDetailsEach();
@@ -218,10 +215,12 @@ function Ui(contacts) {
                },
 
                lockOptionButtons: function () {
-                       var buttons = $('#callActionBtn, #smsActionBtn');
-                       buttons.data('activated', true);
+                       $('#callActionBtn, #smsActionBtn').data('activated', true);
+               },
+
+               unlockOptionButtons: function () {
                        setTimeout(function () {
-                               buttons.data('activated', false);
+                               $('#callActionBtn, #smsActionBtn').data('activated', false);
                        }, 2000);
                },
 
@@ -454,6 +453,11 @@ function Ui(contacts) {
                                .empty()
                                .append(elements);
 
+                       /* workaround solution for not auto refreshing list view*/
+                       setTimeout(function () {
+                               $(".ui-scrollview-view").listview().listview('refresh');
+                       }, 0);
+
                        /* workaround for registering call during working app in removeMode */
                        if (this.removeMode) {
                                if ($('#selectAllDetails').attr('checked')){
@@ -463,9 +467,6 @@ function Ui(contacts) {
                                }
                                $('#forCallerList .toRemove').show()
                        }
-
-                       /* workaround for UIFW & webkit scroll*/
-                       $.mobile.activePage.css('min-height', 0);
                },
 
                /**
@@ -685,8 +686,8 @@ function Ui(contacts) {
                },
 
                scrollToBottom: function () {
-                       var scrollView = $(".ui-scrollview-view");
-                       scrollView.css("-webkit-transform", "translate3d(0px, -" + scrollView.height() + "px, 0px)");
+                       $(".ui-scrollview-view")
+                               .css("-webkit-transform", "translate3d(0px, -" + scrollView.height() + "px, 0px)");
                },
 
                onVisibilityChange: function () {
diff --git a/templates/callView.tpl b/templates/callView.tpl
index 66c20d1..d9d9c96 100644 (file)
--- a/templates/callView.tpl
+++ b/templates/callView.tpl
@@ -1,6 +1,6 @@
        <div data-role="page" id="callView" data-add-back-btn="header">
                <div data-role="header" id="page-header" data-position="fixed">
-                       <h1>Call Log</h1>
+                       <h1>Call log</h1>
                </div>
                <div data-role="content">
                        <ul data-role="listview" id="calllogList" data-filter="true" data-position="fixed" data-inset="true"></ul>
diff --git a/templates/callerHistory.tpl b/templates/callerHistory.tpl
index a868ae2..c5df242 100644 (file)
--- a/templates/callerHistory.tpl
+++ b/templates/callerHistory.tpl
@@ -1,6 +1,6 @@
-       <div data-role="page" id="historyForCallerView"  data-add-back-btn="header">
+       <div data-role="page" id="historyForCallerView">
                <div data-role="header" data-position="fixed" id="header">
-                       <h1>History For Caller</h1>
+                       <h1>History for caller</h1>
                        <div class="contact">
                                <div class="infoContainer">
                                        <div class="photo"></div>
Domain: Applications / Web Sample;