Browse Source

Minor bugfixes

master
Igor Zhukov 9 years ago
parent
commit
9f9930a425
  1. 9
      app/js/controllers.js
  2. 1
      app/js/locales/en-us.json
  3. 3
      app/js/message_composer.js
  4. 9
      app/js/services.js
  5. 5
      app/less/app.less
  6. 1
      app/partials/desktop/confirm_modal.html
  7. 1
      app/partials/desktop/peer_select.html

9
app/js/controllers.js

@ -62,7 +62,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
var modal = $modal.open({ var modal = $modal.open({
templateUrl: templateUrl('country_select_modal'), templateUrl: templateUrl('country_select_modal'),
controller: 'CountrySelectModalController', controller: 'CountrySelectModalController',
windowClass: 'countries_modal_window mobile_modal' windowClass: 'countries_modal_window mobile_modal',
backdrop: 'single'
}); });
modal.result.then(selectCountry); modal.result.then(selectCountry);
@ -462,7 +463,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
$modal.open({ $modal.open({
templateUrl: templateUrl('settings_modal'), templateUrl: templateUrl('settings_modal'),
controller: 'SettingsModalController', controller: 'SettingsModalController',
windowClass: 'settings_modal_window mobile_modal' windowClass: 'settings_modal_window mobile_modal',
backdrop: 'single'
}); });
}; };
@ -499,7 +501,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
templateUrl: templateUrl('chat_create_modal'), templateUrl: templateUrl('chat_create_modal'),
controller: 'ChatCreateModalController', controller: 'ChatCreateModalController',
scope: scope, scope: scope,
windowClass: 'md_simple_modal_window mobile_modal' windowClass: 'md_simple_modal_window mobile_modal',
backdrop: 'single'
}); });
} }

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

@ -194,6 +194,7 @@
"confirm_modal_forward_to_peer": "Forward to {peer}?", "confirm_modal_forward_to_peer": "Forward to {peer}?",
"confirm_modal_send_to_peer": "Send to {peer}?", "confirm_modal_send_to_peer": "Send to {peer}?",
"confirm_modal_share_file_peer": "Share with {peer}?", "confirm_modal_share_file_peer": "Share with {peer}?",
"confirm_modal_invite_peer": "Invite to {peer}?",
"confirm_modal_apply_lang_with_reload_md": "Reload the App to apply language?", "confirm_modal_apply_lang_with_reload_md": "Reload the App to apply language?",
"confirm_modal_migrate_to_https_md": "Telegram Web now supports additional SSL encryption. Would you like to switch to HTTPS?\nThe HTTP version will be disabled soon.", "confirm_modal_migrate_to_https_md": "Telegram Web now supports additional SSL encryption. Would you like to switch to HTTPS?\nThe HTTP version will be disabled soon.",
"confirm_modal_resize_desktop_md": "Would you like to switch to desktop version?", "confirm_modal_resize_desktop_md": "Would you like to switch to desktop version?",

3
app/js/message_composer.js

@ -303,6 +303,9 @@ EmojiTooltip.prototype.updateTabContents = function () {
if (this.tab == 6) { // Stickers if (this.tab == 6) { // Stickers
var renderStickers = function (stickersets) { var renderStickers = function (stickersets) {
if (self.tab != 6) {
return;
}
var set, docID, i, j, len1, len2; var set, docID, i, j, len1, len2;
for (i = 0, len1 = stickersets.length; i < len1; i++) { for (i = 0, len1 = stickersets.length; i < len1; i++) {
set = stickersets[i]; set = stickersets[i];

9
app/js/services.js

@ -5605,7 +5605,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
templateUrl: templateUrl('peer_select'), templateUrl: templateUrl('peer_select'),
controller: 'PeerSelectController', controller: 'PeerSelectController',
scope: scope, scope: scope,
windowClass: 'peer_select_window mobile_modal' windowClass: 'peer_select_window mobile_modal',
backdrop: 'single'
}).result; }).result;
} }
@ -5627,7 +5628,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
templateUrl: templateUrl('peer_select'), templateUrl: templateUrl('peer_select'),
controller: 'PeerSelectController', controller: 'PeerSelectController',
scope: scope, scope: scope,
windowClass: 'peer_select_window mobile_modal' windowClass: 'peer_select_window mobile_modal',
backdrop: 'single'
}).result; }).result;
} }
@ -5655,7 +5657,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
templateUrl: templateUrl('contacts_modal'), templateUrl: templateUrl('contacts_modal'),
controller: 'ContactsModalController', controller: 'ContactsModalController',
scope: scope, scope: scope,
windowClass: 'contacts_modal_window mobile_modal' windowClass: 'contacts_modal_window mobile_modal',
backdrop: 'single'
}).result; }).result;
} }

5
app/less/app.less

@ -2440,7 +2440,7 @@ img.img_fullsize {
.composer_emoji_tooltip_tab_stickers {background-position: -9px -361px; } .composer_emoji_tooltip_tab_stickers {background-position: -9px -361px; }
.composer_emoji_tooltip_tab_stickers.active {background-position: -9px -333px; } .composer_emoji_tooltip_tab_stickers.active {background-position: -9px -333px; }
.composer_emoji_tooltip_scrollable_container { .composer_emoji_tooltip .scroller_scrollable_container {
height: 174px; height: 174px;
position: relative; position: relative;
} }
@ -3918,6 +3918,9 @@ a.countries_modal_search_clear {
.md_modal_footer { .md_modal_footer {
padding: 15px 27px 15px; padding: 15px 27px 15px;
} }
.md_modal_footer_empty {
padding: 15px 27px 0;
}
.md_photo_loading { .md_photo_loading {
display: block; display: block;

1
app/partials/desktop/confirm_modal.html

@ -33,6 +33,7 @@
<span ng-switch-when="FORWARD_PEER" my-i18n-format="confirm_modal_forward_to_peer"></span> <span ng-switch-when="FORWARD_PEER" my-i18n-format="confirm_modal_forward_to_peer"></span>
<span ng-switch-when="SHARE_CONTACT_PEER" my-i18n-format="confirm_modal_send_to_peer"></span> <span ng-switch-when="SHARE_CONTACT_PEER" my-i18n-format="confirm_modal_send_to_peer"></span>
<span ng-switch-when="EXT_SHARE_PEER" my-i18n-format="confirm_modal_share_file_peer"></span> <span ng-switch-when="EXT_SHARE_PEER" my-i18n-format="confirm_modal_share_file_peer"></span>
<span ng-switch-when="INVITE_TO_GROUP" my-i18n-format="confirm_modal_invite_peer"></span>
<my-i18n-param name="peer"> <my-i18n-param name="peer">
<strong ng-switch="peer_id > 0"> <strong ng-switch="peer_id > 0">
<span ng-switch-when="true" my-user-link="peer_id"></span> <span ng-switch-when="true" my-user-link="peer_id"></span>

1
app/partials/desktop/peer_select.html

@ -71,5 +71,6 @@
</div> </div>
</div> </div>
<div class="md_modal_footer md_modal_footer_empty clearfix" ng-if="!multiSelect"></div>
</div> </div>

Loading…
Cancel
Save