Merge branch 'master' into extract-mobile-version-449

app/css/app.css

@@ -154,6 +154,10 @@ input[type="number"] {
 .btn-link.dropdown-toggle:hover {
   background: none;
 }
+.btn-link.dropdown-toggle:active {
+  outline: none;
+  box-shadow: none;
+}
 
 .tg_page_head .navbar-quick-nav,
 .tg_page_head .navbar-toggle {

app/js/controllers.js

@@ -716,7 +716,7 @@ angular.module('myApp.controllers', [])
     IdleManager.start();
     StatusManager.start();
 
-    $scope.history = [];
+    $scope.peerHistories = [];
     $scope.skippedHistory = false;
     $scope.selectedMsgs = {};
     $scope.selectedCount = 0;
@@ -744,6 +744,7 @@ angular.module('myApp.controllers', [])
     $scope.$on('history_return_recent', returnToRecent);
 
     var peerID,
+        peerHistory = false,
         hasMore = false,
         hasLess = false,
         maxID = 0,
@@ -786,6 +787,47 @@ angular.module('myApp.controllers', [])
       }
     }
 
+    function historiesQueuePush (peerID) {
+      var pos = -1,
+          maxLen = 10,
+          i,
+          history,
+          diff;
+
+      for (i = 0; i < $scope.peerHistories.length; i++) {
+        if ($scope.peerHistories[i].peerID == peerID) {
+          pos = i;
+          break;
+        }
+      }
+      if (pos > -1) {
+        history = $scope.peerHistories[pos];
+        if (pos) {
+          $scope.peerHistories.splice(pos, 1);
+          $scope.peerHistories.unshift(history);
+        }
+        return history;
+      }
+      history = {peerID: peerID, messages: []};
+      $scope.peerHistories.unshift(history);
+      diff = $scope.peerHistories.length - maxLen;
+      if (diff > 0) {
+        $scope.peerHistories.splice(maxLen - 1, diff);
+      }
+
+      return history;
+    }
+
+    function historiesQueueFind (peerID) {
+      var i;
+      for (i = 0; i < $scope.peerHistories.length; i++) {
+        if ($scope.peerHistories[i].peerID == peerID) {
+          return $scope.peerHistories[i];
+        }
+      }
+      return false;
+    }
+
     function updateHistoryPeer(preload) {
       var peerData = AppPeersManager.getPeer(peerID);
       // console.log('update', preload, peerData);
@@ -794,7 +836,7 @@ angular.module('myApp.controllers', [])
         return false;
       }
 
