merged with master

9 years ago · 7da11188bd
15 changed files with 71 additions and 66 deletions
--- a/app.manifest
+++ b/app.manifest
@ -1,13 +1,11 @@
 CACHE MANIFEST
-# Time: Wed Feb 10 2016 18:51:47 GMT+0000 (GMT)
+# Time: Wed Feb 10 2016 22:30:40 GMT+0300 (MSK)


 CACHE:
 favicon.ico
 favicon_unread.ico
-css/app.css
-css/desktop.css
-css/mobile.css
+js/app.js
 img/Manytabs.png
 img/Manytabs_2x.png
 img/Telegram.png
@ -25,9 +23,21 @@ img/iphone_home120.png
 img/iphone_startup.png
 img/logo_share.png
 img/sound_a.mp3
-js/app.js
+css/app.css
+css/desktop.css
+css/mobile.css
 nacl/mtproto_crypto.nmf
 nacl/mtproto_crypto.pexe
+js/lib/bin_utils.js
+js/lib/crypto_worker.js
+js/lib/polyfill.js
+js/locales/de-de.json
+js/locales/en-us.json
+js/locales/es-es.json
+js/locales/it-it.json
+js/locales/nl-nl.json
+js/locales/pt-br.json
+js/locales/ru-ru.json
 img/changelog/card_wecandoit.png
 img/icons/AboutLogos.png
 img/icons/AboutLogos_2x.png
@ -62,16 +72,6 @@ img/placeholders/UserAvatar7@2x.png
 img/placeholders/UserAvatar8@2x.png
 img/placeholders/VideoThumbConversation.gif
 img/placeholders/VideoThumbModal.gif
-js/lib/bin_utils.js
-js/lib/crypto_worker.js
-js/lib/polyfill.js
-js/locales/de-de.json
-js/locales/en-us.json
-js/locales/es-es.json
-js/locales/it-it.json
-js/locales/nl-nl.json
-js/locales/pt-br.json
-js/locales/ru-ru.json
 vendor/closure/long.js
 vendor/cryptoJS/crypto.js
 vendor/jsbn/jsbn_combined.js
--- a/css/app.css
+++ b/css/app.css
@ -1612,9 +1612,12 @@ img.img_fullsize{margin:0 auto}
 .active .composer_emoji_tooltip_category_car{background-position:-3px -269px}
 .composer_emoji_tooltip_category_grid{background-position:-3px -297px}
 .active .composer_emoji_tooltip_category_grid{background-position:-3px -324px}
-.composer_emoji_tooltip_tabs_wrap{height:275px;position:relative;overflow:hidden}
-.composer_emoji_tooltip_tabs_contents{position:absolute;width:568px;-webkit-transform:translate3d(0,0,0);-moz-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);transition:transform ease-in-out .2s}
-.composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tabs_contents{-webkit-transform:translate3d(-284px,0,0);-moz-transform:translate3d(-284px,0,0);-o-transform:translate3d(-284px,0,0);-ms-transform:translate3d(-284px,0,0);transform:translate3d(-284px,0,0)}
+.composer_emoji_tooltip_tabs_wrap{height:275px;width:284px;position:relative;overflow:hidden}
+.composer_emoji_tooltip_tabs_contents{position:absolute;width:568px}
+.non_msie .composer_emoji_tooltip_tabs_contents{transition:transform ease-in-out .2s;-webkit-transform:translate3d(0,0,0);-moz-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}
+.non_msie .composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tabs_contents{-webkit-transform:translate3d(-284px,0,0);-moz-transform:translate3d(-284px,0,0);-o-transform:translate3d(-284px,0,0);-ms-transform:translate3d(-284px,0,0);transform:translate3d(-284px,0,0)}
+.msie .composer_emoji_tooltip_tabs_contents{margin-left:0;transition:margin-left ease-in-out .2s}
+.msie .composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tabs_contents{margin-left:-284px}
 .composer_emoji_tooltip_tab_emoji_content,.composer_emoji_tooltip_tab_stickers_content{width:284px;height:275px;float:left}
 .composer_emoji_tooltip_content_stickers{position:relative}
 .composer_emoji_tooltip_content_wrap{padding:0 2px 0 8px}
