From 4d941520e86525f94d378ef634c547320f1eeeae Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Tue, 21 Jan 2014 23:17:18 +0400 Subject: [PATCH] Improved bad browser handling --- app/index.html | 4 ++-- app/js/controllers.js | 5 ++++- app/js/lib/mtproto.js | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/index.html b/app/index.html index 04de1ceb..fb94d5ed 100644 --- a/app/index.html +++ b/app/index.html @@ -33,12 +33,12 @@ - + - + diff --git a/app/js/controllers.js b/app/js/controllers.js index 24304132..52f4a483 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -61,6 +61,7 @@ angular.module('myApp.controllers', []) $scope.error = {}; }, function (error) { + dLog(error); $scope.progress.enabled = false; dLog('sendCode error', error); switch (error.type) { @@ -71,11 +72,13 @@ angular.module('myApp.controllers', []) }); }, function (error) { $scope.progress.enabled = false; - dLog('checkPhone error', error); switch (error.type) { case 'PHONE_NUMBER_INVALID': $scope.error = {field: 'phone'}; break; + + default: + ErrorService.showSimpleError('Unknown error occured', 'Please check your internet connection or install the latest version of Google Chrome browser.'); } }); } diff --git a/app/js/lib/mtproto.js b/app/js/lib/mtproto.js index 0485e17e..597640c0 100644 --- a/app/js/lib/mtproto.js +++ b/app/js/lib/mtproto.js @@ -2177,7 +2177,7 @@ factory('MtpApiManager', function (AppConfigManager, MtpAuthorizer, MtpNetworker return cachedNetworkers[dcID] = MtpNetworkerFactory.getNetworker(dcID, auth.authKey, auth.serverSalt); }, function (error) { dLog('Get networker error', error, error.stack); - return error; + return $q.reject(error); }); }); }; @@ -2257,6 +2257,8 @@ factory('MtpApiManager', function (AppConfigManager, MtpAuthorizer, MtpNetworker deferred.reject(error); } }); + }, function (error) { + deferred.reject(error); }); return deferred.promise;