r4sas
/
webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bugfixes

master
Igor Zhukov 9 years ago
parent
b1108496ba
commit
9a70adfe1b
7 changed files with 38 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/js/lib/utils.js
  2. 6
      app/js/messages_manager.js
  3. 12
      app/js/services.js
  4. 10
      app/partials/desktop/message_attach_venue.html
  5. 2
      app/partials/mobile/im.html
  6. 42
      app/partials/mobile/message.html
  7. 9
      app/partials/mobile/message_attach_venue.html

2
app/js/lib/utils.js
Unescape View File

@ -380,6 +380,8 @@ function templateUrl (tplName) {
media_modal_layout: 'desktop', media_modal_layout: 'desktop',
slider: 'desktop', slider: 'desktop',
reply_message: 'desktop', reply_message: 'desktop',
message_body: 'desktop',
message_media: 'desktop',
forwarded_messages: 'desktop', forwarded_messages: 'desktop',
chat_invite_link_modal: 'desktop', chat_invite_link_modal: 'desktop',
reply_markup: 'desktop', reply_markup: 'desktop',

6
app/js/messages_manager.js
Unescape View File

@ -1682,9 +1682,9 @@ angular.module('myApp.services')
case 'inputMediaContact': case 'inputMediaContact':
media = { media = {
_: 'messageMediaContact', _: 'messageMediaContact',
phone_number: phone_number, phone_number: inputMedia.phone_number,
first_name: first_name, first_name: inputMedia.first_name,
last_name: last_name, last_name: inputMedia.last_name,
user_id: 0 user_id: 0
}; };
break; break;

12
app/js/services.js
Unescape View File

@ -2666,8 +2666,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
} else { } else {
var html = RichTextProcessor.wrapRichText(callbackAnswer.message, {noLinks: true, noLinebreaks: true}).valueOf();; var html = RichTextProcessor.wrapRichText(callbackAnswer.message, {noLinks: true, noLinebreaks: true}).valueOf();;
toaster.pop({ toaster.pop({
type: 'material', type: 'info',
timeout: 100000, // timeout: 100000,
body: html, body: html,
bodyOutputType: 'trustedHtml', bodyOutputType: 'trustedHtml',
showCloseButton: false showCloseButton: false
@ -2741,10 +2741,10 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
'lat': inlineResult.send_message.geo['lat'], 'lat': inlineResult.send_message.geo['lat'],
'long': inlineResult.send_message.geo['long'] 'long': inlineResult.send_message.geo['long']
}, },
title: title, title: inlineResult.send_message.title,
address: address, address: inlineResult.send_message.address,
provider: provider, provider: inlineResult.send_message.provider,
venue_id: venue_id venue_id: inlineResult.send_message.venue_id
}; };
break; break;

10
app/partials/desktop/message_attach_venue.html
Unescape View File

@ -1,21 +1,21 @@
<div class="im_message_venue clearfix"> <div class="im_message_venue clearfix">
<a ng-href="{{::venue.mapUrl}}" target="_blank" class="im_message_venue_geopoint_wrap"> <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_venue_geopoint_wrap">
<i class="icon icon-geo-point"></i> <i class="icon icon-geo-point"></i>
<img <img
class="im_message_venue_geopoint_image" class="im_message_venue_geopoint_image"
my-geo-point-map="venue.geo" my-geo-point-map="media.geo"
width="100" width="100"
height="100" height="100"
alt="[{{::'conversation_media_location' | i18n}} {{::venue.mapUrl}}]" alt="[{{::'conversation_media_location' | i18n}} {{::media.mapUrl}}]"
/> />
</a> </a>
<div class="im_message_venue_info"> <div class="im_message_venue_info">
<div class="im_message_venue_title_wrap"> <div class="im_message_venue_title_wrap">
<a ng-href="{{::venue.mapUrl}}" target="_blank" class="im_message_document_name" ng-bind="::venue.title"></a> <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_document_name" ng-bind="::media.title"></a>
</div> </div>
<div class="im_message_venue_address" ng-bind="::venue.address"></div> <div class="im_message_venue_address" ng-bind="::media.address"></div>
</div> </div>
</div> </div>

2
app/partials/mobile/im.html
Unescape View File

@ -194,4 +194,4 @@
</div> </div>
<toaster-container></toaster-container> <toaster-container toaster-options="{'position-class': 'toast-bottom-center'}"></toaster-container>

42
app/partials/mobile/message.html
Unescape View File

@ -40,38 +40,28 @@
<span class="im_message_date" ng-bind="::historyMessage.date | time"></span> <span class="im_message_date" ng-bind="::historyMessage.date | time"></span>
</div> </div>
<div class="im_message_body" ng-class="::{im_message_body_media: historyMessage._ == 'message' &amp;&amp; historyMessage.media && historyMessage.media._ != 'messageMediaWebPage' && !historyMessage.media.rCaption && !historyMessage.viaBotID ? true : false}"> <div my-message-body="historyMessage">
<div class="im_message_body" ng-class="::{im_message_body_media: historyMessage._ == 'message' &amp;&amp; historyMessage.media && historyMessage.media._ != 'messageMediaWebPage' && !historyMessage.media.rCaption && !historyMessage.viaBotID ? true : false}">
<a class="im_message_author" my-peer-link="historyMessage.fromID" short="historyMessage.toID > 0" color="historyMessage.toID < 0" no-watch="true"></a> <a class="im_message_author" my-peer-link="historyMessage.fromID" short="historyMessage.toID > 0" color="historyMessage.toID < 0" no-watch="true"></a>
<a ng-if="::historyMessage.viaBotID && !historyMessage.fwdFromID" class="im_message_author_via" my-i18n="message_via_bot" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"><my-i18n-param name="bot"><span class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></span></my-i18n-param></a> <a ng-if="::historyMessage.viaBotID && !historyMessage.fwdFromID" class="im_message_author_via" my-i18n="message_via_bot" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"><my-i18n-param name="bot"><span class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></span></my-i18n-param></a>
<a class="im_message_reply_wrap" my-reply-message="historyMessage.reply_to_msg" ng-if="::historyMessage.reply_to_mid"></a> <a class="im_message_reply_wrap" my-reply-message="historyMessage.reply_to_msg" ng-if="::historyMessage.reply_to_mid"></a>
<div ng-if="::!!historyMessage.fwdFromID &amp;&amp; !historyMessage.media" class="im_message_fwd_header" ng-switch="!!historyMessage.viaBotID" my-i18n> <div ng-if="::!!historyMessage.fwdFromID &amp;&amp; !historyMessage.media" class="im_message_fwd_header" ng-switch="!!historyMessage.viaBotID" my-i18n>
<span ng-switch-when="true" my-i18n-format="message_forwarded_via_message_mobile"></span> <span ng-switch-when="true" my-i18n-format="message_forwarded_via_message_mobile"></span>
<span ng-switch-default my-i18n-format="message_forwarded_message_mobile"></span> <span ng-switch-default my-i18n-format="message_forwarded_message_mobile"></span>
<my-i18n-param name="from"><a class="im_message_fwd_author" my-peer-link="historyMessage.fwdFromID" no-watch="true"></a></my-i18n-param> <my-i18n-param name="from"><a class="im_message_fwd_author" my-peer-link="historyMessage.fwdFromID" no-watch="true"></a></my-i18n-param>
<my-i18n-param name="bot"><a class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></a></my-i18n-param> <my-i18n-param name="bot"><a class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></a></my-i18n-param>
</div>
<div class="im_message_text" ng-if="::historyMessage.message.length || false" my-message-text="::historyMessage" dir="auto"></div>
<div ng-if="::historyMessage.media || historyMessage.mid < 0 ? true : false" class="im_message_media" ng-switch="historyMessage.media._">
<div ng-switch-when="messageMediaPhoto" my-message-photo="historyMessage.media" message-id="historyMessage.mid"></div>
<div ng-switch-when="messageMediaDocument" my-message-document="historyMessage.media" message-id="historyMessage.mid"></div>
<div ng-switch-when="messageMediaGeo" my-message-geo="historyMessage.media"></div>
<div ng-switch-when="messageMediaVenue" my-message-venue="historyMessage.media"></div>
<div ng-switch-when="messageMediaContact" my-message-contact></div>
<div ng-switch-when="messageMediaWebPage" my-message-webpage="historyMessage.media.webpage" message-id="historyMessage.mid"></div>
<div ng-switch-when="messageMediaPending" my-message-pending></div>
<div ng-switch-when="messageMediaUnsupported">
<div class="im_message_text">
The message is not supported on your version of Telegram Web. Update the app to view: <a href="https://web.telegram.org">web.telegram.org</a>.
</div>
</div> </div>
<div class="im_message_text" dir="auto"></div>
<div class="im_message_media"></div>
</div> </div>
<div class="im_message_keyboard"></div>
</div> </div>
</div> </div>

9
app/partials/mobile/message_attach_venue.html
Unescape View File

@ -1,20 +1,21 @@
<div class="im_message_venue clearfix"> <div class="im_message_venue clearfix">
<a ng-href="{{::venue.mapUrl}}" target="_blank" class="im_message_venue_geopoint_wrap"> <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_venue_geopoint_wrap">
<i class="icon icon-geo-point"></i> <i class="icon icon-geo-point"></i>
<img <img
class="im_message_venue_geopoint_image" class="im_message_venue_geopoint_image"
my-geo-point-map="venue.geo" my-geo-point-map="media.geo"
width="100" width="100"
height="100" height="100"
alt="[{{::'conversation_media_location' | i18n}} {{::media.mapUrl}}]"
/> />
</a> </a>
<div class="im_message_venue_info"> <div class="im_message_venue_info">
<div class="im_message_venue_title_wrap"> <div class="im_message_venue_title_wrap">
<a ng-href="{{::venue.mapUrl}}" target="_blank" class="im_message_document_name" ng-bind="::venue.title"></a> <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_document_name" ng-bind="::media.title"></a>
</div> </div>
<div class="im_message_venue_address" ng-bind="::venue.address"></div> <div class="im_message_venue_address" ng-bind="::media.address"></div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save