twisterarmy/twister-calm
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-calm.git synced 2025-01-27 23:24:28 +00:00
Code Issues Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Hedgehog 2014-04-06 07:47:40 +04:00
parent 45f913fba3
commit 360b460ba2
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/tornado_avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

2
js/interface_localization.js
View File

@ -1079,7 +1079,7 @@ if(preferredLanguage == "ru"){
"Favorite": "Избранное", "Favorite": "Избранное",
"File APIs not supported in this browser.": "Ваш браузер не поддерживает File APIs.", "File APIs not supported in this browser.": "Ваш браузер не поддерживает File APIs.",
"Follow": "Подписаться", "Follow": "Подписаться",
"Followed by": "Подписчик у", "Followed by": "Подписан",
"followed_by": "%{username} подписан", "followed_by": "%{username} подписан",
"Followers": "Читателей", "Followers": "Читателей",
"Following": "Читаемых", "Following": "Читаемых",

13
js/twister_formatpost.js
View File

@ -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))){ if (postLink && localStorage['imagesPreview'] == 'enable' && (/(\.jpg)|(\.gif)|(\.png)|(\.jpeg)|(\.jpe)/i.test(postLink) || /https:\/\/img.bi/gi.test(postLink))){
previewContainer.show(); previewContainer.show();
previewContainer.append(imagePreview(postLink, t)); previewContainer.append(imagePreview(postLink));
}else if(postLink && ytRegExp.test(postLink) && localStorage['youtubePreview'] === 'enable'){ }else if(postLink && ytRegExp.test(postLink) && localStorage['youtubePreview'] === 'enable'){
var ytid = postLink.match(ytRegExp) ? RegExp.$1 : false; var ytid = postLink.match(ytRegExp) ? RegExp.$1 : false;
previewContainer.show(); previewContainer.show();
previewContainer.attr('data-youtube-id', ytid);
previewContainer.append(getYoutubePreview(postLink, ytid)); previewContainer.append(getYoutubePreview(postLink, ytid));
}else if(postLink && vimeoRegExp.test(postLink) && localStorage['vimeoPreview'] === 'enable'){ }else if(postLink && vimeoRegExp.test(postLink) && localStorage['vimeoPreview'] === 'enable'){
var vimid = postLink.match(vimeoRegExp) ? RegExp.$2 : false; var vimid = postLink.match(vimeoRegExp) ? RegExp.$2 : false;
previewContainer.show(); previewContainer.show();
previewContainer.attr('data-vimeo-id', vimid);
previewContainer.append(getVimeoPreview(postLink, vimid)); previewContainer.append(getVimeoPreview(postLink, vimid));
} }
@ -342,6 +344,10 @@ function getYoutubePreview(link, ytid) {
}; };
localStorage['ytData'] = JSON.stringify(ytDataStorage); 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() time: Date.now()
}; };
localStorage['vimData'] = JSON.stringify(vimDataStorage); 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);
} }
}); });
} }