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

Merge branch 'master' of https://github.com/zhukov/webogram 

Conflicts:
	app/js/directives.js
master
Igor Zhukov 11 years ago
parent
afc066e3bc e9c1557087
commit
b5599e6df8
23 changed files with 56 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      README.md
  2. 13
      app/css/app.css
  3. 9
      app/css/app_mobile.css
  4. 2
      app/js/app.js
  5. 2
      app/js/background.js
  6. 5
      app/js/controllers.js
  7. 35
      app/js/directives.js
  8. 2
      app/js/filters.js
  9. 2
      app/js/lib/aes_worker.js
  10. 2
      app/js/lib/bin_utils.js
  11. 4
      app/js/lib/config.js
  12. 2
      app/js/lib/mtproto.js
  13. 2
      app/js/lib/mtproto_wrapper.js
  14. 2
      app/js/lib/ng_utils.js
  15. 2
      app/js/lib/pq_worker.js
  16. 2
      app/js/lib/sha1_worker.js
  17. 2
      app/js/lib/tl_utils.js
  18. 2
      app/js/lib/utils.js
  19. 2
      app/js/services.js
  20. 2
      app/manifest.json
  21. 2
      app/manifest.webapp
  22. 12
      app/partials/changelog_modal.html
  23. 2
      package.json

