[CallLog] updated CallLog sources
authorPiotr Dabrowski <p.dabrowski2@samsung.com>
Thu, 11 Jul 2013 08:17:46 +0000 (10:17 +0200)
committerPiotr Dabrowski <p.dabrowski2@samsung.com>
Thu, 11 Jul 2013 08:17:46 +0000 (10:17 +0200)
Change-Id: Idb3b6785cc24ebc32f08e36bf54d012de6505946

js/app.js
js/app.ui.js

index 929a27e..86a8711 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -103,20 +103,17 @@ 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();
+                                       console.error('Call to ' + phoneNumber + ' failed. Call service is unavailable.', e);
+                                       self.ui.showErrorPopup('Call failed. Call service is unavailable.');
                                },
                                {
                                        onsuccess: function () {
-                                               app.ui.unlockOptionButtons();
                                        },
-                                       onfailure: function (er) {
-                                               console.error('Error during call to ' + phoneNumber, er);
-                                               app.ui.unlockOptionButtons();
+                                       onfailure: function (e) {
+                                               console.log('App_makeCall: Call to ' + phoneNumber + ' failed. Call service was busy.', e);
+                                               self.ui.showErrorPopup('Call failed. Call service was busy.');
                                        }
                                }
                        );
index 651daa3..9706ef4 100644 (file)
@@ -144,29 +144,13 @@ function Ui(contacts) {
                        });
 
                        $('#smsActionBtn').on('tap', function (event) {
-                               event.preventDefault();
-                               event.stopPropagation();
-                               if ($(this).data('activated')) {
-                                       return false;
-                               }
-
-                               self.lockOptionButtons();
                                self.hideCheckboxes();
                                app.sendSms($('#forCallerList').data('remoteParty'));
                        });
 
                        $('#callActionBtn').on("tap", function (event) {
-                               event.preventDefault();
-                               event.stopPropagation();
-                               if ($(this).data('activated')) {
-                                       return false;
-                               }
-
-                               self.lockOptionButtons();
                                self.hideCheckboxes();
                                app.makeCall($('#forCallerList').data('remoteParty'));
-
-                               return false;
                        });
 
                        $('#deleteActionBtn').on('click', function () {
@@ -214,16 +198,6 @@ function Ui(contacts) {
                        self.onVisibilityChange();
                },
 
-               lockOptionButtons: function () {
-                       $('#callActionBtn, #smsActionBtn').data('activated', true);
-               },
-
-               unlockOptionButtons: function () {
-                       setTimeout(function () {
-                               $('#callActionBtn, #smsActionBtn').data('activated', false);
-                       }, 2000);
-               },
-
                addEventsForCallerListCheckboxes: function Ui_addEventsForCallerListCheckboxes() {
                        var self = this;
                        $('#forCallerList :checkbox').on('change', function (event) {