Skip to content
This repository was archived by the owner on Oct 25, 2023. It is now read-only.

Commit 829be18

Browse files
zhukovzhukov
committed
Bugfixes
1 parent efbe340 commit 829be18

13 files changed

Lines changed: 59 additions & 59 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ghdist:
1313
cd dist && git checkout gh-pages
1414

1515
publish:
16-
./node_modules/gulp/bin/gulp.js build
16+
./node_modules/gulp/bin/gulp.js publish
1717
echo -n "Please open http://localhost:8000/dist/index.html and check if everything works fine." && read -e
1818
./node_modules/gulp/bin/gulp.js deploy
1919

‎app/badbrowser.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
66
<title>Telegram Web</title>
77

8-
<!-- build:css css/app.css -->
9-
<link rel="stylesheet" href="vendor/angular/angular-csp.css"/>
8+
<!-- build:css css/badbrowser.css -->
109
<link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.css"/>
1110
<link rel="stylesheet" href="css/app.css"/>
1211
<!-- endbuild -->

‎app/index.html‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="en" manifest="webogram.appcache" ng-csp="" xmlns:ng="http://angularjs.org" id="ng-app">
2+
<html lang="en" manifest="webogram.appcache" ng-csp="" xmlns:ng="http://angularjs.org" id="ng-app" style="display: none;">
33
<head>
44
<!--[if lte IE 9]>
55
<meta HTTP-EQUIV="REFRESH" content="0; url=badbrowser.html">
@@ -17,12 +17,6 @@
1717

1818
<link rel="manifest" href="manifest.json"/>
1919

20-
<style>
21-
html {
22-
display: none;
23-
}
24-
</style>
25-
2620
<!-- <link rel="stylesheet" href="css/font.css"/> -->
2721
<!-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&amp;subset=cyrillic,cyrillic-ext,latin,latin-ext" rel="stylesheet" type="text/css"> -->
2822