1
README.md
Unescape View File

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
[![Stories in Ready](https://badge.waffle.io/zhukov/webogram.png?label=ready&title=Ready)](https://waffle.io/zhukov/webogram)
## [Webogram](http://zhukov.github.io/webogram) – UNOFFICIAL Telegram Web App
Telegram offers great [apps for mobile communication](https://www.telegram.org). It is based on the [MTProto protocol](https://core.telegram.org/mtproto) and has an [Open API](http://core.telegram.org/api). I personally like Telegram for its speed and cloud-support (that makes a web app possible, unlike in the case of WA and others).

13
app/css/app.css
Unescape View File

@ -944,13 +944,10 @@ a.tg_radio_on:hover i.icon-radio { @@ -944,13 +944,10 @@ a.tg_radio_on:hover i.icon-radio {
border-radius: 2px;
background: #f2f6fa;
}
.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog,
.im_dialogs_scrollable_wrap .active a.im_dialog {
border-radius: 2px;
background-color: #6490b1;
}
.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog:hover,
.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog_selected,
.im_dialogs_scrollable_wrap .active a.im_dialog:hover,
.im_dialogs_scrollable_wrap .active a.im_dialog_selected {
background-color: #6490b1;
@ -978,10 +975,6 @@ a.im_dialog_selected .im_dialog_message_text { @@ -978,10 +975,6 @@ a.im_dialog_selected .im_dialog_message_text {
color: #698192;
}
.im_dialog_wrap:active a.im_dialog .im_dialog_chat_from_wrap,
.im_dialog_wrap:active a.im_dialog .im_dialog_message_media,
.im_dialog_wrap:active a.im_dialog .im_dialog_message_service,
.im_dialog_wrap:active a.im_dialog .im_dialog_message_text,
.active a.im_dialog .im_dialog_chat_from_wrap,
.active a.im_dialog .im_dialog_message_media,
.active a.im_dialog .im_dialog_message_service,
@ -1002,7 +995,6 @@ a.im_dialog_selected .im_dialog_message_text { @@ -1002,7 +995,6 @@ a.im_dialog_selected .im_dialog_message_text {
margin-top: 2px;
margin-bottom: 2px;
}
.im_dialog_wrap:active .im_dialog_peer,
.active .im_dialog_peer {
color: #FFF;
}
@ -1014,7 +1006,6 @@ a.im_dialog_selected .im_dialog_message_text { @@ -1014,7 +1006,6 @@ a.im_dialog_selected .im_dialog_message_text {
padding: 3px 4px;
margin-top: 4px;
}
.im_dialog_wrap:active .im_dialog_badge,
.active .im_dialog_badge {
color: #428bca;
background-color: #fff;
@ -1038,7 +1029,6 @@ a.im_dialog:hover .im_dialog_unread, @@ -1038,7 +1029,6 @@ a.im_dialog:hover .im_dialog_unread,
a.im_dialog_selected .im_dialog_unread {
background: #a3c0d4;
}
.im_dialog_wrap:active .im_dialog_unread,
.active .im_dialog_unread {
background-color: #a4c4dd;
}
@ -1052,9 +1042,6 @@ a.im_dialog:hover .im_dialog_date, @@ -1052,9 +1042,6 @@ a.im_dialog:hover .im_dialog_date,
a.im_dialog_selected .im_dialog_date {
color: #91a6ba;
}
.im_dialog_wrap:active .im_dialog_date,
.im_dialog_wrap:active a.im_dialog:hover .im_dialog_date,
.im_dialog_wrap:active a.im_dialog_selected .im_dialog_date,
.active .im_dialog_date,
.active a.im_dialog:hover .im_dialog_date,
.active a.im_dialog_selected .im_dialog_date {

9
app/css/app_mobile.css
Unescape View File

@ -358,18 +358,11 @@ html { @@ -358,18 +358,11 @@ html {
.im_dialog_peer {
margin-bottom: 5px;
}
.im_dialogs_scrollable_wrap a.im_dialog:hover,
.im_dialogs_scrollable_wrap a.im_dialog_selected {
border-top-color: #D6DADE;
border-bottom-color: #D6DADE;
}
.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog,
.im_dialogs_scrollable_wrap .active a.im_dialog {
border-top-color: #6490b1;
border-bottom-color: #6490b1;
}
.im_dialogs_scrollable_wrap .active + li a.im_dialog,
.im_dialogs_scrollable_wrap li:hover + li a.im_dialog {
.im_dialogs_scrollable_wrap .active + li a.im_dialog {
margin-top: 0;
border-top: 0;
}

2
app/js/app.js
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

2
app/js/background.js
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

5
app/js/controllers.js
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE
@ -349,6 +349,9 @@ angular.module('myApp.controllers', []) @@ -349,6 +349,9 @@ angular.module('myApp.controllers', [])
if ($scope.search === undefined) {
$scope.search = {};
}
if ($scope.isEmpty === undefined) {
$scope.isEmpty = {};
}
$scope.phonebookAvailable = PhonebookContactsService.isAvailable();
var offset = 0,

35
app/js/directives.js
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE
@ -68,7 +68,7 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -68,7 +68,7 @@ angular.module('myApp.directives', ['myApp.filters'])
$scope.$on('dialogs_search_toggle', function () {
$(panelWrap).addClass('im_dialogs_panel_search');
$scope.$broadcast('ui_dialogs_search');
$($window).scrollTop(0);
$($window).scrollTop(0);
$timeout(function () {
searchField.focus();
})
@ -511,20 +511,25 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -511,20 +511,25 @@ angular.module('myApp.directives', ['myApp.filters'])
scrollableWrap.scrollHeight; // Some strange Chrome bug workaround
$(scrollable).css({bottom: -(sh - st - ch), marginLeft: -Math.ceil(pr / 2)});
onContentLoaded(function () {
$(scrollableWrap).removeClass('im_history_to_bottom');
$(scrollable).css({bottom: '', marginLeft: ''});
scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh;
var upd = function () {
$(scrollableWrap).removeClass('im_history_to_bottom');
$(scrollable).css({bottom: '', marginLeft: ''});
scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh;
updateBottomizer();
moreNotified = false;
updateBottomizer();
moreNotified = false;
$timeout(function () {
if (scrollableWrap.scrollHeight != sh) {
$(scrollableWrap).trigger('scroll');
}
});
$timeout(function () {
if (scrollableWrap.scrollHeight != sh) {
$(scrollableWrap).trigger('scroll');
}
});
});
clearTimeout(timer);
unreg();
},
timer = setTimeout(upd, 0),
unreg = $scope.$on('$viewContentLoaded', upd);
});
$scope.$on('ui_history_append', function () {
@ -1350,7 +1355,7 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -1350,7 +1355,7 @@ angular.module('myApp.directives', ['myApp.filters'])
var onKeyDown = function (event) {
var target = event.target;
if (target && (target.tagName == 'INPUT' || target.tagName == 'TEXTAREA')) {
return false;
return;
}
switch (event.keyCode) {

2
app/js/filters.js
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

4
app/js/lib/config.js
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE
@ -21,7 +21,7 @@ Config = window.Config || {}; @@ -21,7 +21,7 @@ Config = window.Config || {};
Config.App = {
id: 2496,
hash: '8da85b0d5bfe62527e5b244c209159c3',
version: '0.1.7'
version: '0.1.8'
};
Config.Modes = {

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

2
app/js/services.js
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*!
* Webogram v0.1.7 - messaging web application for MTProto
* Webogram v0.1.8 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

2
app/manifest.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "Telegram UNOFFICIAL",
"version": "0.1.7",
"version": "0.1.8",
"short_name": "Webogram",
"manifest_version": 2,
"app": {

2
app/manifest.webapp
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
{
"name": "Webogram",
"description": "Webogram – UNOFFICIAL Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
"version": "0.1.7",
"version": "0.1.8",
"type": "privileged",
"launch_path": "/index.html",
"developer": {

12
app/partials/changelog_modal.html
Unescape View File

@ -20,6 +20,18 @@ @@ -20,6 +20,18 @@
<div class="modal_section changelog_version_wrap">
<h3 class="modal_section_header changelog_version_title">
<span class="pull-right">current version</span>
Version 0.1.8
</h3>
<div class="modal_section_body changelog_version_changes">
<ul class="list-unstyled changelog_version_changes_list">
<li>Improved mobile layout</li>
<li>Bugfixes</li>
</ul>
</div>
</div>
<div class="modal_section changelog_version_wrap">
<h3 class="modal_section_header changelog_version_title">
Version 0.1.7
</h3>
<div class="modal_section_body changelog_version_changes">

2
package.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "webogram",
"version": "0.1.7",
"version": "0.1.8",
"description": "Telegram UNOFFICIAL Web App",
"main": "app/index.html",
"single-instance": true,

Write Preview
Loading…
Cancel
Save