Browse Source

Bugifxes

master
Igor Zhukov 5 years ago
parent
commit
4e31501763
  1. 3
      app/js/controllers.js
  2. 1
      app/js/locales/en-us.json
  3. 4
      app/less/desktop.less
  4. 2
      app/partials/desktop/embed_modal.html
  5. 2
      app/partials/desktop/message_attach_webpage.html
  6. 6
      app/partials/desktop/message_media.html
  7. 2
      app/partials/desktop/reply_markup.html
  8. 2
      app/partials/mobile/settings_modal.html

3
app/js/controllers.js

@ -951,11 +951,14 @@ angular.module('myApp.controllers', ['myApp.i18n'])
function getDialogs (force) {
var curJump = ++jump
if (searchTimeoutPromise) {
$timeout.cancel(searchTimeoutPromise)
}
if (searchMessages) {
searchTimeoutPromise = (force || maxID) ? $q.when() : $timeout(angular.noop, 500)
return searchTimeoutPromise.then(function () {
searchTimeoutPromise = false;
var searchPeerID = $scope.searchPeer || false
return AppMessagesManager.getSearch(searchPeerID, $scope.search.query, {_: 'inputMessagesFilterEmpty'}, maxID).then(function (result) {
if (curJump != jump) {

1
app/js/locales/en-us.json

@ -634,6 +634,7 @@
"message_attach_video_play": "Play video",
"message_attach_unsupported": "The message is not supported on your version of Telegram Web. Update the app to view: {link}.",
"message_attach_unsupported_desktop": "This message is currently not supported on Telegram Web. Try {link}.",
"message_attach_notweb": "The message is not supported on Telegram Web yet. Use Telegram mobile apps to view: {link}.",
"conversation_select_modal_title": "Select conversation",

4
app/less/desktop.less

@ -1850,6 +1850,10 @@ a.im_panel_peer_photo .peer_initials {
padding: 0;
}
a.settings_modal_content_settings_wrap {
margin-top: -5px;
}
.icon-volume {
&-outer {
display: inline-block;

2
app/partials/desktop/embed_modal.html

@ -15,7 +15,7 @@
<div class="media_modal_info_wrap pull-left" ng-if="webpageID">
<div class="media_modal_author_name">
<a class="media_modal_author" href="{{webpage.url}}" target="_blank" ng-bind-html="webpage.rTitle"></a>
<a class="media_modal_author" href="{{webpage.url}}" target="_blank" ng-bind-html="webpage.rTitle" rel="noopener noreferrer"></a>
</div>
<div class="media_modal_date" ng-bind="webpage.site_name || webpage.display_url"></div>
</div>

2
app/partials/desktop/message_attach_webpage.html

@ -52,7 +52,7 @@
</a>
<div ng-if="media.webpage.site_name" class="im_message_webpage_site" ng-bind="media.webpage.site_name"></div>
<div class="im_message_webpage_title">
<a ng-click="openEmbed($event)" href="{{media.webpage.url}}" target="_blank" ng-bind-html="media.webpage.rTitle"></a>
<a ng-click="openEmbed($event)" href="{{media.webpage.url}}" rel="noopener noreferrer" target="_blank" ng-bind-html="media.webpage.rTitle"></a>
</div>
<div ng-if="media.webpage.description.length" class="im_message_webpage_description" ng-bind-html="media.webpage.rDescription"></div>
</div>

6
app/partials/desktop/message_media.html

@ -9,13 +9,13 @@
<div ng-switch-when="messageMediaPending" my-message-pending="media"></div>
<div ng-switch-when="messageMediaUnsupported">
<div class="im_message_text" my-i18n="message_attach_unsupported">
<my-i18n-param name="link"><a href="https://web.telegram.org" target="_blank">web.telegram.org</a></my-i18n-param>
<div class="im_message_text" my-i18n="message_attach_unsupported_desktop">
<my-i18n-param name="link"><a href="https://getdesktop.telegram.org" target="_blank">getdesktop.telegram.org</a></my-i18n-param>
</div>
</div>
<div ng-switch-when="messageMediaUnsupportedWeb">
<div class="im_message_text" my-i18n="message_attach_unsupported">
<div class="im_message_text" my-i18n="message_attach_notweb">
<my-i18n-param name="link"><a href="https://web.telegram.org" target="_blank">web.telegram.org</a></my-i18n-param>
</div>
</div>

2
app/partials/desktop/reply_markup.html

@ -2,7 +2,7 @@
<div class="reply_markup" ng-class="replyMarkup.splitCount ? 'reply_markup_h' + replyMarkup.splitCount : ''">
<div class="reply_markup_row" ng-repeat="row in replyMarkup.rows">
<div class="reply_markup_button_wrap" ng-class="'reply_markup_button_w' + row.buttons.length" ng-repeat="button in row.buttons" ng-switch="button._">
<a ng-switch-when="keyboardButtonUrl" class="btn reply_markup_button" href="{{button.pUrl}}" ng-bind-html="::button.rText"></a>
<a ng-switch-when="keyboardButtonUrl" class="btn reply_markup_button" href="{{button.pUrl}}" ng-bind-html="::button.rText" rel="noopener noreferrer"></a>
<button ng-switch-default class="btn reply_markup_button" ng-bind-html="::button.rText" ng-click="buttonClick(button)"></button>
</div>
</div>

2
app/partials/mobile/settings_modal.html

@ -131,7 +131,7 @@
<span class="mobile_modal_action" my-i18n="settings_modal_language"></span>
</div>
<div class="mobile_modal_action_wrap">
<div class="mobile_modal_action_wrap" ng-show="contentSettings.pFlags.sensitive_can_change">
<a class="mobile_modal_action tg_checkbox clearfix" ng-click="toggleContentSettings()" ng-class="contentSettings.pFlags.sensitive_enabled ? 'tg_checkbox_on' : ''">
<span class="icon icon-checkbox-outer"><i class="icon-checkbox-inner"></i></span>
<span class="tg_checkbox_label" my-i18n="settings_modal_show_sensitive_content"></span>

Loading…
Cancel
Save