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

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

Browse Source 
Conflicts:
	app/js/directives.js
This commit is contained in:
Igor Zhukov 2014-06-30 17:39:47 +04:00
commit b5599e6df8
23 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -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 ## [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). 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
View File

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

9
app/css/app_mobile.css
View File

@ -358,18 +358,11 @@ html {
.im_dialog_peer { .im_dialog_peer {
margin-bottom: 5px; 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 { .im_dialogs_scrollable_wrap .active a.im_dialog {
border-top-color: #6490b1; border-top-color: #6490b1;
border-bottom-color: #6490b1; border-bottom-color: #6490b1;
} }
.im_dialogs_scrollable_wrap .active + li a.im_dialog, .im_dialogs_scrollable_wrap .active + li a.im_dialog {
.im_dialogs_scrollable_wrap li:hover + li a.im_dialog {
margin-top: 0; margin-top: 0;
border-top: 0; border-top: 0;
} }

2
app/js/app.js
View File

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

2
app/js/background.js
View File

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

5
app/js/controllers.js
View File

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE
@ -349,6 +349,9 @@ angular.module('myApp.controllers', [])
if ($scope.search === undefined) { if ($scope.search === undefined) {
$scope.search = {}; $scope.search = {};
} }
if ($scope.isEmpty === undefined) {
$scope.isEmpty = {};
}
$scope.phonebookAvailable = PhonebookContactsService.isAvailable(); $scope.phonebookAvailable = PhonebookContactsService.isAvailable();
var offset = 0, var offset = 0,

35
app/js/directives.js
View File

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

2
app/js/filters.js
View File

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE
@ -21,7 +21,7 @@ Config = window.Config || {};
Config.App = { Config.App = {
id: 2496, id: 2496,
hash: '8da85b0d5bfe62527e5b244c209159c3', hash: '8da85b0d5bfe62527e5b244c209159c3',
version: '0.1.7' version: '0.1.8'
}; };
Config.Modes = { Config.Modes = {

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

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

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

2
app/js/services.js
View File

@ -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 * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

2
app/manifest.json
View File

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

2
app/manifest.webapp
View File

@ -1,7 +1,7 @@
{ {
"name": "Webogram", "name": "Webogram",
"description": "Webogram – UNOFFICIAL Telegram Web App.\nMore info & source code here: https://github.com/zhukov/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", "type": "privileged",
"launch_path": "/index.html", "launch_path": "/index.html",
"developer": { "developer": {

12
app/partials/changelog_modal.html
View File

@ -20,6 +20,18 @@
<div class="modal_section changelog_version_wrap"> <div class="modal_section changelog_version_wrap">
<h3 class="modal_section_header changelog_version_title"> <h3 class="modal_section_header changelog_version_title">
<span class="pull-right">current version</span> <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 Version 0.1.7
</h3> </h3>
<div class="modal_section_body changelog_version_changes"> <div class="modal_section_body changelog_version_changes">

2
package.json
View File

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