From 18530440ef0e39086da70905a051930abe6afb20 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Wed, 19 Mar 2014 13:01:15 +0400 Subject: [PATCH] merged with master --- app.manifest | 4 ++++ index.html | 4 ++-- js/services.js | 2 +- js/templates.js | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 app.manifest diff --git a/app.manifest b/app.manifest new file mode 100644 index 00000000..a6f40c55 --- /dev/null +++ b/app.manifest @@ -0,0 +1,4 @@ +CACHE MANIFEST + +NETWORK: +* diff --git a/index.html b/index.html index 4e23df0d..d1ffecab 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/js/services.js b/js/services.js index 65fd54f2..77cd672e 100644 --- a/js/services.js +++ b/js/services.js @@ -1491,7 +1491,7 @@ angular.module('myApp.services', []) notification.image = notificationPhoto.placeholder; notification.key = 'msg' + message.id; - if (notificationPhoto.location) { + if (notificationPhoto.location && !notificationPhoto.location.empty) { MtpApiFileManager.downloadSmallFile(notificationPhoto.location, notificationPhoto.size).then(function (url) { notification.image = url; diff --git a/js/templates.js b/js/templates.js index 9f5e8419..0f933de4 100644 --- a/js/templates.js +++ b/js/templates.js @@ -5,7 +5,7 @@ $templateCache.put("partials/contacts_modal.html","
\n\n
\n
\n {{dialogMessage.date | dateOrTime}}\n
\n 0\"\n ng-bind=\"dialogMessage.unreadCount\"\n >\n \n
\n\n
\n \n
\n\n
\n\n
\n \n \n \n 0\" ng-bind-html=\"dialogMessage.peerData.rFullName\">\n
\n\n
\n \n You{{((dialogMessage.out || dialogMessage.peerID < 0) && (dialogMessage.message.length || dialogMessage.media && dialogMessage.media._ != \'messageMediaEmpty\')) ? \':\' : \'\'}}\n \n\n \n Photo\n Video\n Document\n Audio\n Location\n Contact\n \n\n \n created the group \n changed group name\n changed group photo\n removed group photo\n\n \n \n invited \n \n \n returned to group\n \n \n\n \n \n kicked \n \n \n left group\n \n \n \n\n \n
\n\n
\n\n"); $templateCache.put("partials/error_modal.html","
\n\n
\n Close\n

{{title}}

\n
\n\n\n
\n\n
\n {{description}}\n
\n\n
\n\n
"); $templateCache.put("partials/head.html","
\n
\n
\n
\n \n \n \n
\n\n\n
\n\n
    \n
  • Waiting for network
    • \n
  • Retry
    • \n
  • Connecting
    • \n
\n\n \n\n
\n
\n
\n
"); -$templateCache.put("partials/im.html","
\n\n
\n\n
\n\n
\n
\n \n \n
\n
\n
\n
\n
    \n
  • \n
\n
\n
\n
\n
\n\n
\n
No history to display
\n
Loading history
\n\n
\n
\n\n
\n\n
\n
\n\n Info\n Edit\n\n
\n Media\n \n
\n \n Show all messages\n 0\">+{{missedCount}}\n \n\n

\n Photos \n Videos \n Documents \n

\n\n

\n \n \n \n \n \n

\n\n

0\" ng-click=\"showPeerInfo()\">\n \n {{historyPeer.data | userStatus}}\n

\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n
No messages to display
\n
\n
\n\n
\n
\n is typing\n
\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n
\n \n Clear History\n \n \n Cancel\n \n
\n \n Forward 0\" ng-bind=\"selectedCount\">\n \n Delete 0\" ng-bind=\"selectedCount\">\n \n
\n
\n\n
\n\n
\n\n
\n
\n \n 0 && historyPeer.data.status._ == \'userStatusOnline\'\">\n
\n
\n \n
\n
\n
Drop photos here to send
\n \n\n
\n \n \n
\n\n
\n \n \n
\n\n\n
\n \n
\n\n \n
\n
\n\n
\n\n
\n\n
\n\n
\n
\n\n
\n\n
\n\n\n
\n\n
\n Telegram alpha by izhukov & toberg\n
\n\n
\n\n"); +$templateCache.put("partials/im.html","
\n\n
\n\n
\n\n
\n
\n \n \n
\n
\n
\n
\n
    \n
  • \n
\n
\n
\n
\n
\n\n
\n
No history to display
\n
Loading history
\n\n
\n
\n\n
\n\n
\n
\n\n Info\n Edit\n\n
\n Media\n \n
\n \n Show all messages\n 0\">+{{missedCount}}\n \n\n

\n Photos \n Videos \n Documents \n

\n\n

\n \n \n \n \n \n

\n\n

0\" ng-click=\"showPeerInfo()\">\n \n {{historyPeer.data | userStatus}}\n

\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n
No messages to display
\n
\n
\n\n
\n
\n is typing\n
\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n
\n \n Clear History\n \n \n Cancel\n \n
\n \n Forward 0\" ng-bind=\"selectedCount\">\n \n Delete 0\" ng-bind=\"selectedCount\">\n \n
\n
\n\n
\n\n
\n\n
\n
\n \n 0 && historyPeer.data.status._ == \'userStatusOnline\'\">\n
\n
\n \n
\n
\n
Drop photos here to send
\n \n\n
\n \n \n
\n\n
\n \n \n
\n\n\n
\n \n
\n\n \n
\n
\n\n
\n\n
\n\n
\n\n
\n
\n\n
\n\n
\n\n\n
\n\n
\n Telegram alpha by izhukov & toberg\n
\n\n
\n\n"); $templateCache.put("partials/login.html","
\n\n\n
\n
{{ error.message }}
\n
\n

Sign in

\n

Please enter your full phone number with country code.

\n\n
\n \n \n
\n \n
\n\n
\n

{{ credentials.phone_number | phoneNumber }} (edit)

\n

We have sent you a code via SMS.
Please enter it below.

\n\n

\n 0\">Telegram will call you in {{callPending.remaining | duration}}\n Telegram is calling you\n Telegram dialed your number\n

\n\n
\n \n \n
\n\n \n
\n
\n"); $templateCache.put("partials/message.html","
\n \n \n
\n\n
\n\n\n
\n\n
\n
\n\n \n\n \n \n created the group «{{historyMessage.action.title}}»\n \n \n changed group name to «{{historyMessage.action.title}}»\n \n \n changed group photo\n \n \n removed group photo\n \n \n \n invited \n \n \n returned to group\n \n \n \n \n kicked \n \n \n left group\n \n \n\n \n unsupported action {{historyMessage.action}}\n \n \n\n
\n\n \n \n \n\n
\n\n
\n
\n \n
\n\n \n \n \n \n\n \n \n \n
\n {{historyMessage.date | dateOrTime}}\n
\n\n
\n\n 0\">\n \n\n\n
\n Forwarded message from , {{historyMessage.fwd_date | dateOrTime}}\n
\n\n
\n\n \n \n \n\n \n \n
\n {{historyMessage.media.video.duration | duration}}\n \n
\n \n\n
\n \n \n
\n \n
\n \n\n
\n
\n \n {{historyMessage.media.document.file_name}}\n \n \n {{historyMessage.media.document.size | formatSize}}\n \n \n {{historyMessage.media.document.progress | formatSizeProgress}}\n \n
\n
\n Download\n Open\n
\n
\n
\n
\n \n {{historyMessage.media.document.progress.percent}}% Complete (success)\n \n
\n
\n
\n
\n
\n\n\n
\n \n \n \n \n\n
\n
\n \n Voice message\n \n \n {{historyMessage.media.audio.duration | duration}}\n \n \n {{historyMessage.media.audio.progress | formatSizeProgress}}\n \n
\n
\n Play\n
\n
\n
\n
\n \n {{historyMessage.media.audio.progress.percent}}% Complete (success)\n \n
\n
\n
\n
\n \n
\n
\n
\n\n \n \n \n\n
\n \n \n \n
\n {{historyMessage.media.first_name}} {{historyMessage.media.last_name}}\n
\n
\n {{historyMessage.media.phone_number}}\n
\n
\n\n
\n \n
\n
\n \n {{historyMessage.media.file_name}}\n \n \n {{historyMessage.media.progress | formatSizeProgress}}\n \n
\n
\n
\n
\n \n {{historyMessage.media.progress.percent}}% Complete (success)\n \n
\n
\n
\n
\n
\n\n\n
\n\n
\n
\n\n
\n
\n\n
\n\n"); $templateCache.put("partials/peer_select.html","
\n\n
\n Close\n

Select conversation

\n
\n\n
\n\n
\n
\n \n \n
\n
\n
\n
\n
    \n
  • \n
\n
\n
\n
\n
\n\n
\n\n
");