@ -1664,8 +1667,8 @@ span.composer_user_photo .peer_initials{line-height:32px;font-size:14px}
 .composer_sticker_btn:hover{background:#f2f6fa}
 .composer_sticker_image{max-width:60px;max-height:60px;vertical-align:middle}
 .composer_rich_textarea{font-size:12px;margin-bottom:10px;padding:6px;min-height:38px;height:auto;width:auto;max-height:284px;overflow:auto;line-height:17px;border:1px solid #d2dbe3;border-radius:2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-ms-box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;word-wrap:break-word;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}
-.composer_rich_textarea:empty:before{content:attr(placeholder);color:#9aa2ab;display:block;margin-top:-1px;margin-left:1px;pointer-events:none}
-.composer_rich_textarea:empty:active:before,.composer_rich_textarea:empty:focus:before{opacity:.75}
+.composer_rich_textarea:empty::before{content:attr(placeholder);color:#9aa2ab;display:block;margin-top:-1px;margin-left:1px;pointer-events:none}
+.composer_rich_textarea:empty:active::before,.composer_rich_textarea:empty:focus::before{opacity:.75}
 .composer_rich_textarea img{width:20px;height:20px;vertical-align:middle;margin:-3px 0 0}
@-moz-document url-prefix(){.composer_rich_textarea:empty:active:before,.composer_rich_textarea:empty:focus:before{display:none}}
 .composer_rich_textarea:empty:active:before,_:-ms-lang(x){display:none}
@ -1694,6 +1697,8 @@ li a:hover .inline_article_thumb_initials,li.composer_autocomplete_option_active
 .inline_article_description{color:grey;padding-top:4px}
 li a:hover .inline_article_description,li.composer_autocomplete_option_active a .inline_article_description{color:#698192}
 .composer_dropdown>li.inline_result_gif>a,.composer_dropdown>li.inline_result_photo>a{padding:0;line-height:0;display:block;overflow:hidden}
+li.inline_result_gif.composer_autocomplete_option_active a,li.inline_result_photo.composer_autocomplete_option_active a{position:relative}
+li.inline_result_gif.composer_autocomplete_option_active a .inline_result_ind,li.inline_result_photo.composer_autocomplete_option_active a .inline_result_ind{display:block;background:rgba(255,255,255,.3);width:100%;height:100%;position:absolute}
 .inline_result_gif .img_gif_video,.inline_result_photo .inline_result_photo_image{object-fit:cover}
 .inline_result_gif_http,.inline_result_gif_mtproto,.inline_result_photo_http,.inline_result_photo_mtproto{pointer-events:none}
 .error_modal_description{color:#999;padding:5px 0;font-size:13px;line-height:160%}
--- a/js/app.js
+++ b/js/app.js
--- a/js/background.js
+++ b/js/background.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.5.2 - messaging web application for MTProto
+ * Webogram v0.5.3 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/lib/bin_utils.js
+++ b/js/lib/bin_utils.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.5.2 - messaging web application for MTProto
+ * Webogram v0.5.3 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/lib/crypto_worker.js
+++ b/js/lib/crypto_worker.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.5.2 - messaging web application for MTProto
+ * Webogram v0.5.3 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/locales/de-de.json
+++ b/js/locales/de-de.json
@ -474,8 +474,8 @@
    "login_controller_unknown_country": "Unbekannt",
    "message_forwarded_message": "Weitergeleitete Nachricht",
    "message_via_bot": "via {bot}",
-    "message_forwarded_message_mobile": "Weitergeleitet von {from}, {date}",
-    "message_forwarded_via_message_mobile": "Weitergeleitet von {from} via {bot}, {date}",
+    "message_forwarded_message_mobile": "Weitergeleitet von {from}",
+    "message_forwarded_via_message_mobile": "Weitergeleitet von {from} via {bot}",
    "message_attach_audio_message": "Sprachnachricht",
    "message_attach_audio_play": "Abspielen",
    "message_attach_document_open": "Öffnen",
--- a/js/locales/es-es.json
+++ b/js/locales/es-es.json
@ -474,8 +474,8 @@
    "login_controller_unknown_country": "Desconocido",
    "message_forwarded_message": "Mensaje reenviado",
    "message_via_bot": "vía {bot}",
-    "message_forwarded_message_mobile": "Reenviado de {from}, {date}",
-    "message_forwarded_via_message_mobile": "Reenviado de {from} vía {bot}, {date}",
+    "message_forwarded_message_mobile": "Forwarded from {from}",
+    "message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}",
    "message_attach_audio_message": "Mensaje de voz",
    "message_attach_audio_play": "Reproducir",
    "message_attach_document_open": "Abrir",
--- a/js/locales/it-it.json
+++ b/js/locales/it-it.json
@ -474,8 +474,8 @@
    "login_controller_unknown_country": "Sconosciuto",
    "message_forwarded_message": "Messaggio inoltrato",
    "message_via_bot": "via {bot}",
-    "message_forwarded_message_mobile": "Inoltrato da {from},{date}",
-    "message_forwarded_via_message_mobile": "Inoltrato da {from} via {bot}, {date}",
+    "message_forwarded_message_mobile": "Inoltrato da {from}",
+    "message_forwarded_via_message_mobile": "Inoltrato da {from} via {bot}",
    "message_attach_audio_message": "Nota vocale",
    "message_attach_audio_play": "Riproduci",
    "message_attach_document_open": "Apri",
--- a/js/locales/nl-nl.json
+++ b/js/locales/nl-nl.json
@ -474,8 +474,8 @@
    "login_controller_unknown_country": "Onbekend",
    "message_forwarded_message": "Doorgestuurd bericht",
    "message_via_bot": "via {bot}",
-    "message_forwarded_message_mobile": "Doorgestuurd van {from}, {date}",
-    "message_forwarded_via_message_mobile": "Doorgwstuurd van {from} via {bot}, {date}",
+    "message_forwarded_message_mobile": "Forwarded from {from}",
+    "message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}",
    "message_attach_audio_message": "Spraakbericht",
    "message_attach_audio_play": "Afspelen",
    "message_attach_document_open": "Openen",
--- a/js/locales/pt-br.json
+++ b/js/locales/pt-br.json
@ -474,8 +474,8 @@
    "login_controller_unknown_country": "Desconhecido",
    "message_forwarded_message": "Encaminhar mensagem",
    "message_via_bot": "via {bot}",
-    "message_forwarded_message_mobile": "Encaminhado de {from}, {date}",
-    "message_forwarded_via_message_mobile": "Encaminhado de {from} via {bot}, {date}",
+    "message_forwarded_message_mobile": "Encaminhado de {from}",
+    "message_forwarded_via_message_mobile": "Encaminhado de {from} via {bot}",
    "message_attach_audio_message": "Mensagem de voz",
    "message_attach_audio_play": "Tocar",
    "message_attach_document_open": "Abrir",
--- a/js/locales/ru-ru.json
+++ b/js/locales/ru-ru.json
@ -412,15 +412,15 @@
    "im_reply": "Ответить",
    "im_start": "Старт",
    "im_channel_join": "+ Join",
-    "im_channel_mute": "Mute",
-    "im_channel_unmute": "Unmute",
+    "im_channel_mute": "Выкл. звук",
+    "im_channel_unmute": "Вкл. звук",
    "im_reply_loading": "Загрузка{dots}",
    "im_X_forwarded_messages": "{'one': '{} forwarded message', 'other': '{} forwarded messages'}",
    "im_photos_drop_text": "Перетащите сюда фотографии, чтобы отправить их",
    "im_message_field_placeholder": "Напишите сообщение...",
    "im_broadcast_field_placeholder": "Broadcast a message...",
    "im_emoji_tab": "Emoji",
-    "im_stickers_tab": "Stickers",
+    "im_stickers_tab": "Стикер",
    "im_stickers_tab_recent": "Frequently used",
    "im_media_attach_title": "Отправить медиа",
    "im_attach_file_title": "Отправить файл",
@ -474,8 +474,8 @@
    "login_controller_unknown_country": "Неизвестно",
    "message_forwarded_message": "Пересланное сообщение",
    "message_via_bot": "via {bot}",
-    "message_forwarded_message_mobile": "Переслано от {from}, {date}",
-    "message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}, {date}",
+    "message_forwarded_message_mobile": "Forwarded from {from}",
+    "message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}",
    "message_attach_audio_message": "Запись голоса",
    "message_attach_audio_play": "Воспроизвести",
    "message_attach_document_open": "Открыть",
--- a/manifest.json
+++ b/manifest.json
@ -1,7 +1,7 @@
 {
  "name": "Telegram",
  "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.5.2",
+  "version": "0.5.3",
  "short_name": "Telegram",
  "manifest_version": 2,
  "app": {
--- a/manifest.webapp
+++ b/manifest.webapp
@ -1,7 +1,7 @@
 {
  "name": "Telegram",
  "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.5.2",
+  "version": "0.5.3",
  "type": "privileged",
  "launch_path": "/index.html",
  "developer": {
--- a/webogram.appcache
+++ b/webogram.appcache
@ -1,13 +1,11 @@
 CACHE MANIFEST
-# Time: Wed Feb 10 2016 18:51:47 GMT+0000 (GMT)
+# Time: Wed Feb 10 2016 22:30:40 GMT+0300 (MSK)


 CACHE:
 favicon.ico
 favicon_unread.ico
-css/app.css
-css/desktop.css
-css/mobile.css
+js/app.js
 img/Manytabs.png
 img/Manytabs_2x.png
 img/Telegram.png
@ -25,9 +23,21 @@ img/iphone_home120.png
 img/iphone_startup.png
 img/logo_share.png
 img/sound_a.mp3
-js/app.js
+css/app.css
+css/desktop.css
+css/mobile.css
 nacl/mtproto_crypto.nmf
 nacl/mtproto_crypto.pexe
+js/lib/bin_utils.js
+js/lib/crypto_worker.js
+js/lib/polyfill.js
+js/locales/de-de.json
+js/locales/en-us.json
+js/locales/es-es.json
+js/locales/it-it.json
+js/locales/nl-nl.json
+js/locales/pt-br.json
+js/locales/ru-ru.json
 img/changelog/card_wecandoit.png
 img/icons/AboutLogos.png
 img/icons/AboutLogos_2x.png
@ -62,16 +72,6 @@ img/placeholders/UserAvatar7@2x.png
 img/placeholders/UserAvatar8@2x.png
 img/placeholders/VideoThumbConversation.gif
 img/placeholders/VideoThumbModal.gif
-js/lib/bin_utils.js
-js/lib/crypto_worker.js
-js/lib/polyfill.js
-js/locales/de-de.json
-js/locales/en-us.json
-js/locales/es-es.json
-js/locales/it-it.json
-js/locales/nl-nl.json
-js/locales/pt-br.json
-js/locales/ru-ru.json
 vendor/closure/long.js
 vendor/cryptoJS/crypto.js
 vendor/jsbn/jsbn_combined.js