-      $scope.history = [];
+      peerHistory = historiesQueuePush(peerID);
 
       safeReplaceObject($scope.historyPeer, {
         id: peerID,
@@ -810,14 +852,17 @@ angular.module('myApp.controllers', [])
         $scope.historyState.typing.splice(0, $scope.historyState.typing.length);
         $scope.$broadcast('ui_peer_change');
         $scope.$broadcast('ui_history_change');
-        safeReplaceObject($scope.state, {loaded: true});
+        safeReplaceObject($scope.state, {loaded: true, empty: !peerHistory.messages.length});
       }
     }
 
     function messageFocusHistory () {
-      var i, found = false;
-      for (i = 0; i < $scope.history.length; i++) {
-        if ($scope.curDialog.messageID == $scope.history[i].id) {
+      var i,
+          found = false,
+          history = historiesQueueFind();
+
+      for (i = 0; i < history.messages.length; i++) {
+        if ($scope.curDialog.messageID == history.messages[i].id) {
           found = true;
           break;
         }
@@ -848,7 +893,7 @@ angular.module('myApp.controllers', [])
         for (i = historyResult.history.length - 1; i >= 0; i--) {
           id = historyResult.history[i];
           if (id > minID) {
-            $scope.history.push(AppMessagesManager.wrapForHistory(id));
+            peerHistory.messages.push(AppMessagesManager.wrapForHistory(id));
           }
         }
 
@@ -856,7 +901,8 @@ angular.module('myApp.controllers', [])
           minID = historyResult.history.length >= backLimit
                     ? historyResult.history[0]
                     : 0;
-          AppMessagesManager.regroupWrappedHistory($scope.history, -backLimit);
+          AppMessagesManager.regroupWrappedHistory(peerHistory.messages, -backLimit);
+          delete $scope.state.empty;
           $scope.$broadcast('ui_history_append');
         } else {
           minID = 0;
@@ -882,15 +928,16 @@ angular.module('myApp.controllers', [])
         if (curJump != jump || curMoreJump != moreJump) return;
 
         angular.forEach(historyResult.history, function (id) {
-          $scope.history.unshift(AppMessagesManager.wrapForHistory(id));
+          peerHistory.messages.unshift(AppMessagesManager.wrapForHistory(id));
         });
 
         hasMore = historyResult.count === null ||
-                  historyResult.history.length && $scope.history.length < historyResult.count;
+                  historyResult.history.length && peerHistory.messages.length < historyResult.count;
 
         if (historyResult.history.length) {
           maxID = historyResult.history[historyResult.history.length - 1];
-          AppMessagesManager.regroupWrappedHistory($scope.history, historyResult.history.length + 1);
+          AppMessagesManager.regroupWrappedHistory(peerHistory.messages, historyResult.history.length + 1);
+          delete $scope.state.empty;
           $scope.$broadcast('ui_history_prepend');
         }
       });
@@ -903,6 +950,8 @@ angular.module('myApp.controllers', [])
       $scope.skippedHistory = hasLess = false;
       maxID = 0;
       minID = 0;
+      peerHistory = historiesQueuePush(peerID);
+
 
       var limit = 0, backLimit = 0;
 
@@ -917,6 +966,9 @@ angular.module('myApp.controllers', [])
       else if (Config.Mobile) {
         limit = 20;
       }
+      else if (peerHistory.messages.length > 0) {
+        limit = Math.min(20, peerHistory.messages.length);
+      }
 
       var curJump = ++jump,
           inputMediaFilter = $scope.historyFilter.mediaType && {_: inputMediaFilters[$scope.historyFilter.mediaType]},
@@ -929,6 +981,8 @@ angular.module('myApp.controllers', [])
       getMessagesPromise.then(function (historyResult) {
         if (curJump != jump) return;
 
+        var fetchedLength = historyResult.history.length;
+
         minID = (historyResult.unreadSkip || maxID && historyResult.history.indexOf(maxID) >= backLimit - 1)
                   ? historyResult.history[0]
                   : 0;
@@ -936,22 +990,22 @@ angular.module('myApp.controllers', [])
 
         $scope.skippedHistory = hasLess = minID > 0;
         hasMore = historyResult.count === null ||
-                  historyResult.history.length && historyResult.history.length < historyResult.count;
+                  fetchedLength && fetchedLength < historyResult.count;
 
         updateHistoryPeer();
-        safeReplaceObject($scope.state, {loaded: true});
+        safeReplaceObject($scope.state, {loaded: true, empty: !fetchedLength});
 
-        $scope.history = [];
+        peerHistory.messages = [];
         angular.forEach(historyResult.history, function (id) {
           var message = AppMessagesManager.wrapForHistory(id);
           if ($scope.skippedHistory) {
             delete message.unread;
           }
-          $scope.history.push(message);
+          peerHistory.messages.push(message);
         });
-        $scope.history.reverse();
+        peerHistory.messages.reverse();
 
-        AppMessagesManager.regroupWrappedHistory($scope.history);
+        AppMessagesManager.regroupWrappedHistory(peerHistory.messages);
 
         if (historyResult.unreadOffset) {
           $scope.historyUnreadAfter = historyResult.history[historyResult.unreadOffset - 1];
@@ -972,7 +1026,7 @@ angular.module('myApp.controllers', [])
 
     function showEmptyHistory () {
       safeReplaceObject($scope.state, {notSelected: true});
-      $scope.history = [];
+      peerHistory = false;
       hasMore = false;
 
       $scope.$broadcast('ui_history_change');
@@ -1006,16 +1060,16 @@ angular.module('myApp.controllers', [])
           var dir = lastSelectID > messageID,
               i, startPos, curMessageID;
 
-          for (i = 0; i < $scope.history.length; i++) {
-            if ($scope.history[i].id == lastSelectID) {
+          for (i = 0; i < peerHistory.messages.length; i++) {
+            if (peerHistory.messages[i].id == lastSelectID) {
               startPos = i;
               break;
             }
           }
 
           i = startPos;
-          while ($scope.history[i] &&
-                 (curMessageID = $scope.history[i].id) != messageID) {
+          while (peerHistory.messages[i] &&
+                 (curMessageID = peerHistory.messages[i].id) != messageID) {
             if (!$scope.selectedMsgs[curMessageID]) {
               $scope.selectedMsgs[curMessageID] = true;
               $scope.selectedCount++;
@@ -1093,7 +1147,8 @@ angular.module('myApp.controllers', [])
 
     function toggleMedia (mediaType) {
       $scope.historyFilter.mediaType = mediaType || false;
-      $scope.history = [];
+      peerHistory.messages = [];
+      $scope.state.empty = true;
       loadHistory();
     }
 
@@ -1113,7 +1168,12 @@ angular.module('myApp.controllers', [])
 
     var typingTimeouts = {};
     $scope.$on('history_append', function (e, addedMessage) {
-      if (addedMessage.peerID == $scope.curDialog.peerID) {
+      var history = historiesQueueFind(addedMessage.peerID);
+      if (!history) {
+        return;
+      }
+      var curPeer = addedMessage.peerID == $scope.curDialog.peerID;
+      if (curPeer) {
         if ($scope.historyFilter.mediaType || $scope.skippedHistory) {
           if (addedMessage.my) {
             returnToRecent();
@@ -1122,10 +1182,14 @@ angular.module('myApp.controllers', [])
           }
           return;
         }
-        // console.log('append', addedMessage);
-        // console.trace();
-        $scope.history.push(AppMessagesManager.wrapForHistory(addedMessage.messageID));
-        AppMessagesManager.regroupWrappedHistory($scope.history, -3);
+        delete $scope.state.empty;
+      }
+      // console.log('append', addedMessage);
+      // console.trace();
+      history.messages.push(AppMessagesManager.wrapForHistory(addedMessage.messageID));
+      AppMessagesManager.regroupWrappedHistory(history.messages, -3);
+
+      if (curPeer) {
         $scope.historyState.typing.splice(0, $scope.historyState.typing.length);
         $scope.$broadcast('ui_history_append_new', {my: addedMessage.my});
         if (addedMessage.my) {
@@ -1142,22 +1206,32 @@ angular.module('myApp.controllers', [])
     });
 
     $scope.$on('history_delete', function (e, historyUpdate) {
-      if (historyUpdate.peerID == $scope.curDialog.peerID) {
-        var newHistory = [];
+      var history = historiesQueueFind(historyUpdate.peerID);
+      if (!history) {
+        return;
+      }
+      var newMessages = [],
+          i;
 
-        for (var i = 0; i < $scope.history.length; i++) {
-          if (!historyUpdate.msgs[$scope.history[i].id]) {
-            newHistory.push($scope.history[i]);
-          }
-        };
-        $scope.history = newHistory;
-        AppMessagesManager.regroupWrappedHistory($scope.history);
+      for (i = 0; i < history.messages.length; i++) {
+        if (!historyUpdate.msgs[history.messages[i].id]) {
+          newMessages.push(history.messages[i]);
+        }
+      };
+      history.messages = newMessages;
+      AppMessagesManager.regroupWrappedHistory(history.messages);
+      if (historyUpdate.peerID == $scope.curDialog.peerID) {
+        $scope.state.empty = !newMessages.length;
       }
     });
 
     $scope.$on('dialog_flush', function (e, dialog) {
-      if (dialog.peerID == $scope.curDialog.peerID) {
-        $scope.history = [];
+      var history = historiesQueueFind(dialog.peerID);
+      if (history) {
+        history.messages = [];
+        if (dialog.peerID == $scope.curDialog.peerID) {
+          $scope.state.empty = true;
+        }
       }
     });
 

app/js/directives.js

@@ -505,10 +505,10 @@ angular.module('myApp.directives', ['myApp.filters'])
       function changeScroll () {
         var unreadSplit, focusMessage;
 
-        if (focusMessage = $('.im_message_focus', scrollableWrap)[0]) {
+        if (focusMessage = $('.im_message_focus:visible', scrollableWrap)[0]) {
           scrollableWrap.scrollTop = Math.max(0, focusMessage.offsetTop - Math.floor(scrollableWrap.clientHeight / 2) + 26);
           atBottom = false;
-        } else if (unreadSplit = $('.im_message_unread_split', scrollableWrap)[0]) {
+        } else if (unreadSplit = $('.im_message_unread_split:visible', scrollableWrap)[0]) {
           scrollableWrap.scrollTop = Math.max(0, unreadSplit.offsetTop - 52);
           atBottom = false;
         } else {

app/partials/desktop/changelog_modal.html

@@ -24,15 +24,16 @@
         </h3>
         <div class="modal_section_body changelog_version_changes">
           <ul class="list-unstyled changelog_version_changes_list">
-            <li>Added online statuses automatic update</li>
-            <li>Fixed scrollbar invalid width bug</li>
-            <li>[Desktop] Added phone country detection</li>
+            <li>Log in codes may be received in other Telegram apps</li>
+            <li>Partner's online status updates automatically</li>
+            <li>Added support for non-english hashtags in messages</li>
+            <li>Fixed invalid scrollbar width bug</li>
+            <li>[Desktop] Added automatic country code detection</li>
             <li>[FirefoxOS] Improved PUSH-notifications for &lt;= 1.1</li>
             <li>[FirefoxOS] Fixed emoji in notifications</li>
             <li>[FirefoxOS] Fixed attachment bug for &lt;= 1.1</li>
             <li>[FirefoxOS] Added phonebook permissions handling</li>
             <li>[FirefoxOS] Added ability to share Gallery photos in Telegram</li>
-            <li>Supported international hashtags in messages</li>
           </ul>
         </div>
       </div>

app/partials/desktop/im.html

@@ -157,14 +157,17 @@
 
               <div class="im_history_scrollable">
                   <div class="im_history" ng-class="{im_history_selectable: historyState.selectActions}">
-                    <div ng-if="!history.length"  class="im_history_empty" ng-switch="state.mayBeHasMore" my-vertical-position="0.25" padding="true">
+                    <div ng-if="state.empty"  class="im_history_empty" ng-switch="state.mayBeHasMore" my-vertical-position="0.25" padding="true">
                       <span ng-switch-when="true">Loading history<span my-loading-dots></span></span>
                       <span ng-switch-default>No messages here yet...</span>
                     </div>
 
                     <div class="im_history_messages" ng-class="{im_history_messages_group: historyPeer.id < 0}">
-                      <div class="im_history_message_wrap" my-message ng-repeat="historyMessage in history"></div>
+                      <div ng-show="peerHistory.peerID == historyPeer.id" ng-repeat="peerHistory in peerHistories">
+                        <div class="im_history_message_wrap" my-message ng-repeat="historyMessage in peerHistory.messages"></div>
+                      </div>
                     </div>
+
                   </div>
 
                   <div class="im_history_typing_wrap">