From 360b460ba2f7a8b5b74f11b0c69c9a889f32dd00 Mon Sep 17 00:00:00 2001 From: Hedgehog Date: Sun, 6 Apr 2014 07:47:40 +0400 Subject: [PATCH] Bugfixes --- img/tornado_avatar.png | Bin 0 -> 4365 bytes js/interface_localization.js | 2 +- js/twister_formatpost.js | 13 ++++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 img/tornado_avatar.png diff --git a/img/tornado_avatar.png b/img/tornado_avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..7e36ab0000d348a47f796c0684cc2424f7028d7e GIT binary patch literal 4365 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 Hu0mjfbBZCK literal 0 HcmV?d00001 diff --git a/js/interface_localization.js b/js/interface_localization.js index 050a4bf..b56c156 100644 --- a/js/interface_localization.js +++ b/js/interface_localization.js @@ -1079,7 +1079,7 @@ if(preferredLanguage == "ru"){ "Favorite": "Избранное", "File APIs not supported in this browser.": "Ваш браузер не поддерживает File APIs.", "Follow": "Подписаться", - "Followed by": "Подписчик у", + "Followed by": "Подписан", "followed_by": "%{username} подписан", "Followers": "Читателей", "Following": "Читаемых", diff --git a/js/twister_formatpost.js b/js/twister_formatpost.js index b343e71..21a2c96 100644 --- a/js/twister_formatpost.js +++ b/js/twister_formatpost.js @@ -109,14 +109,16 @@ function postToElem( post, kind ) { if (postLink && localStorage['imagesPreview'] == 'enable' && (/(\.jpg)|(\.gif)|(\.png)|(\.jpeg)|(\.jpe)/i.test(postLink) || /https:\/\/img.bi/gi.test(postLink))){ previewContainer.show(); - previewContainer.append(imagePreview(postLink, t)); + previewContainer.append(imagePreview(postLink)); }else if(postLink && ytRegExp.test(postLink) && localStorage['youtubePreview'] === 'enable'){ var ytid = postLink.match(ytRegExp) ? RegExp.$1 : false; previewContainer.show(); + previewContainer.attr('data-youtube-id', ytid); previewContainer.append(getYoutubePreview(postLink, ytid)); }else if(postLink && vimeoRegExp.test(postLink) && localStorage['vimeoPreview'] === 'enable'){ var vimid = postLink.match(vimeoRegExp) ? RegExp.$2 : false; previewContainer.show(); + previewContainer.attr('data-vimeo-id', vimid); previewContainer.append(getVimeoPreview(postLink, vimid)); } @@ -342,6 +344,10 @@ function getYoutubePreview(link, ytid) { }; localStorage['ytData'] = JSON.stringify(ytDataStorage); + vidPreviewTmpl.find('img').attr('src', ytDataStorage[ytid].thumbnail); + vidPreviewTmpl.find('a').text(ytDataStorage[ytid].title).attr('href', link).attr('target', '_blank'); + if (ytDataStorage[ytid].description) vidPreviewTmpl.find('p').html(ytDataStorage[ytid].description+'…'); + $('[data-youtube-id='+ytid+']').append(vidPreviewTmpl); } }); } @@ -369,6 +375,11 @@ function getVimeoPreview (link, vimid) { time: Date.now() }; localStorage['vimData'] = JSON.stringify(vimDataStorage); + + vidPreviewTmpl.find('img').attr('src', vimDataStorage[vimid].thumbnail); + vidPreviewTmpl.find('a').text(vimDataStorage[vimid].title).attr('href', link).attr('target', '_blank'); + if (vimDataStorage[vimid].description) vidPreviewTmpl.find('p').html(vimDataStorage[vimid].description+'…'); + $('[data-vimeo-id='+vimid+']').append(vidPreviewTmpl); } }); }