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

Disabled new message animation, fixed usernames

Browse Source
This commit is contained in:
Igor Zhukov 2014-10-15 22:05:26 +04:00
parent 7dcc2df4d4
commit ba6739ce9a
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/js/controllers.js
View File

@ -2309,21 +2309,9 @@ angular.module('myApp.controllers', ['myApp.i18n'])
AppUsersManager.saveApiUser(user);
$modalInstance.close();
}, function (error) {
switch (error.type) {
case 'USERNAME_INVALID':
$scope.checked = {error: true};
error.handled = true;
break;
case 'USERNAME_OCCUPIED':
$scope.checked = {error: true};
error.handled = true;
break;
case 'USERNAME_NOT_MODIFIED':
error.handled = true;
$modalInstance.close();
break;
if (error.type == 'USERNAME_NOT_MODIFIED') {
error.handled = true;
$modalInstance.close();
}
})['finally'](function () {
delete $scope.profile.updating;

2
app/js/directives.js
View File

@ -607,7 +607,7 @@ angular.module('myApp.directives', ['myApp.filters'])
}
}
var animated = transform ? true : false,
var animated = transform && false ? true : false,
curAnimation = false;
$scope.$on('ui_history_append_new', function (e, options) {

5
app/js/locales/en-us.json
View File

@ -59,7 +59,7 @@
"username_edit_modal_title": "Change username",
"username_edit_placeholder": "Username",
"username_edit_description_md": "Choose a username so that other people can find you on **Telegram** and message you without knowing your phone number.\n\nYou can use a-z, 0-9 and underscores.",
"username_edit_description_md": "You can choose a username on **Telegram**. If you do, other people will be able to find you by this username and contact you without knowing your phone number.\n\nYou can use a-z, 0-9 and underscores. Minimum length is 5 characters.",
"username_edit_submit": "Save",
"username_edit_submit_active": "Saving...",
@ -214,7 +214,8 @@
"error_modal_photo_too_small_description": "The photo you provided is too small.",
"error_modal_no_phone_user_description_md": "Sorry, there is no **Telegram** account with the phone number you provided.",
"error_modal_no_phone_users_description_md": "Sorry, there are no **Telegram** accounts with the phone numbers you provided.",
"error_modal_phonebook_required_description": "Telegram needs access to phonebook to import contacts.",
"error_modal_username_invalid_description": "Sorry, this username is not allowed.",
"error_modal_username_occupied_description": "Sorry, this username is already taken.",
"error_modal_bad_request_description": "One of the params is missing or invalid.",
"error_modal_unauthorized_description": "This action requires authorization access. Please {login-link: log in}.",

2
app/partials/desktop/changelog_modal.html
View File

@ -24,7 +24,7 @@
</h3>
<div class="modal_section_body changelog_version_changes">
<ul class="list-unstyled changelog_version_changes_list">
<li>Usernames support: <a href="" ng-click="changeUsername">Choose a username right now!</a></li>
<li>Usernames support: <a href="" ng-click="changeUsername()">Choose a username right now!</a></li>
<li>Search can now find public users by username.</li>
<li>Added default recent emoticons.</li>
<li>Bugfixes</li>

2
app/partials/desktop/error_modal.html
View File

@ -33,6 +33,8 @@
<span ng-switch-when="USER_NOT_USING_TELEGRAM" my-i18n="error_modal_no_phone_user_description_md"></span>
<span ng-switch-when="USERS_NOT_USING_TELEGRAM" my-i18n="error_modal_no_phone_users_description_md"></span>
<span ng-switch-when="PHONEBOOK_GET_CONTACTS_FAILED" my-i18n="error_modal_phonebook_required_description"></span>
<span ng-switch-when="USERNAME_INVALID" my-i18n="error_modal_username_invalid_description"></span>
<span ng-switch-when="USERNAME_OCCUPIED" my-i18n="error_modal_username_occupied_description"></span>
<div ng-switch-default ng-switch="error.code">
<span ng-switch-when="400" my-i18n="error_modal_bad_request_description"></span>