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

Bugfixes

Browse Source
This commit is contained in:
Igor Zhukov 2015-05-21 13:41:27 +03:00
parent 96a8ecc2cd
commit 5051cab3d9
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/directives.js
View File

@ -1297,7 +1297,7 @@ angular.module('myApp.directives', ['myApp.filters'])
var dragStarted, dragTimeout; var dragStarted, dragTimeout;
var submitBtn = $('.im_submit', element)[0]; var submitBtn = $('.im_submit', element)[0];
var stickerImageCompiled = $compile('<a class="composer_sticker_btn" my-load-sticker document="document" thumb="true" img-class="composer_sticker_image"></a>'); var stickerImageCompiled = $compile('<a class="composer_sticker_btn" data-sticker="{{::document.id}}" my-load-sticker document="document" thumb="true" img-class="composer_sticker_image"></a>');
var cachedStickerImages = {}; var cachedStickerImages = {};
var emojiTooltip = new EmojiTooltip(emojiButton, { var emojiTooltip = new EmojiTooltip(emojiButton, {

2
app/js/message_composer.js
View File

@ -340,6 +340,7 @@ EmojiTooltip.prototype.updateTabContents = function () {
if (!set.docIDs.length) { if (!set.docIDs.length) {
continue; continue;
} }
html.push('<div class="composer_stickerset_wrap clearfix">');
if (set.id && set.title) { if (set.id && set.title) {
html.push( html.push(
'<a class="composer_stickerset_title" data-stickerset="', '<a class="composer_stickerset_title" data-stickerset="',
@ -353,6 +354,7 @@ EmojiTooltip.prototype.updateTabContents = function () {
docID = set.docIDs[j]; docID = set.docIDs[j];
html.push('<a class="composer_sticker_btn" data-sticker="' + docID + '"></a>'); html.push('<a class="composer_sticker_btn" data-sticker="' + docID + '"></a>');
} }
html.push('</div>');
} }
renderContent(); renderContent();

1
app/js/services.js
View File

@ -3693,6 +3693,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
stickersetItems[setID].push(doc.id); stickersetItems[setID].push(doc.id);
} }
currentStickersets = [];
if (stickersetItems[0] !== undefined) { if (stickersetItems[0] !== undefined) {
currentStickersets.push({ currentStickersets.push({
_: 'stickerSetDefault', _: 'stickerSetDefault',

4
app/less/app.less
View File

@ -2476,7 +2476,7 @@ a.composer_emoji_btn {
.composer_stickerset_title { .composer_stickerset_title {
display: block; display: block;
clear: both; // clear: both;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -2504,6 +2504,7 @@ a.composer_emoji_btn {
.composer_sticker_image { .composer_sticker_image {
max-width: 72px; max-width: 72px;
max-height: 72px; max-height: 72px;
vertical-align: top;
} }
.composer_rich_textarea { .composer_rich_textarea {
@ -2963,6 +2964,7 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description,
} }
.stickerset_actions { .stickerset_actions {
padding: 10px 20px; padding: 10px 20px;
height: 50px;
text-align: center; text-align: center;
} }
.stickerset_modal_loading { .stickerset_modal_loading {

4
app/partials/desktop/stickerset_modal.html
View File

@ -37,10 +37,10 @@
</div> </div>
<div class="stickerset_actions_wrap" ng-if="stickersetLoaded"> <div class="stickerset_actions_wrap">
<div class="stickerset_actions" ng-switch="stickersetInstalled"> <div class="stickerset_actions" ng-switch="stickersetInstalled">
<button ng-switch-when="true" class="btn btn-md btn-md-danger" my-i18n="stickerset_modal_uninstall" ng-click="toggleInstalled(false)"></button> <button ng-switch-when="true" class="btn btn-md btn-md-danger" my-i18n="stickerset_modal_uninstall" ng-click="toggleInstalled(false)"></button>
<button ng-switch-default class="btn btn-md btn-md-primary" my-i18n="stickerset_modal_install" ng-click="toggleInstalled(true)"></button> <button ng-switch-when="false" class="btn btn-md btn-md-primary" my-i18n="stickerset_modal_install" ng-click="toggleInstalled(true)"></button>
</div> </div>
</div> </div>