From 0ca4d588050ddf379be76a08d1d2f85bdf13b28e Mon Sep 17 00:00:00 2001 From: Nokita Kaze Date: Fri, 21 Nov 2014 19:56:28 +0300 Subject: [PATCH] =?UTF-8?q?*=20=D0=A1=D0=B8=D1=81=D1=8C=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=82=D0=BE=D0=B6=D0=B5=20=D1=81=D0=BA=D1=80=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20*=20best-practice=20data-type=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=84=D0=B0=D0=BD=D1=81=D0=B8=D0=B1=D0=BE=D0=BA=D1=81?= =?UTF-8?q?=D0=B0=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20rel=20*=20best-?= =?UTF-8?q?practice=20data-type=20=D0=B4=D0=BB=D1=8F=20=D1=84=D0=B0=D0=BD?= =?UTF-8?q?=D1=81=D0=B8=D0=B1=D0=BE=D0=BA=D1=81=D0=B0=20=D0=B2=D0=BC=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=20title=20+=20=D0=9D=D0=BE=D1=80=D0=BC=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D1=85=D0=B8=D0=BD=D1=82=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=84=D0=B0=D0=BD=D1=81=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=BA=D1=81=D0=B0=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=80=D0=BE=D0=B3=D0=BE=20=D0=BD=D0=B5=D0=B2?= =?UTF-8?q?=D0=BD=D1=8F=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B4=D0=B5=D1=80?= =?UTF-8?q?=D1=8C=D0=BC=D0=B0=20+=20=D0=A1=D0=BA=D1=80=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B8=D0=B7=20=D0=B3=D0=B0=D0=BB=D0=B5=D1=80?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F,=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D1=82=D0=B5=D0=B3=D0=B0=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=BA=D0=B0=D0=BA=20nsfw/=D1=81=D0=B8=D1=81=D1=8C=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chrome_point_plus/css/point-plus.css | 15 +++++++-- chrome_point_plus/js/point-plus.js | 50 ++++++++++++++++++++++++++-- chrome_point_plus/manifest.json | 2 +- 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/chrome_point_plus/css/point-plus.css b/chrome_point_plus/css/point-plus.css index fbe58c4..e769358 100644 --- a/chrome_point_plus/css/point-plus.css +++ b/chrome_point_plus/css/point-plus.css @@ -173,6 +173,11 @@ div#markItUpText-input { } /* Labels in post */ +.post .post-id a .cn.changed_background{ + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAANdJREFUOMvN069OgmEUBvAfSCUxNicFKTQ3bkCLyRvwDrgHZ5Q7MFlobAY3G9UrsOi0iIGNBIGgG00o53PvCMAHBJ7thPecPc/5+3IoKKKDIeZrbIi74CiFQBs3eMTbmmRnuMUID5nzG90cFXcxyEqHU3zlEBigkQoUor9N8Recf4Gdpr8XgV+Uc/DK+Ekdz/hAcwNyE594Sp0NTJYOZobriB/FjUwjNkE9m36GKq5wHO9zXOICtch4j1f0Q2QlSnjBGL10dXlQxXvSVmWbTZ3E/5ijtRxcAIj4MflVC0WJAAAAAElFTkSuQmCC") no-repeat 2px 1px; + padding-left: 20px; +} + .post .post-id a .authors_unique_count, .post .post-id a .recomendation_count { padding: 0 .5em; font-weight: normal; @@ -182,21 +187,27 @@ div#markItUpText-input { .post .post-id a .recomendation_count { margin-left: 0.2em; - background: #f2eceb; + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAXNSR0IArs4c6QAAAMRJREFUGBmtwbsuQ2EAAOCPX6LlKSRGD2E0YCKRGDqLQReDSVhIjI1r49bRdiZJn0GIQcPSxFO4HPHLOe1J2rpMvo//MaMl1batZNSWtlTLrK4JL5qqTqQO1aTqqppeTcrtexRklkTRskzw4Eju1rmOIIqCjrp7uRsNhQWLCmfu5C48Kxk05MmV3JR3xwatiaZ1rYg29Zr34VSPHdG6wpw3iaDPnmhDpiKVKPtmV7Sq4tOlET86EEUNw34RJK4Ffxgzrs8XpvA41+ECiwcAAAAASUVORK5CYII=") no-repeat 2px 1px; + background-color: #f2eceb; + padding-left: 20px; } /* NSFW-content */ .post-tag-nsfw.hide-nsfw a.postimg img, +.post-tag-сиськи.hide-nsfw a.postimg img, #comments.hide-nsfw a.postimg img{ margin-top: 5px; -webkit-filter: blur(30px); } .post-tag-nsfw.hide-nsfw a.postimg:hover img, +.post-tag-сиськи.hide-nsfw a.postimg:hover img, #comments.hide-nsfw a.postimg:hover img{ -webkit-filter: none; } -.post-tag-nsfw.hide-nsfw-posts{ +.post-tag-nsfw.hide-nsfw-posts, +.post-tag-сиськи.hide-nsfw-posts{ display: none; } + diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js index 1d5d400..4656939 100644 --- a/chrome_point_plus/js/point-plus.js +++ b/chrome_point_plus/js/point-plus.js @@ -72,7 +72,7 @@ $(document).ready(function () { if (options.option_fancybox_bind_images_to_one_flow == true) { // Linking images in posts to the galleries $('.post-content .text').each(function () { - $(this).find('a.postimg:not(.youtube)').attr('rel', 'one_flow_gallery'); + $(this).find('a.postimg:not(.youtube)').attr('data-fancybox-group', 'one_flow_gallery'); }); } @@ -81,7 +81,7 @@ $(document).ready(function () { if (options.option_fancybox_bind_images_to_one_flow !== true) { // Linking images in posts to the galleries $('.post-content .text').each(function (idxPost) { - $(this).find('a.postimg:not(.youtube)').attr('rel', 'post' + idxPost); + $(this).find('a.postimg:not(.youtube)').attr('data-fancybox-group', 'post' + idxPost); }); } // Init fancybox @@ -89,6 +89,44 @@ $(document).ready(function () { type: 'image' }); } + // Правим хинт в FancyBox + $('.post').each(function(){ + var all_post_images=$(this).find('.postimg'); + if (all_post_images.length==0){return;} + + var tags = $(this).find('div.tags a.tag'); + var hint_text = '';// Текст для хинта в FancyBox + // Сначала теги + for (var i = 0; i < tags.length; i++) { + var tag_name = $(tags[i]).html().toLowerCase(); + hint_text+=' '+tag_name; + } + + // Потом текст + var textcontent=$(this).find('.text-content'); + if (textcontent.length>0){ + textcontent=textcontent[0]; + for(var i=0;i0){continue;} + + var tmp_str=current_child_node.textContent.replace(/(\n(\r)?)/g, ' '); + tmp_str =tmp_str.replace("\t", " "); + hint_text+=' '+tmp_str; + } + } + + // Режем + hint_text=hint_text.replace(new RegExp(' {2,}'), ' ').replace(new RegExp(' +$'), '').substr(1); + if (hint_text.length>140){ + hint_text=hint_text.substr(0,140-3)+'...'; + } + + all_post_images.attr('data-fancybox-title', hint_text); + }); + // Videos if (options.option_fancybox_videos == true) { $('.postimg.youtube').addClass('fancybox-media').fancybox({ @@ -114,6 +152,8 @@ $(document).ready(function () { // NSFW Filtering if (options.option_nsfw == true) { + $('.post-tag-nsfw,.post-tag-сиськи').find('a.postimg:not(.youtube)').attr('data-fancybox-group', 'hidden-images'); + if (options.option_nsfw_hide_posts == true) { if ($('#comments').length==0) { // @hint Поведение "галка нажата, а внутри постов НЕ блюрится, даже если нажаты все три галки" - не баг @@ -127,7 +167,9 @@ $(document).ready(function () { $('.post').addClass('hide-nsfw'); // Blurred comments - if (options.option_nsfw_blur_comments == true) { + if ((options.option_nsfw_blur_comments == true) && ( + ($('.post').hasClass('post-tag-nsfw'))) || ($('.post').hasClass('post-tag-сиськи')) + ) { $('#comments').addClass('hide-nsfw'); } } @@ -623,6 +665,8 @@ function video_extension_to_mime(extension) { // Плашки у постов function set_posts_count_label() { var ids = []; + $('.post .post-id a .cn').addClass('changed_background'); + $('div.post').each(function (num, obj) { var t = $(obj).attr('data-comment-id'); if (typeof(t) !== 'undefined') { diff --git a/chrome_point_plus/manifest.json b/chrome_point_plus/manifest.json index 230be18..38c0dcd 100644 --- a/chrome_point_plus/manifest.json +++ b/chrome_point_plus/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Point+", - "version": "1.14.0", + "version": "1.14.1", "default_locale": "ru", "author": "__MSG_ext_author__", "homepage_url": "https://bitbucket.org/skobkin/chrome_point_plus",