‎app/js/directives.js‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -501,35 +501,33 @@ angular.module('myApp.directives', ['myApp.filters'])
501501
.directive('myReplyMessage', function (AppMessagesManager, AppPeersManager, $rootScope) {
502502
return {
503503
templateUrl: templateUrl('reply_message'),
504-
scope: {
505-
'replyMessage': '=myReplyMessage'
506-
},
504+
scope: {},
507505
link: link
508506
}
509507

510508
function link ($scope, element, attrs) {
511509
if (attrs.watch) {
512-
$scope.$watch('replyMessage', function () {
513-
checkMessage($scope, element)
510+
$scope.$parent.$watch(attrs.myReplyMessage, function (mid) {
511+
checkMessage($scope, element, mid)
514512
})
515513
} else {
516-
checkMessage($scope, element)
514+
var mid = $scope.$parent.$eval(attrs.myReplyMessage)
515+
checkMessage($scope, element, mid)
517516
}
518517
}
519518

520-
function checkMessage ($scope, element) {
521-
var message = $scope.replyMessage
522-
if (!message.loading) {
523-
updateMessage($scope, element)
524-
} else {
525-
var mid = message.mid
519+
function checkMessage ($scope, element, mid) {
520+
var message = $scope.replyMessage = AppMessagesManager.wrapSingleMessage(mid)
521+
if (message.loading) {
526522
var stopWaiting = $scope.$on('messages_downloaded', function (e, mids) {
527523
if (mids.indexOf(mid) != -1) {
528524
$scope.replyMessage = AppMessagesManager.wrapForDialog(mid)
529525
updateMessage($scope, element)
530526
stopWaiting()
531527
}
532528
})
529+
} else {
530+
updateMessage($scope, element)
533531
}
534532
}
535533

@@ -559,25 +557,23 @@ angular.module('myApp.directives', ['myApp.filters'])
559557
.directive('myPinnedMessage', function (AppMessagesManager, AppPeersManager, $rootScope) {
560558
return {
561559
templateUrl: templateUrl('pinned_message'),
562-
scope: {
563-
'pinnedMessage': '=myPinnedMessage'
564-
},
560+
scope: {},
565561
link: link
566562
}
567563

568564
function link ($scope, element, attrs) {
569-
var message = $scope.pinnedMessage
570-
if (!message.loading) {
571-
updateMessage($scope, element)
572-
} else {
573-
var mid = message.mid
565+
var mid = $scope.$parent.$eval(attrs.myPinnedMessage)
566+
var message = $scope.pinnedMessage = AppMessagesManager.wrapSingleMessage(mid)
567+
if (message.loading) {
574568
var stopWaiting = $scope.$on('messages_downloaded', function (e, mids) {
575569
if (mids.indexOf(mid) != -1) {
576570
$scope.pinnedMessage = AppMessagesManager.wrapForDialog(mid)
577571
updateMessage($scope, element)
578572
stopWaiting()
579573
}
580574
})
575+
} else {
576+
updateMessage($scope, element)
581577
}
582578
}
583579

‎app/js/lib/ng_utils.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,8 +1455,6 @@ angular.module('izhukov.utils', [])
14551455
if (!entities.length) {
14561456
newText = newText.trim()
14571457
}
1458-
console.warn(dT(), newText, entities);
1459-
// throw new Error(11);
14601458
return newText
14611459
}
14621460

@@ -1819,8 +1817,6 @@ angular.module('izhukov.utils', [])
18191817

18201818
code.push(text.substr(lastOffset))
18211819

1822-
console.log(code, entities)
1823-
18241820
return code.join('')
18251821
}
18261822

‎app/js/lib/push_worker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
console.log('push worker')
1+
console.log('push worker placeholder')

‎app/js/messages_manager.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,10 @@ angular.module('myApp.services')
213213
var offsetDate = 0
214214
var offsetID = 0
215215
var offsetPeerID = 0
216+
var offsetIndex = 0
216217
if (dialogsOffsetDate) {
217218
offsetDate = dialogsOffsetDate + ServerTimeManager.serverTimeOffset
219+
offsetIndex = dialogsOffsetDate * 0x10000
218220
}
219221
return MtpApiManager.invokeApi('messages.getDialogs', {
220222
offset_date: offsetDate,
@@ -233,8 +235,13 @@ angular.module('myApp.services')
233235
saveMessages(dialogsResult.messages)
234236

235237
var maxSeenIdIncremented = offsetDate ? true : false
238+
var hasPrepend = false
236239
angular.forEach(dialogsResult.dialogs, function (dialog) {
237240
saveConversation(dialog)
241+
if (offsetIndex && dialog.index > offsetIndex) {
242+
newDialogsToHandle[dialog.peerID] = dialog
243+
hasPrepend = true
244+
}
238245

239246
if (!maxSeenIdIncremented &&
240247
!AppPeersManager.isChannel(AppPeersManager.getPeerID(dialog.peer))) {
@@ -248,6 +255,11 @@ angular.module('myApp.services')
248255
dialogs.length >= dialogsResult.count) {
249256
allDialogsLoaded = true
250257
}
258+
259+
if (hasPrepend &&
260+
!newDialogsHandlePromise) {
261+
newDialogsHandlePromise = $timeout(handleNewDialogs, 0)
262+
}
251263
})
252264
}
253265

@@ -2143,11 +2155,6 @@ angular.module('myApp.services')
21432155
}
21442156
}
21452157

2146-
var replyToMsgID = message.reply_to_mid
2147-
if (replyToMsgID) {
2148-
message.reply_to_msg = wrapSingleMessage(replyToMsgID)
2149-
}
2150-
21512158
return messagesForHistory[msgID] = message
21522159
}
21532160

‎app/partials/desktop/message.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</span>
4949

5050

51-
<a class="im_message_reply_wrap" my-reply-message="historyMessage.reply_to_msg" ng-if="::historyMessage.reply_to_mid"></a>
51+
<a class="im_message_reply_wrap" my-reply-message="::historyMessage.reply_to_mid" ng-if="::historyMessage.reply_to_mid"></a>
5252

5353
<div ng-if="::historyMessage.fwdFromID || false" class="im_message_fwd_from">
5454
<span class="copyonly"><span my-i18n="message_forwarded_message"></span>:&nbsp;</span>

‎app/partials/desktop/message_service.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<span ng-switch-when="messageActionChannelDeletePhoto" my-i18n="message_service_removed_channel_photo"></span>
3232

3333
<span ng-switch-when="messageActionPinMessage" my-i18n="message_service_pinned_message">
34-
<my-i18n-param name="message"><a class="im_service_message_pinned" my-pinned-message="historyMessage.reply_to_msg"></a></my-i18n-param>
34+
<my-i18n-param name="message"><a class="im_service_message_pinned" my-pinned-message="::historyMessage.reply_to_mid"></a></my-i18n-param>
3535
</span>
3636

3737

‎app/partials/mobile/message.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<a class="im_message_author" my-peer-link="historyMessage.fromID" short="historyMessage.toID > 0" color="historyMessage.toID < 0" no-watch="true"></a>
4747
<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>
4848

49-
<a class="im_message_reply_wrap" my-reply-message="historyMessage.reply_to_msg" ng-if="::historyMessage.reply_to_mid"></a>
49+
<a class="im_message_reply_wrap" my-reply-message="::historyMessage.reply_to_mid" ng-if="::historyMessage.reply_to_mid"></a>
5050

5151
<div ng-if="::!!historyMessage.fwdFromID &amp;&amp; !historyMessage.media" class="im_message_fwd_header" ng-switch="!!historyMessage.viaBotID" my-i18n>
5252
<span ng-switch-when="true" my-i18n-format="message_forwarded_via_message_mobile"></span>

0 commit comments

Comments
 (0)