Merge branch 'master' of https://github.com/zhukov/webogram

Conflicts:
	app/js/directives.js

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).

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 {

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 .active + li a.im_dialog {
-.im_dialogs_scrollable_wrap li:hover + li a.im_dialog {
   margin-top: 0;
   border-top: 0;
 }

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * 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,

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE
@@ -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 () {
+        var upd = function () {
-          $(scrollableWrap).removeClass('im_history_to_bottom');
+            $(scrollableWrap).removeClass('im_history_to_bottom');
-          $(scrollable).css({bottom: '', marginLeft: ''});
+            $(scrollable).css({bottom: '', marginLeft: ''});
-          scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh;
+            scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh;
             
-          updateBottomizer();
+            updateBottomizer();
-          moreNotified = false;
+            moreNotified = false;
 
-          $timeout(function () {
+            $timeout(function () {
-            if (scrollableWrap.scrollHeight != sh) {
+              if (scrollableWrap.scrollHeight != sh) {
-              $(scrollableWrap).trigger('scroll');
+                $(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) {

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * 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 = {

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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 <igor.beatle@gmail.com>
  * https://github.com/zhukov/webogram/blob/master/LICENSE

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": {

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": {

app/partials/changelog_modal.html

@@ -20,6 +20,18 @@
       <div class="modal_section changelog_version_wrap">
         <h3 class="modal_section_header changelog_version_title">
           <span class="pull-right">current version</span>
+          Version 0.1.8
+        </h3>
+        <div class="modal_section_body changelog_version_changes">
+          <ul class="list-unstyled changelog_version_changes_list">
+            <li>Improved mobile layout</li>
+            <li>Bugfixes</li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="modal_section changelog_version_wrap">
+        <h3 class="modal_section_header changelog_version_title">
           Version 0.1.7
         </h3>
         <div class="modal_section_body changelog_version_changes">

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,