diff --git a/README.md b/README.md index 78f9e4cf..bc452cbf 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Stories in Ready](https://badge.waffle.io/zhukov/webogram.png?label=ready&title=Ready)](https://waffle.io/zhukov/webogram) ## [Webogram](http://zhukov.github.io/webogram) – UNOFFICIAL Telegram Web App Telegram offers great [apps for mobile communication](https://www.telegram.org). It is based on the [MTProto protocol](https://core.telegram.org/mtproto) and has an [Open API](http://core.telegram.org/api). I personally like Telegram for its speed and cloud-support (that makes a web app possible, unlike in the case of WA and others). diff --git a/app/css/app.css b/app/css/app.css index d5a85481..c9375257 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -944,13 +944,10 @@ a.tg_radio_on:hover i.icon-radio { border-radius: 2px; background: #f2f6fa; } -.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog, .im_dialogs_scrollable_wrap .active a.im_dialog { border-radius: 2px; background-color: #6490b1; } -.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog:hover, -.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog_selected, .im_dialogs_scrollable_wrap .active a.im_dialog:hover, .im_dialogs_scrollable_wrap .active a.im_dialog_selected { background-color: #6490b1; @@ -978,10 +975,6 @@ a.im_dialog_selected .im_dialog_message_text { color: #698192; } -.im_dialog_wrap:active a.im_dialog .im_dialog_chat_from_wrap, -.im_dialog_wrap:active a.im_dialog .im_dialog_message_media, -.im_dialog_wrap:active a.im_dialog .im_dialog_message_service, -.im_dialog_wrap:active a.im_dialog .im_dialog_message_text, .active a.im_dialog .im_dialog_chat_from_wrap, .active a.im_dialog .im_dialog_message_media, .active a.im_dialog .im_dialog_message_service, @@ -1002,7 +995,6 @@ a.im_dialog_selected .im_dialog_message_text { margin-top: 2px; margin-bottom: 2px; } -.im_dialog_wrap:active .im_dialog_peer, .active .im_dialog_peer { color: #FFF; } @@ -1014,7 +1006,6 @@ a.im_dialog_selected .im_dialog_message_text { padding: 3px 4px; margin-top: 4px; } -.im_dialog_wrap:active .im_dialog_badge, .active .im_dialog_badge { color: #428bca; background-color: #fff; @@ -1038,7 +1029,6 @@ a.im_dialog:hover .im_dialog_unread, a.im_dialog_selected .im_dialog_unread { background: #a3c0d4; } -.im_dialog_wrap:active .im_dialog_unread, .active .im_dialog_unread { background-color: #a4c4dd; } @@ -1052,9 +1042,6 @@ a.im_dialog:hover .im_dialog_date, a.im_dialog_selected .im_dialog_date { color: #91a6ba; } -.im_dialog_wrap:active .im_dialog_date, -.im_dialog_wrap:active a.im_dialog:hover .im_dialog_date, -.im_dialog_wrap:active a.im_dialog_selected .im_dialog_date, .active .im_dialog_date, .active a.im_dialog:hover .im_dialog_date, .active a.im_dialog_selected .im_dialog_date { diff --git a/app/css/app_mobile.css b/app/css/app_mobile.css index d379610c..16f42ef4 100644 --- a/app/css/app_mobile.css +++ b/app/css/app_mobile.css @@ -358,18 +358,11 @@ html { .im_dialog_peer { margin-bottom: 5px; } -.im_dialogs_scrollable_wrap a.im_dialog:hover, -.im_dialogs_scrollable_wrap a.im_dialog_selected { - border-top-color: #D6DADE; - border-bottom-color: #D6DADE; -} -.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog, .im_dialogs_scrollable_wrap .active a.im_dialog { border-top-color: #6490b1; border-bottom-color: #6490b1; } -.im_dialogs_scrollable_wrap .active + li a.im_dialog, -.im_dialogs_scrollable_wrap li:hover + li a.im_dialog { +.im_dialogs_scrollable_wrap .active + li a.im_dialog { margin-top: 0; border-top: 0; } diff --git a/app/js/app.js b/app/js/app.js index eb09aec9..1aeba6f7 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/background.js b/app/js/background.js index e3d7722b..b5d0b01a 100644 --- a/app/js/background.js +++ b/app/js/background.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/controllers.js b/app/js/controllers.js index bd147c7f..94db84ba 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE @@ -349,6 +349,9 @@ angular.module('myApp.controllers', []) if ($scope.search === undefined) { $scope.search = {}; } + if ($scope.isEmpty === undefined) { + $scope.isEmpty = {}; + } $scope.phonebookAvailable = PhonebookContactsService.isAvailable(); var offset = 0, diff --git a/app/js/directives.js b/app/js/directives.js index 555efdf4..383d2946 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE @@ -68,7 +68,7 @@ angular.module('myApp.directives', ['myApp.filters']) $scope.$on('dialogs_search_toggle', function () { $(panelWrap).addClass('im_dialogs_panel_search'); $scope.$broadcast('ui_dialogs_search'); - $($window).scrollTop(0); + $($window).scrollTop(0); $timeout(function () { searchField.focus(); }) @@ -511,20 +511,25 @@ angular.module('myApp.directives', ['myApp.filters']) scrollableWrap.scrollHeight; // Some strange Chrome bug workaround $(scrollable).css({bottom: -(sh - st - ch), marginLeft: -Math.ceil(pr / 2)}); - onContentLoaded(function () { - $(scrollableWrap).removeClass('im_history_to_bottom'); - $(scrollable).css({bottom: '', marginLeft: ''}); - scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh; + var upd = function () { + $(scrollableWrap).removeClass('im_history_to_bottom'); + $(scrollable).css({bottom: '', marginLeft: ''}); + scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh; + + updateBottomizer(); + moreNotified = false; - updateBottomizer(); - moreNotified = false; + $timeout(function () { + if (scrollableWrap.scrollHeight != sh) { + $(scrollableWrap).trigger('scroll'); + } + }); - $timeout(function () { - if (scrollableWrap.scrollHeight != sh) { - $(scrollableWrap).trigger('scroll'); - } - }); - }); + clearTimeout(timer); + unreg(); + }, + timer = setTimeout(upd, 0), + unreg = $scope.$on('$viewContentLoaded', upd); }); $scope.$on('ui_history_append', function () { @@ -1350,7 +1355,7 @@ angular.module('myApp.directives', ['myApp.filters']) var onKeyDown = function (event) { var target = event.target; if (target && (target.tagName == 'INPUT' || target.tagName == 'TEXTAREA')) { - return false; + return; } switch (event.keyCode) { diff --git a/app/js/filters.js b/app/js/filters.js index 8cf88074..3ac0a0e4 100644 --- a/app/js/filters.js +++ b/app/js/filters.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/aes_worker.js b/app/js/lib/aes_worker.js index a113b401..508fcb99 100644 --- a/app/js/lib/aes_worker.js +++ b/app/js/lib/aes_worker.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/bin_utils.js b/app/js/lib/bin_utils.js index 0de58f5d..ef44b114 100644 --- a/app/js/lib/bin_utils.js +++ b/app/js/lib/bin_utils.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/config.js b/app/js/lib/config.js index 29dd28d9..a980e946 100644 --- a/app/js/lib/config.js +++ b/app/js/lib/config.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE @@ -21,7 +21,7 @@ Config = window.Config || {}; Config.App = { id: 2496, hash: '8da85b0d5bfe62527e5b244c209159c3', - version: '0.1.7' + version: '0.1.8' }; Config.Modes = { diff --git a/app/js/lib/mtproto.js b/app/js/lib/mtproto.js index a68074c5..f5019ed8 100644 --- a/app/js/lib/mtproto.js +++ b/app/js/lib/mtproto.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/mtproto_wrapper.js b/app/js/lib/mtproto_wrapper.js index d419db7f..a109991d 100644 --- a/app/js/lib/mtproto_wrapper.js +++ b/app/js/lib/mtproto_wrapper.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js index d70ba9ef..b51f0e37 100644 --- a/app/js/lib/ng_utils.js +++ b/app/js/lib/ng_utils.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/pq_worker.js b/app/js/lib/pq_worker.js index 5d8aaf05..b284d7ba 100644 --- a/app/js/lib/pq_worker.js +++ b/app/js/lib/pq_worker.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/sha1_worker.js b/app/js/lib/sha1_worker.js index 7f12d688..06b6e212 100644 --- a/app/js/lib/sha1_worker.js +++ b/app/js/lib/sha1_worker.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/tl_utils.js b/app/js/lib/tl_utils.js index 2b851dc6..5a33c7d8 100644 --- a/app/js/lib/tl_utils.js +++ b/app/js/lib/tl_utils.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/lib/utils.js b/app/js/lib/utils.js index 52f49b42..1b6528d0 100644 --- a/app/js/lib/utils.js +++ b/app/js/lib/utils.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/js/services.js b/app/js/services.js index 5c1a3be1..0c06bba0 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -1,5 +1,5 @@ /*! - * Webogram v0.1.7 - messaging web application for MTProto + * Webogram v0.1.8 - messaging web application for MTProto * https://github.com/zhukov/webogram * Copyright (C) 2014 Igor Zhukov * https://github.com/zhukov/webogram/blob/master/LICENSE diff --git a/app/manifest.json b/app/manifest.json index 41672eef..746de670 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,6 +1,6 @@ { "name": "Telegram UNOFFICIAL", - "version": "0.1.7", + "version": "0.1.8", "short_name": "Webogram", "manifest_version": 2, "app": { diff --git a/app/manifest.webapp b/app/manifest.webapp index 65121e8b..f6c426b5 100644 --- a/app/manifest.webapp +++ b/app/manifest.webapp @@ -1,7 +1,7 @@ { "name": "Webogram", "description": "Webogram – UNOFFICIAL Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram", - "version": "0.1.7", + "version": "0.1.8", "type": "privileged", "launch_path": "/index.html", "developer": { diff --git a/app/partials/changelog_modal.html b/app/partials/changelog_modal.html index b7aab50f..8bde26a4 100644 --- a/app/partials/changelog_modal.html +++ b/app/partials/changelog_modal.html @@ -20,6 +20,18 @@

current version + Version 0.1.8 +

+
+
    +
  • Improved mobile layout
    • +
  • Bugfixes
    • +
+
+
+ +
+

Version 0.1.7

diff --git a/package.json b/package.json index f09faec0..b4d012a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webogram", - "version": "0.1.7", + "version": "0.1.8", "description": "Telegram UNOFFICIAL Web App", "main": "app/index.html", "single-instance": true,