From 16b86255ec2a9ee1a8fa2caf22470af7ad99da8c Mon Sep 17 00:00:00 2001
From: Nokita Kaze <admin@kanaria.ru>
Date: Fri, 21 Nov 2014 18:49:12 +0300
Subject: [PATCH 1/4] =?UTF-8?q?*=20=D0=94=D1=80=D1=83=D0=B3=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D0=B1=D0=BB=D1=8E=D1=80,=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D1=8C=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B9.=20=D0=91=D0=BB=D1=8E=D1=80=D0=B8=D1=82=D1=8C=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=81=D1=82=20=E2=80=94=20=D0=BC=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC=D1=83=D0=BC=20=D0=BF=D0=B8=D0=B4=D0=BE=D1=80=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=BE=20+=20=D0=9F=D0=BE=20=D1=85=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=83=20=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=B1=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=80=D0=B5=D0=BD=D1=8B=D0=BC=20=D0=B8=D0=B7=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=E2=80=94=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=8F=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20+=20=D0=A1=D0=BA=D1=80=D0=BE=D0=BB=D0=BB=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B3=20=D0=BC=D0=B5=D0=B6=D0=B4=D1=83=20=D0=BF=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=BF=D0=BE=20=D0=BF=D1=80=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=83=20+=20=D0=9F=D1=80=D0=B5=D0=B2=D1=80=D0=B0?=
 =?UTF-8?q?=D1=89=D0=B0=D0=B5=D0=BC=20=D0=B2=20video=20=D0=B2=D1=81=D0=B5?=
 =?UTF-8?q?=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B4=D0=B5=D0=BE=20=D0=B8=20=D0=BC=D0=BE=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BC=D1=81=D1=8F=20*=20=D0=A4=D0=9E=D0=A0=D0=9C=D0=90=D0=A2?=
 =?UTF-8?q?=D0=98=D0=A0=D0=A3=D0=95=D0=9C=20=D0=9A=D0=9E=D0=94,=20=D0=91?=
 =?UTF-8?q?=D0=9B=D0=95=D0=90=D0=A2=D0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chrome_point_plus/_locales/en/messages.json |  11 +-
 chrome_point_plus/_locales/ru/messages.json |  14 +-
 chrome_point_plus/css/point-plus.css        |  16 ++
 chrome_point_plus/js/options.js             |   8 +
 chrome_point_plus/js/point-plus.js          | 302 +++++++++++++-------
 chrome_point_plus/manifest.json             |   2 +-
 chrome_point_plus/options.html              |  13 +-
 7 files changed, 256 insertions(+), 110 deletions(-)

diff --git a/chrome_point_plus/_locales/en/messages.json b/chrome_point_plus/_locales/en/messages.json
index b0e1337..ec4bbf4 100644
--- a/chrome_point_plus/_locales/en/messages.json
+++ b/chrome_point_plus/_locales/en/messages.json
@@ -56,6 +56,9 @@
     "option_videos_parse_webm": {
         "message": "Parse webm-links and create video instead"
     },
+    "option_videos_parse_all_videos": {
+        "message": "Parse all links to videos and create video instead"
+    },
     "option_embedding_soundcloud": {
         "message": "Soundcloud &#9660;"
     },
@@ -71,6 +74,9 @@
     "option_nsfw": {
         "message": "NSFW content filtering"
     },
+    "option_nsfw_hide_posts":{
+        "message": "Hide entire posts with `nsfw` tag"
+    },
     "option_nsfw_blur": {
         "message": "Blurring"
     },
@@ -122,7 +128,10 @@
     "option_other_show_recommendation_count": {
         "message": "Show recommendation count and unique commentators count (using @NokitaKaze server)"
     },
-    
+
+    "option_other_scroll_space_key":{
+        "message": "Scrolling posts with `space` key"
+    },
     
     "options_feedback_text": {
         "message": "<p>If you find an error do not hesitate to <a href=\"https:\/\/bitbucket.org\/skobkin\/chrome_point_plus\/issues?status=new&status=open\" target=\"_blank\">send me a bug report<\/a>.<\/p><p>Also you can make a donation in the following ways:<\/p><p><iframe frameborder=\"0\" allowtransparency=\"true\" scrolling=\"no\" src=\"https:\/\/money.yandex.ru\/embed\/small.xml?account=41001539215836&quickpay=small&yamoney-payment-type=on&button-text=04&button-size=s&button-color=black&targets=Point%2B&default-sum=150&successURL=https%3A%2F%2Fbitbucket.org%2Fskobkin%2Fchrome_point_plus\" width=\"158\" height=\"31\"><\/p><p><\/iframe><\/p><p><iframe frameborder=\"0\" allowtransparency=\"true\" scrolling=\"no\" src=\"https:\/\/money.yandex.ru\/embed\/small.xml?account=41001539215836&quickpay=small&any-card-payment-type=on&button-text=04&button-size=s&button-color=black&targets=Point%2B&default-sum=150&successURL=https%3A%2F%2Fbitbucket.org%2Fskobkin%2Fchrome_point_plus\" width=\"158\" height=\"31\"><\/iframe><\/p><p><form action=\"https:\/\/www.paypal.com\/cgi-bin\/webscr\" method=\"post\" target=\"_top\"><input type=\"hidden\" name=\"cmd\" value=\"_s-xclick\"><input type=\"hidden\" name=\"hosted_button_id\" value=\"RCW5V6UFXYTRE\"><input type=\"image\" src=\"https:\/\/www.paypalobjects.com\/ru_RU\/RU\/i\/btn\/btn_donateCC_LG.gif\" border=\"0\" name=\"submit\" alt=\"PayPal — более безопасный и легкий способ оплаты через Интернет!\"><img alt=\"\" border=\"0\" src=\"https:\/\/www.paypalobjects.com\/en_US\/i\/scr\/pixel.gif\" width=\"1\" height=\"1\"><\/form><\/p>"
diff --git a/chrome_point_plus/_locales/ru/messages.json b/chrome_point_plus/_locales/ru/messages.json
index 810c375..a0f1099 100644
--- a/chrome_point_plus/_locales/ru/messages.json
+++ b/chrome_point_plus/_locales/ru/messages.json
@@ -56,6 +56,9 @@
     "option_videos_parse_webm": {
         "message": "Оборачивать ссылки на webm в тег &#60;video&#62;"
     },
+    "option_videos_parse_all_videos": {
+        "message": "Оборачивать ссылки на всё видео в тег &#60;video&#62;"
+    },
     "option_embedding_soundcloud": {
         "message": "Soundcloud &#9660;"
     },
@@ -71,6 +74,9 @@
     "option_nsfw": {
         "message": "Фильтрация NSFW-контента"
     },
+    "option_nsfw_hide_posts":{
+        "message": "Скрывать NSFW-посты полностью"
+    },
     "option_nsfw_blur": {
         "message": "Размытие небезопасных постов"
     },
@@ -122,8 +128,12 @@
     "option_other_show_recommendation_count": {
         "message": "Показывать количество рекомендаций и уникальных комментаторов в посте (используя сервер @NokitaKaze)"
     },
-    
-    
+
+    "option_other_scroll_space_key":{
+        "message": "Скроллинг постов пробелом"
+    },
+
+
     "options_feedback_text": {
         "message": "<p>Нашли ошибку? Не стесняйтесь <a href=\"https:\/\/bitbucket.org\/skobkin\/chrome_point_plus\/issues?status=new&status=open\" target=\"_blank\">сообщить о ней<\/a>.<\/p><p>Также вы можете сделать пожертвование автору:<\/p><p><iframe frameborder=\"0\" allowtransparency=\"true\" scrolling=\"no\" src=\"https:\/\/money.yandex.ru\/embed\/small.xml?account=41001539215836&quickpay=small&yamoney-payment-type=on&button-text=04&button-size=s&button-color=black&targets=Point%2B&default-sum=150&successURL=https%3A%2F%2Fbitbucket.org%2Fskobkin%2Fchrome_point_plus\" width=\"158\" height=\"31\"><\/iframe><\/p><p><iframe frameborder=\"0\" allowtransparency=\"true\" scrolling=\"no\" src=\"https:\/\/money.yandex.ru\/embed\/small.xml?account=41001539215836&quickpay=small&any-card-payment-type=on&button-text=04&button-size=s&button-color=black&targets=Point%2B&default-sum=150&successURL=https%3A%2F%2Fbitbucket.org%2Fskobkin%2Fchrome_point_plus\" width=\"158\" height=\"31\"><\/iframe><\/p><p><form action=\"https:\/\/www.paypal.com\/cgi-bin\/webscr\" method=\"post\" target=\"_top\"><input type=\"hidden\" name=\"cmd\" value=\"_s-xclick\"><input type=\"hidden\" name=\"hosted_button_id\" value=\"WW33X5J5WFSP4\"><input type=\"image\" src=\"https:\/\/www.paypalobjects.com\/ru_RU\/RU\/i\/btn\/btn_donateCC_LG.gif\" border=\"0\" name=\"submit\" alt=\"PayPal — более безопасный и легкий способ оплаты через Интернет!\"><img alt=\"\" border=\"0\" src=\"https:\/\/www.paypalobjects.com\/en_US\/i\/scr\/pixel.gif\" width=\"1\" height=\"1\"><\/form><\/p>"
     }
diff --git a/chrome_point_plus/css/point-plus.css b/chrome_point_plus/css/point-plus.css
index e24c5f1..fbe58c4 100644
--- a/chrome_point_plus/css/point-plus.css
+++ b/chrome_point_plus/css/point-plus.css
@@ -184,3 +184,19 @@ div#markItUpText-input {
     margin-left: 0.2em;
     background: #f2eceb;
 }
+
+/* NSFW-content */
+.post-tag-nsfw.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,
+#comments.hide-nsfw a.postimg:hover img{
+    -webkit-filter: none;
+}
+
+.post-tag-nsfw.hide-nsfw-posts{
+    display: none;
+}
diff --git a/chrome_point_plus/js/options.js b/chrome_point_plus/js/options.js
index 16b0bc7..3de0bf1 100644
--- a/chrome_point_plus/js/options.js
+++ b/chrome_point_plus/js/options.js
@@ -17,6 +17,7 @@ var ppOptions = [
         'option_images_load_booru',
         // Wrap WEBM videos into the <video> tag
         'option_videos_parse_webm',
+            'option_videos_parse_all_videos',
         // SoundCloud
         'option_embedding_soundcloud',
             'option_embedding_soundcloud_orig_link',
@@ -25,6 +26,7 @@ var ppOptions = [
             'option_embedding_pleercom_nokita_server',
     // NSFW filtering
     'option_nsfw',
+        'option_nsfw_hide_posts',
         // Blured pictures
         'option_nsfw_blur',
             // Blur comments too
@@ -51,6 +53,8 @@ var ppOptions = [
     'option_other_hightlight_post_comments',
     // Show recommendations and unique comments count
     'option_other_show_recommendation_count',
+    // Scrolling posts with `space` key
+    'option_other_scroll_space_key',
 ];
 
 // Saves options to localStorage.
@@ -67,11 +71,13 @@ function pp_save_options() {
     ppOptions.option_embedding = $('#option-embedding').prop('checked');
     ppOptions.option_images_load_booru = $('#option-images-load-booru').prop('checked');
     ppOptions.option_videos_parse_webm = $('#option-videos-parse-webm').prop('checked');
+    ppOptions.option_videos_parse_all_videos = $('#option-videos-parse-all-videos').prop('checked');
     ppOptions.option_embedding_soundcloud = $('#option-embedding-soundcloud').prop('checked');
     ppOptions.option_embedding_soundcloud_orig_link = $('#option-embedding-soundcloud-orig-link').prop('checked');
     ppOptions.option_embedding_pleercom = $('#option-embedding-pleercom').prop('checked');
     ppOptions.option_embedding_pleercom_nokita_server = $('#option-embedding-pleercom-nokita-server').prop('checked');
     ppOptions.option_nsfw = $('#option-nsfw').prop('checked');
+    ppOptions.option_nsfw_hide_posts = $('#option-nsfw-hide-posts').prop('checked');
     ppOptions.option_nsfw_blur = $('#option-nsfw-blur').prop('checked');
     ppOptions.option_nsfw_blur_comments = $('#option-nsfw-blur-comments').prop('checked');
     ppOptions.option_visual_editor_post = $('#option-visual-editor-post').prop('checked');
@@ -88,6 +94,8 @@ function pp_save_options() {
     ppOptions.option_at_before_username = $('#option-at-before-username').prop('checked');
     ppOptions.option_other_hightlight_post_comments = $('#option-other-hightlight-post-comments').prop('checked');
     ppOptions.option_other_show_recommendation_count = $('#option-other-show-recommendation-count').prop('checked');
+    ppOptions.option_other_scroll_space_key = $('#option-other-scroll-space-key').prop('checked');
+
 
     // Saving parameters
     chrome.storage.sync.set(ppOptions, function() {
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index a3e8788..1d5d400 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -1,14 +1,17 @@
-$(document).ready(function() {
+$(document).ready(function () {
     // Grouping console log
     console.group('point-plus');
 
     console.info('Point+ %s', getVersion());
 
     // Loading options
-    chrome.storage.sync.get(ppOptions, function(options) {
+    chrome.storage.sync.get(ppOptions, function (options) {
         // Options debug
         console.debug('Options loaded: %O', options);
 
+        create_tag_system();
+
+
         // Embedding
         if (options.option_embedding == true) {
             // Load pictures from Booru, Tumblr and some other sites
@@ -17,7 +20,11 @@ $(document).ready(function() {
             }
             // Parse webm-links and create video instead
             if (options.option_videos_parse_webm == true) {
-                parse_webm();
+                if (options.option_videos_parse_all_videos == true) {
+                    parse_all_videos();
+                } else {
+                    parse_webm();
+                }
             }
 
             // Soundcloud
@@ -62,7 +69,7 @@ $(document).ready(function() {
 
         // Fancybox
         if (options.option_fancybox == true) {
-            if (options.option_fancybox_bind_images_to_one_flow==true){
+            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');
@@ -71,7 +78,7 @@ $(document).ready(function() {
 
             // Images
             if (options.option_fancybox_images == true) {
-                if (options.option_fancybox_bind_images_to_one_flow!==true) {
+                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);
@@ -104,44 +111,42 @@ $(document).ready(function() {
                 });
             }
         }
-        
+
         // NSFW Filtering
         if (options.option_nsfw == true) {
-            // Blurred posts
-            if (options.option_nsfw_blur == true) {
-                console.log('Bluring NSFW posts');
-                
-                $('.post').each(function() {
-                    $(this).find('a.tag').each(function() {
-                        if ($(this).html().toLowerCase() == 'nsfw') {
-                            console.log('NSFW tag found!');
-                            
-                            $(this).wrapInner('<b></b>');
-                            $(this).parent().siblings('.text').css('-webkit-filter', 'blur(30px)');
-                            
-                            // Blurred comments
-                            if (options.option_nsfw_blur_comments == true) {
-                                $('#comments').css('-webkit-filter', 'blur(30px)');
-                            }
-                        }
-                    });
-                });
+            if (options.option_nsfw_hide_posts == true) {
+                if ($('#comments').length==0) {
+                    // @hint Поведение "галка нажата, а внутри постов НЕ блюрится, даже если нажаты все три галки" - не баг
+                    console.log('Hide NSFW posts');
+                    $('.post').addClass('hide-nsfw-posts');
+                }
+            } else {
+                // Blurred posts
+                if (options.option_nsfw_blur == true) {
+                    console.log('Bluring NSFW posts');
+                    $('.post').addClass('hide-nsfw');
+
+                    // Blurred comments
+                    if (options.option_nsfw_blur_comments == true) {
+                        $('#comments').addClass('hide-nsfw');
+                    }
+                }
             }
         }
-        
+
         // Hotkeys
         // Send by CTRL+Enter
         if (options.option_ctrl_enter == true) {
             // Reply
             // Delegated event for all comments
-            $('.content-wrap #comments').on('keydown.point_plus', '.reply-form textarea', function(e) {
+            $('.content-wrap #comments').on('keydown.point_plus', '.reply-form textarea', function (e) {
                 if (e.ctrlKey && (e.keyCode == 10 || e.keyCode == 13)) {
                     e.preventDefault();
                     $(this).parent('.reply-form').submit();
                 }
             });
             // New post
-            $('#new-post-form #text-input,#new-post-form #tags-input').on('keydown.point_plus', function(e) {
+            $('#new-post-form #text-input,#new-post-form #tags-input').on('keydown.point_plus', function (e) {
                 if (e.ctrlKey && (e.keyCode == 10 || e.keyCode == 13)) {
                     e.preventDefault();
                     $(this).parent('#new-post-form').submit();
@@ -160,7 +165,7 @@ $(document).ready(function() {
         // Image resizing
         if (options.option_images_load_original == true) {
             // Setting new image source
-            $('.postimg:not(.youtube) img').each(function() {
+            $('.postimg:not(.youtube) img').each(function () {
                 console.log($(this).parent('.postimg').attr('href'));
                 $(this).attr('src', $(this).parent('.postimg').attr('href'));
             });
@@ -182,7 +187,7 @@ $(document).ready(function() {
             // Send by CTRL+Enter
             if (options.option_ctrl_enter == true) {
                 // New post
-                $('#new-post-form #text-input, .post-content #text-input').on('keydown.point_plus', function(e) {
+                $('#new-post-form #text-input, .post-content #text-input').on('keydown.point_plus', function (e) {
                     if (e.ctrlKey && (e.keyCode == 10 || e.keyCode == 13)) {
                         e.preventDefault();
                         $(this).parents('#new-post-form,#post-edit-form').submit();
@@ -192,7 +197,7 @@ $(document).ready(function() {
         }
         // Google search
         if (options.option_search_with_google == true) {
-            $('#search-form input[type="text"]').attr('placeholder', 'Google').keydown(function(e) {
+            $('#search-form input[type="text"]').attr('placeholder', 'Google').keydown(function (e) {
                 if (e.keyCode == 10 || e.keyCode == 13) {
                     e.preventDefault();
                     document.location.href = '//www.google.ru/search?q=site%3Apoint.im+' + $(this).val();
@@ -204,21 +209,21 @@ $(document).ready(function() {
             // SSL or plain
             ws = new WebSocket(((location.protocol == 'https:') ? 'wss' : 'ws') + '://point.im/ws');
             console.log('WebSocket created: %O', ws);
-            
+
             // Detecting post id if presented
             var postId = $('#top-post').attr('data-id');
             console.debug('Current post id detected as #%s', postId);
             // Detecting view mode
             treeSwitch = $('#tree-switch a.active').attr('href');
             console.debug('Comments view mode: %s', treeSwitch);
-            
+
             // Error handler
-            ws.onerror = function(err) {
+            ws.onerror = function (err) {
                 console.error('WebSocket error: %O', err);
             };
-            
+
             // Message handler
-            ws.onmessage = function(evt) {
+            ws.onmessage = function (evt) {
                 try {
                     // ping :)
                     if (evt.data == 'ping') {
@@ -246,14 +251,14 @@ $(document).ready(function() {
                                         console.groupEnd();
                                         break;
                                     }
-                                    
+
                                     // Check we are in specified post
                                     if (wsMessage.post_id != postId) {
                                         console.log('The comment is for #%s but current page is for #%s', wsMessage.post_id, postId);
                                         console.groupEnd();
                                         break;
                                     }
-                                    
+
                                     var $anchor = $('<a>').attr('name', wsMessage.comment_id);
 
                                     // Initializing comment element
@@ -265,7 +270,7 @@ $(document).ready(function() {
                                     });
 
                                     // Loading HTML template
-                                    $commentTemplate.load(chrome.extension.getURL('includes/comment.html'), function() {
+                                    $commentTemplate.load(chrome.extension.getURL('includes/comment.html'), function () {
                                         // Load complete
                                         console.info('comment.html loaded');
 
@@ -284,11 +289,11 @@ $(document).ready(function() {
                                         console.info('Changing data in the comment element');
                                         // Date and time
                                         $commentTemplate.find('.info .created')
-                                                .append($('<span>').html(((date.getDate().toString.length < 2) ? ('0' + date.getDate().toString()) : (date.getDate().toString())) + '&nbsp;' + months[date.getMonth()]))
-                                                // Crutchy fix
-                                                .append($('<br>'))
-                                                ///Crutchy fix
-                                                .append($('<span>').html(date.getHours() + ':' + ((date.getMinutes().toString().length < 2) ? ('0' + date.getMinutes().toString()) : (date.getMinutes().toString()))));
+                                            .append($('<span>').html(((date.getDate().toString.length < 2) ? ('0' + date.getDate().toString()) : (date.getDate().toString())) + '&nbsp;' + months[date.getMonth()]))
+                                            // Crutchy fix
+                                            .append($('<br>'))
+                                            ///Crutchy fix
+                                            .append($('<span>').html(date.getHours() + ':' + ((date.getMinutes().toString().length < 2) ? ('0' + date.getMinutes().toString()) : (date.getMinutes().toString()))));
                                         // Comment text
                                         $commentTemplate.find('.text').append($('<p>').html(escapeHtml(wsMessage.text)));
                                         // Author
@@ -297,8 +302,8 @@ $(document).ready(function() {
                                         $commentTemplate.find('.info a').attr('href', userLink).children('img.avatar').attr('src', userAvatar + '/24');
                                         // Post and comment ID's link
                                         $commentTemplate.find('.clearfix .post-id a').attr('href', commentLink).html('#' + wsMessage.post_id + '/' + wsMessage.comment_id)
-                                                // Adding answer label
-                                                .after((wsMessage.to_comment_id !== null) ? (' в ответ на <a href="#' + wsMessage.to_comment_id + '">/' + wsMessage.to_comment_id + '</a>') : (''));
+                                            // Adding answer label
+                                            .after((wsMessage.to_comment_id !== null) ? (' в ответ на <a href="#' + wsMessage.to_comment_id + '">/' + wsMessage.to_comment_id + '</a>') : (''));
                                         // Setting action labels and other attributes
                                         $commentTemplate.find('.action-labels .reply-label').attr('for', 'reply-' + wsMessage.post_id + '_' + wsMessage.comment_id);
                                         $commentTemplate.find('.action-labels .more-label').attr('for', 'action-' + wsMessage.post_id + '_' + wsMessage.comment_id);
@@ -344,13 +349,13 @@ $(document).ready(function() {
 
                                         // Adding anchor
                                         $commentTemplate.before($anchor);
-                                        
+
                                         // Fading out highlight if needed
                                         if (options.option_ws_comments_color_fadeout == true) {
                                             console.log('Fading out the highlight');
                                             $commentTemplate.children('.pp-highlight').fadeOut(20000);
                                         }
-                                        
+
                                         // Desktop notifications
                                         if (options.option_ws_comments_notifications == true) {
                                             console.log('Showing desktop notification');
@@ -362,38 +367,38 @@ $(document).ready(function() {
                                                 text: wsMessage.text
                                             });
                                         }
-                                        
+
                                         console.groupEnd();
                                     });
-                                    
+
+                                    break;
+
+                                // Posts
+                                case 'post':
+                                    console.group('ws-post #%s', wsMessage.post_id);
+
+                                    console.debug(wsMessage);
+
+                                    console.groupEnd();
+                                    break;
+
+                                // Recommendation
+                                case 'ok':
+                                    console.group('ws-recommendation #%s/%s', wsMessage.post_id, wsMessage.comment_id);
+
+                                    console.debug(wsMessage);
+
+                                    console.groupEnd();
+                                    break;
+
+                                default:
+                                    console.group('ws-other');
+
+                                    console.log(wsMessage);
+
+                                    console.groupEnd();
                                     break;
 
-                                    // Posts
-                                    case 'post':
-                                        console.group('ws-post #%s', wsMessage.post_id);
-                                        
-                                        console.debug(wsMessage);
-                                        
-                                        console.groupEnd();
-                                        break;
-                                        
-                                    // Recommendation
-                                    case 'ok':
-                                        console.group('ws-recommendation #%s/%s', wsMessage.post_id, wsMessage.comment_id);
-                                        
-                                        console.debug(wsMessage);
-                                        
-                                        console.groupEnd();
-                                        break;
-                                        
-                                    default:
-                                        console.group('ws-other');
-                                        
-                                        console.log(wsMessage);
-                                        
-                                        console.groupEnd();
-                                        break;
-                                        
                             }
                         }
 
@@ -406,7 +411,7 @@ $(document).ready(function() {
                 }
                 ;
             };
-        }        
+        }
         // Font size
         if ((options.option_enlarge_font == true) && (options.option_enlarge_font_size !== undefined)) {
             $('body').css('font-size', (options.option_enlarge_font_size / 100) + 'em');
@@ -420,14 +425,17 @@ $(document).ready(function() {
         }
 
         // Hightlight post with new comments
-        if (options.option_other_hightlight_post_comments == true){
+        if (options.option_other_hightlight_post_comments == true) {
             mark_unread_post();
         }
         // Show recommendation count and unique commentators count
-        if (options.option_other_show_recommendation_count == true){
+        if (options.option_other_show_recommendation_count == true) {
             set_posts_count_label();
         }
 
+        if (options.option_other_scroll_space_key == true){
+            set_space_key_skip_handler();
+        }
 
     });
 
@@ -437,12 +445,12 @@ $(document).ready(function() {
 
 function escapeHtml(text) {
     return text
-            .replace(/&/g, "&amp;")
-            .replace(/</g, "&lt;")
-            //.replace(/>/g, "&gt;")
-            .replace(/"/g, "&quot;")
-            .replace(/'/g, "&#039;")
-            .replace(/\n/g, "<br>");
+        .replace(/&/g, "&amp;")
+        .replace(/</g, "&lt;")
+        //.replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;")
+        .replace(/'/g, "&#039;")
+        .replace(/\n/g, "<br>");
 }
 
 // Monts for Date.getMonth()
@@ -580,6 +588,38 @@ function parse_webm() {
     });
 }
 
+function parse_all_videos() {
+    $('a').each(function (num, obj) {
+        if ($(obj).hasClass('booru_pic')) {
+            return;
+        }
+
+        var href = obj.href;
+        var n = null;
+
+        if (n = href.match(new RegExp('\\.(webm|avi|mp4)(\\?.+)?$', 'i'))) {
+            var player = document.createElement('video');
+            var mime = video_extension_to_mime(n[1]);
+            $(player).html('<source src="' + href + '" type=\'' + mime + '"\' />').attr('controls', 'controls').css({
+                'display': 'block',
+                'max-width': '95%'
+            }).addClass('parsed-webm-link');
+
+            obj.parentElement.insertBefore(player, obj);
+        }
+    });
+}
+
+function video_extension_to_mime(extension) {
+    switch(extension){
+        case 'webm':return 'video/webm; codecs="vp8, vorbis';
+        case 'avi' :return 'video/avi;';// @hint Хотя сомнительно
+        case 'mp4' :return 'video/mp4;';
+    }
+
+}
+
+
 // Плашки у постов
 function set_posts_count_label() {
     var ids = [];
@@ -606,7 +646,9 @@ function set_posts_count_label() {
                 }
 
                 var e1 = document.createElement('span');
-                if (typeof(answer.list[id])=='undefined'){return;}
+                if (typeof(answer.list[id]) == 'undefined') {
+                    return;
+                }
                 $(e1).addClass('authors_unique_count').html(answer.list[id].count_comment_unique).attr('title', 'Количество комментаторов');
                 postid.appendChild(e1);
 
@@ -620,11 +662,11 @@ function set_posts_count_label() {
 
 }
 
-function parse_pleercom_links(){
-    chrome.storage.sync.get(ppOptions, function(options) {
-        if (options.option_embedding_pleercom_nokita_server){
+function parse_pleercom_links() {
+    chrome.storage.sync.get(ppOptions, function (options) {
+        if (options.option_embedding_pleercom_nokita_server) {
             parse_pleercom_links_nokita();
-        }else{
+        } else {
             parse_pleercom_links_ajax();
         }
     });
@@ -643,8 +685,8 @@ function parse_pleercom_links_nokita() {
                 'preload': 'none'
             });
 
-            var player_div=document.createElement('div');
-            $(player_div).addClass('embeded_audio').addClass('embeded_audio_'+n[1]);
+            var player_div = document.createElement('div');
+            $(player_div).addClass('embeded_audio').addClass('embeded_audio_' + n[1]);
             player_div.appendChild(player);
 
             obj.parentElement.insertBefore(player_div, obj);
@@ -652,28 +694,28 @@ function parse_pleercom_links_nokita() {
     });
 }
 
-function parse_pleercom_links_ajax(){
+function parse_pleercom_links_ajax() {
     $('a').each(function (num, obj) {
         var href = obj.href;
         var n = null;
 
         if (n = href.match(new RegExp('^https?:\\/\\/pleer\\.com\\/tracks\\/([0-9a-z]+)', 'i'))) {
-            var player_div=document.createElement('div');
-            $(player_div).addClass('embeded_audio').addClass('embeded_audio_'+n[1]);
+            var player_div = document.createElement('div');
+            $(player_div).addClass('embeded_audio').addClass('embeded_audio_' + n[1]);
             obj.parentElement.insertBefore(player_div, obj);
             create_pleercom_ajax(n[1]);
         }
     });
 }
 
-function create_pleercom_ajax(id){
+function create_pleercom_ajax(id) {
     $ajax({
-        'url':'https://pleer.com/site_api/files/get_url',
-        'type':'post',
-        'postdata':'action=download&id='+id,
-        'dont_set_content_type':true,
-        'pleer_id':id,
-        'headers':[['Accept','*'],['Content-Type','application/x-www-form-urlencoded; charset=UTF-8']],
+        'url': 'https://pleer.com/site_api/files/get_url',
+        'type': 'post',
+        'postdata': 'action=download&id=' + id,
+        'dont_set_content_type': true,
+        'pleer_id': id,
+        'headers': [['Accept', '*'], ['Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8']],
         'success': function (a) {
             var answer = JSON.parse(a);
             var player = document.createElement('audio');
@@ -683,13 +725,63 @@ function create_pleercom_ajax(id){
                 'controls': 'controls',
                 'preload': 'auto'
             });
-            $('.embeded_audio_'+this.settings.pleer_id)[0].appendChild(player);
+            $('.embeded_audio_' + this.settings.pleer_id)[0].appendChild(player);
         },
-        'error':function(){
+        'error': function () {
             console.log('Can not get url');
-            setTimeout(new Function('create_pleercom_ajax("'+this.settings.pleer_id+'");'), 1000);
+            setTimeout(new Function('create_pleercom_ajax("' + this.settings.pleer_id + '");'), 1000);
         }
 
     });
 
+}
+
+// Проставляем теги у постов
+function create_tag_system() {
+    $('.post').each(function () {
+        var tags = $(this).find('div.tags a.tag');
+        for (var i = 0; i < tags.length; i++) {
+            var tag_name = $(tags[i]).html().toLowerCase();
+            $(this).addClass('post-tag-' + tag_name);
+        }
+    });
+}
+
+// Скролл по пробелу
+function set_space_key_skip_handler(){
+    if ($('#comments').length>0){
+        return;
+    }
+
+    // @todo Свериться с Best-practice биндинга функций. Мб там on или bind
+    $(document.body).keydown(function(e){
+        // @todo Я хотел по отпусканию кнопки, но там уже скролл срабатывает
+        // проверяем фокус
+        if ($(':focus').length>0) {
+            return;
+        }
+
+        var k=event.keyCode;
+        if (k==32){
+            space_key_event();
+            return false;
+        }
+    });
+}
+
+function space_key_event(){
+    var scroll_current  =$('body').scrollTop();
+    var scroll_step_size=0;
+    var scroll_real     =Math.max(scroll_current-scroll_step_size,0);
+
+    var posts=$('.post');
+    for(var i=0;i<posts.length;i++){
+        var this_top_px=$(posts[i]).offset().top;
+        if (this_top_px>scroll_real){
+            $('body').animate({
+                'scrollTop':this_top_px
+            }, 200);
+            return;
+        }
+    }
 }
\ No newline at end of file
diff --git a/chrome_point_plus/manifest.json b/chrome_point_plus/manifest.json
index 8f24022..230be18 100644
--- a/chrome_point_plus/manifest.json
+++ b/chrome_point_plus/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Point+",
-    "version": "1.13.0",
+    "version": "1.14.0",
     "default_locale": "ru",
     "author": "__MSG_ext_author__",
     "homepage_url": "https://bitbucket.org/skobkin/chrome_point_plus",
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index 7921687..90c8dda 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -51,6 +51,10 @@
 
                         <div class="option">
                             <input type="checkbox" id="option-videos-parse-webm"><label for="option-videos-parse-webm" data-i18n="option_videos_parse_webm"></label>
+
+                            <div class="option">
+                                <input type="checkbox" id="option-videos-parse-all-videos"><label for="option-videos-parse-all-videos" data-i18n="option_videos_parse_all_videos"></label>
+                            </div>
                         </div>
 
                         <div class="option">
@@ -72,7 +76,11 @@
                     
                     <div class="option">
                         <input type="checkbox" id="option-nsfw"><label for="option-nsfw" data-i18n="option_nsfw"></label>
-                        
+
+                        <div class="option">
+                            <input type="checkbox" id="option-nsfw-hide-posts"><label for="option-nsfw-hide-posts" data-i18n="option_nsfw_hide_posts"></label>
+                        </div>
+
                         <div class="option">
                             <input type="checkbox" id="option-nsfw-blur"><label for="option-nsfw-blur" data-i18n="option_nsfw_blur"></label>
                             
@@ -122,6 +130,9 @@
                         <input type="checkbox" id="option-other-show-recommendation-count"><label for="option-other-show-recommendation-count" data-i18n="option_other_show_recommendation_count"></label>
                     </div>
 
+                    <div class="option">
+                        <input type="checkbox" id="option-other-scroll-space-key"><label for="option-other-scroll-space-key" data-i18n="option_other_scroll_space_key"></label>
+                    </div>
                 </div>
                 
                 <div class="tab-content" id="websocket">

From 0ca4d588050ddf379be76a08d1d2f85bdf13b28e Mon Sep 17 00:00:00 2001
From: Nokita Kaze <admin@kanaria.ru>
Date: Fri, 21 Nov 2014 19:56:28 +0300
Subject: [PATCH 2/4] =?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;i<textcontent.childNodes.length;i++){
+                        var current_child_node=textcontent.childNodes[i];
+                        if((current_child_node.nodeName!=='P')&&(current_child_node.nodeName!=='#text')){continue;}
+                        var a=$(current_child_node).find('a.postimg');
+                        if (a.length>0){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",

From 7bbbf905824a3f5918e71bf48d5a3bd485d5188b Mon Sep 17 00:00:00 2001
From: Nokita Kaze <admin@kanaria.ru>
Date: Sat, 22 Nov 2014 15:15:22 +0300
Subject: [PATCH 3/4] =?UTF-8?q?*=20=D0=A1=D0=BA=D0=BE=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20+=20=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0,?=
 =?UTF-8?q?=20=D1=87=D1=82=D0=BE=20Point+=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?=
 =?UTF-8?q?=D0=B6=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BD=D0=B5=20=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=BD=D0=BE=D0=B6=D0=B4=D1=8B=20+=20=D0=93=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BD=D0=B8=D1=81=D1=82=D1=8B=D0=B9=20=D0=BA=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=20=D0=B7=D0=B0=D0=B1=D0=BB=D1=8E=D1=80=D0=B8=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=D1=81=D1=82=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chrome_point_plus/_locales/en/messages.json |  25 ++-
 chrome_point_plus/_locales/ru/messages.json |  28 ++-
 chrome_point_plus/css/point-plus.css        |  48 ++++-
 chrome_point_plus/js/options.js             |  22 +-
 chrome_point_plus/js/point-plus.js          | 214 +++++++++++++++++---
 chrome_point_plus/manifest.json             |   2 +-
 chrome_point_plus/options.html              |  27 ++-
 7 files changed, 313 insertions(+), 53 deletions(-)

diff --git a/chrome_point_plus/_locales/en/messages.json b/chrome_point_plus/_locales/en/messages.json
index b0e1337..8bef84c 100644
--- a/chrome_point_plus/_locales/en/messages.json
+++ b/chrome_point_plus/_locales/en/messages.json
@@ -56,6 +56,9 @@
     "option_videos_parse_webm": {
         "message": "Parse webm-links and create video instead"
     },
+    "option_videos_parse_all_videos": {
+        "message": "Parse all links to videos and create video instead"
+    },
     "option_embedding_soundcloud": {
         "message": "Soundcloud &#9660;"
     },
@@ -71,11 +74,20 @@
     "option_nsfw": {
         "message": "NSFW content filtering"
     },
-    "option_nsfw_blur": {
-        "message": "Blurring"
+    "option_nsfw_hide_posts":{
+        "message": "Hide posts with `nsfw` tag from feed"
     },
-    "option_nsfw_blur_comments": {
-        "message": "Blur comments too"
+    "option_nsfw_blur_posts_images": {
+        "message": "Blur images in nsfw posts"
+    },
+    "option_nsfw_blur_posts_entire": {
+        "message": "Blur entire nsfw posts"
+    },
+    "option_nsfw_blur_comments_images": {
+        "message": "Blur images in comments in nsfw posts"
+    },
+    "option_nsfw_blur_comments_entire": {
+        "message": "Blur entire comments in nsfw posts"
     },
     "option_ctrl_enter": {
         "message": "Send post and comments by CTRL+Enter (deprecated)"
@@ -122,7 +134,10 @@
     "option_other_show_recommendation_count": {
         "message": "Show recommendation count and unique commentators count (using @NokitaKaze server)"
     },
-    
+
+    "option_other_scroll_space_key":{
+        "message": "Scrolling posts with `space` key"
+    },
     
     "options_feedback_text": {
         "message": "<p>If you find an error do not hesitate to <a href=\"https:\/\/bitbucket.org\/skobkin\/chrome_point_plus\/issues?status=new&status=open\" target=\"_blank\">send me a bug report<\/a>.<\/p><p>Also you can make a donation in the following ways:<\/p><p><iframe frameborder=\"0\" allowtransparency=\"true\" scrolling=\"no\" src=\"https:\/\/money.yandex.ru\/embed\/small.xml?account=41001539215836&quickpay=small&yamoney-payment-type=on&button-text=04&button-size=s&button-color=black&targets=Point%2B&default-sum=150&successURL=https%3A%2F%2Fbitbucket.org%2Fskobkin%2Fchrome_point_plus\" width=\"158\" height=\"31\"><\/p><p><\/iframe><\/p><p><iframe frameborder=\"0\" allowtransparency=\"true\" scrolling=\"no\" src=\"https:\/\/money.yandex.ru\/embed\/small.xml?account=41001539215836&quickpay=small&any-card-payment-type=on&button-text=04&button-size=s&button-color=black&targets=Point%2B&default-sum=150&successURL=https%3A%2F%2Fbitbucket.org%2Fskobkin%2Fchrome_point_plus\" width=\"158\" height=\"31\"><\/iframe><\/p><p><form action=\"https:\/\/www.paypal.com\/cgi-bin\/webscr\" method=\"post\" target=\"_top\"><input type=\"hidden\" name=\"cmd\" value=\"_s-xclick\"><input type=\"hidden\" name=\"hosted_button_id\" value=\"RCW5V6UFXYTRE\"><input type=\"image\" src=\"https:\/\/www.paypalobjects.com\/ru_RU\/RU\/i\/btn\/btn_donateCC_LG.gif\" border=\"0\" name=\"submit\" alt=\"PayPal — более безопасный и легкий способ оплаты через Интернет!\"><img alt=\"\" border=\"0\" src=\"https:\/\/www.paypalobjects.com\/en_US\/i\/scr\/pixel.gif\" width=\"1\" height=\"1\"><\/form><\/p>"
diff --git a/chrome_point_plus/_locales/ru/messages.json b/chrome_point_plus/_locales/ru/messages.json
index 810c375..9278359 100644
--- a/chrome_point_plus/_locales/ru/messages.json
+++ b/chrome_point_plus/_locales/ru/messages.json
@@ -56,6 +56,9 @@
     "option_videos_parse_webm": {
         "message": "Оборачивать ссылки на webm в тег &#60;video&#62;"
     },
+    "option_videos_parse_all_videos": {
+        "message": "Оборачивать ссылки на всё видео в тег &#60;video&#62;"
+    },
     "option_embedding_soundcloud": {
         "message": "Soundcloud &#9660;"
     },
@@ -71,11 +74,20 @@
     "option_nsfw": {
         "message": "Фильтрация NSFW-контента"
     },
-    "option_nsfw_blur": {
-        "message": "Размытие небезопасных постов"
+    "option_nsfw_hide_posts":{
+        "message": "Скрывать NSFW-посты из ленты сообщений"
     },
-    "option_nsfw_blur_comments": {
-        "message": "Размытие комментариев"
+    "option_nsfw_blur_posts_images": {
+        "message": "Размытие картинок в небезопасных постах"
+    },
+    "option_nsfw_blur_posts_entire": {
+        "message": "Размытие небезопасных постов полностью"
+    },
+    "option_nsfw_blur_comments_images": {
+        "message": "Размытие картинок в каментариях небезопасных постов"
+    },
+    "option_nsfw_blur_comments_entire": {
+        "message": "Размытие ВСЕХ комментариев в небезопасных постах"
     },
     "option_ctrl_enter": {
         "message": "Отправлять текст по CTRL+Enter (устарело)"
@@ -122,8 +134,12 @@
     "option_other_show_recommendation_count": {
         "message": "Показывать количество рекомендаций и уникальных комментаторов в посте (используя сервер @NokitaKaze)"
     },
-    
-    
+
+    "option_other_scroll_space_key":{
+        "message": "Скроллинг постов пробелом"
+    },
+
+
     "options_feedback_text": {
         "message": "<p>Нашли ошибку? Не стесняйтесь <a href=\"https:\/\/bitbucket.org\/skobkin\/chrome_point_plus\/issues?status=new&status=open\" target=\"_blank\">сообщить о ней<\/a>.<\/p><p>Также вы можете сделать пожертвование автору:<\/p><p><iframe frameborder=\"0\" allowtransparency=\"true\" scrolling=\"no\" src=\"https:\/\/money.yandex.ru\/embed\/small.xml?account=41001539215836&quickpay=small&yamoney-payment-type=on&button-text=04&button-size=s&button-color=black&targets=Point%2B&default-sum=150&successURL=https%3A%2F%2Fbitbucket.org%2Fskobkin%2Fchrome_point_plus\" width=\"158\" height=\"31\"><\/iframe><\/p><p><iframe frameborder=\"0\" allowtransparency=\"true\" scrolling=\"no\" src=\"https:\/\/money.yandex.ru\/embed\/small.xml?account=41001539215836&quickpay=small&any-card-payment-type=on&button-text=04&button-size=s&button-color=black&targets=Point%2B&default-sum=150&successURL=https%3A%2F%2Fbitbucket.org%2Fskobkin%2Fchrome_point_plus\" width=\"158\" height=\"31\"><\/iframe><\/p><p><form action=\"https:\/\/www.paypal.com\/cgi-bin\/webscr\" method=\"post\" target=\"_top\"><input type=\"hidden\" name=\"cmd\" value=\"_s-xclick\"><input type=\"hidden\" name=\"hosted_button_id\" value=\"WW33X5J5WFSP4\"><input type=\"image\" src=\"https:\/\/www.paypalobjects.com\/ru_RU\/RU\/i\/btn\/btn_donateCC_LG.gif\" border=\"0\" name=\"submit\" alt=\"PayPal — более безопасный и легкий способ оплаты через Интернет!\"><img alt=\"\" border=\"0\" src=\"https:\/\/www.paypalobjects.com\/en_US\/i\/scr\/pixel.gif\" width=\"1\" height=\"1\"><\/form><\/p>"
     }
diff --git a/chrome_point_plus/css/point-plus.css b/chrome_point_plus/css/point-plus.css
index e24c5f1..3792683 100644
--- a/chrome_point_plus/css/point-plus.css
+++ b/chrome_point_plus/css/point-plus.css
@@ -173,14 +173,54 @@ div#markItUpText-input {
 }
 
 /* Labels in post */
-.post .post-id a .authors_unique_count, .post .post-id a .recomendation_count {
+.post .post-id a .cn.changed_background{
+}
+
+.post .post-id a .authors_unique_count, .post .post-id a .recommendation_count {
     padding: 0 .5em;
     font-weight: normal;
     color: #35587c;
-    background: #f2f2eb;
+    background-color: #f2f2eb;
 }
 
-.post .post-id a .recomendation_count {
+.post .post-id a .recommendation_count {
     margin-left: 0.2em;
-    background: #f2eceb;
+    background-color: #f2eceb;
+}
+
+/* NSFW-content */
+.post-tag-nsfw.blur-nsfw-images a.postimg img,
+.post-tag-сиськи.blur-nsfw-images a.postimg img,
+#comments.blur-nsfw-images a.postimg img{
+    margin-top: 5px;
+    -webkit-filter: blur(30px);
+}
+
+.post-tag-nsfw.blur-nsfw-images a.postimg:hover img,
+.post-tag-сиськи.blur-nsfw-images a.postimg:hover img,
+#comments.blur-nsfw-images a.postimg:hover img{
+    -webkit-filter: none;
+}
+
+.post-tag-nsfw.hide-nsfw-posts,
+.post-tag-сиськи.hide-nsfw-posts{
+    display: none;
+}
+
+.post-tag-nsfw.blur-nsfw-entire .post-content .text,
+.post-tag-сиськи.blur-nsfw-entire .post-content .text,
+#comments.blur-nsfw-entire .post-content .text{
+    -webkit-filter: blur(30px);
+}
+
+/* point-plus-debug */
+.point-plus-debug{
+    position: absolute;
+    padding: 10px 20px;
+    top: 60px;
+    left: 20px;
+    border-radius: 3px;
+    border: 1px solid #333;/* @todo Сделать не такой галимый */
+    background-color: #ddd;/* @todo Аналогично */
+    z-index: 11;
 }
diff --git a/chrome_point_plus/js/options.js b/chrome_point_plus/js/options.js
index 16b0bc7..e939c7f 100644
--- a/chrome_point_plus/js/options.js
+++ b/chrome_point_plus/js/options.js
@@ -17,6 +17,7 @@ var ppOptions = [
         'option_images_load_booru',
         // Wrap WEBM videos into the <video> tag
         'option_videos_parse_webm',
+            'option_videos_parse_all_videos',
         // SoundCloud
         'option_embedding_soundcloud',
             'option_embedding_soundcloud_orig_link',
@@ -25,10 +26,13 @@ var ppOptions = [
             'option_embedding_pleercom_nokita_server',
     // NSFW filtering
     'option_nsfw',
+        'option_nsfw_hide_posts',
         // Blured pictures
-        'option_nsfw_blur',
-            // Blur comments too
-            'option_nsfw_blur_comments',
+        'option_nsfw_blur_posts_images',
+        'option_nsfw_blur_posts_entire',
+        // Blur comments too
+        'option_nsfw_blur_comments_images',
+        'option_nsfw_blur_comments_entire',
     // CTRL+Enter
     'option_ctrl_enter',
     // Fluid layout
@@ -51,6 +55,8 @@ var ppOptions = [
     'option_other_hightlight_post_comments',
     // Show recommendations and unique comments count
     'option_other_show_recommendation_count',
+    // Scrolling posts with `space` key
+    'option_other_scroll_space_key',
 ];
 
 // Saves options to localStorage.
@@ -67,13 +73,17 @@ function pp_save_options() {
     ppOptions.option_embedding = $('#option-embedding').prop('checked');
     ppOptions.option_images_load_booru = $('#option-images-load-booru').prop('checked');
     ppOptions.option_videos_parse_webm = $('#option-videos-parse-webm').prop('checked');
+    ppOptions.option_videos_parse_all_videos = $('#option-videos-parse-all-videos').prop('checked');
     ppOptions.option_embedding_soundcloud = $('#option-embedding-soundcloud').prop('checked');
     ppOptions.option_embedding_soundcloud_orig_link = $('#option-embedding-soundcloud-orig-link').prop('checked');
     ppOptions.option_embedding_pleercom = $('#option-embedding-pleercom').prop('checked');
     ppOptions.option_embedding_pleercom_nokita_server = $('#option-embedding-pleercom-nokita-server').prop('checked');
     ppOptions.option_nsfw = $('#option-nsfw').prop('checked');
-    ppOptions.option_nsfw_blur = $('#option-nsfw-blur').prop('checked');
-    ppOptions.option_nsfw_blur_comments = $('#option-nsfw-blur-comments').prop('checked');
+    ppOptions.option_nsfw_hide_posts = $('#option-nsfw-hide-posts').prop('checked');
+    ppOptions.option_nsfw_blur_posts_images = $('#option-nsfw-blur-posts-images').prop('checked');
+    ppOptions.option_nsfw_blur_posts_entire = $('#option-nsfw-blur-posts-entire').prop('checked');
+    ppOptions.option_nsfw_blur_comments_images = $('#option-nsfw-blur-comments-images').prop('checked');
+    ppOptions.option_nsfw_blur_comments_entire = $('#option-nsfw-blur-comments-entire').prop('checked');
     ppOptions.option_visual_editor_post = $('#option-visual-editor-post').prop('checked');
     ppOptions.checkbox_search_with_google = $('#option-search-with-google').prop('checked');
     ppOptions.option_ws = $('#option-ws').prop('checked');
@@ -88,6 +98,8 @@ function pp_save_options() {
     ppOptions.option_at_before_username = $('#option-at-before-username').prop('checked');
     ppOptions.option_other_hightlight_post_comments = $('#option-other-hightlight-post-comments').prop('checked');
     ppOptions.option_other_show_recommendation_count = $('#option-other-show-recommendation-count').prop('checked');
+    ppOptions.option_other_scroll_space_key = $('#option-other-scroll-space-key').prop('checked');
+
 
     // Saving parameters
     chrome.storage.sync.set(ppOptions, function() {
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index a3e8788..2201ad4 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -1,14 +1,29 @@
 $(document).ready(function() {
     // Grouping console log
     console.group('point-plus');
-
     console.info('Point+ %s', getVersion());
 
+    // Проверяем, загрузились ли мы
+    var point_plus_debug=$('.point-plus-debug');
+    if (point_plus_debug.length>0){
+        console.info('Point+ already loaded, version: %s', point_plus_debug.attr('data-point-plus-version'));
+        return;
+    }
+    point_plus_debug=null;
+    var new_div=document.createElement('div');
+    document.body.appendChild(new_div);
+    $(new_div).attr({
+        'data-point-plus-version':getVersion()
+    }).addClass('point-plus-debug').html('Point+ v'+getVersion()+' loading...');
+    new_div=null;
+
     // Loading options
     chrome.storage.sync.get(ppOptions, function(options) {
         // Options debug
         console.debug('Options loaded: %O', options);
 
+        create_tag_system();
+
         // Embedding
         if (options.option_embedding == true) {
             // Load pictures from Booru, Tumblr and some other sites
@@ -17,7 +32,11 @@ $(document).ready(function() {
             }
             // Parse webm-links and create video instead
             if (options.option_videos_parse_webm == true) {
-                parse_webm();
+                if (options.option_videos_parse_all_videos == true) {
+                    parse_all_videos();
+                } else {
+                    parse_webm();
+                }
             }
 
             // Soundcloud
@@ -65,7 +84,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');
                 });
             }
 
@@ -74,7 +93,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
@@ -82,6 +101,50 @@ $(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; i < textcontent.childNodes.length; i++) {
+                        var current_child_node = textcontent.childNodes[i];
+                        if ((current_child_node.nodeName !== 'P') && (current_child_node.nodeName !== '#text')) {
+                            continue;
+                        }
+                        var a = $(current_child_node).find('a.postimg');
+                        if (a.length > 0) {
+                            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({
@@ -104,28 +167,37 @@ $(document).ready(function() {
                 });
             }
         }
-        
+
         // NSFW Filtering
         if (options.option_nsfw == true) {
-            // Blurred posts
-            if (options.option_nsfw_blur == true) {
-                console.log('Bluring NSFW posts');
-                
-                $('.post').each(function() {
-                    $(this).find('a.tag').each(function() {
-                        if ($(this).html().toLowerCase() == 'nsfw') {
-                            console.log('NSFW tag found!');
-                            
-                            $(this).wrapInner('<b></b>');
-                            $(this).parent().siblings('.text').css('-webkit-filter', 'blur(30px)');
-                            
-                            // Blurred comments
-                            if (options.option_nsfw_blur_comments == true) {
-                                $('#comments').css('-webkit-filter', 'blur(30px)');
-                            }
-                        }
-                    });
-                });
+            $('.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) {
+                    console.log('Hide NSFW posts in feed');
+                    $('.post').addClass('hide-nsfw-posts');
+                }
+            } else {
+                // Blurred posts
+                if (options.option_nsfw_blur_posts_entire == true) {
+                    console.log('Bluring NSFW posts');
+                    $('.post').addClass('blur-nsfw-entire');
+                } else if (options.option_nsfw_blur_posts_images == true) {
+                    console.log('Bluring images in NSFW posts');
+                    $('.post').addClass('blur-nsfw-images');
+                }
+            }
+
+            // Blurred comments
+            if ($('.post').hasClass('post-tag-nsfw') || $('.post').hasClass('post-tag-сиськи')) {
+                if (options.option_nsfw_blur_comments_entire == true) {
+                    console.log('Bluring comments');
+                    $('#comments').addClass('blur-nsfw-entire');
+                } else if (options.option_nsfw_blur_comments_images == true) {
+                    // @hint Никита Ветров официально складывает с себя все претензии, если у кого-то от этого говна упадёт драйвер видео-карты
+                    console.log('Bluring images in comments');
+                    $('#comments').addClass('blur-nsfw-images');
+                }
             }
         }
         
@@ -427,8 +499,12 @@ $(document).ready(function() {
         if (options.option_other_show_recommendation_count == true){
             set_posts_count_label();
         }
+        // `Space` key scroll handler
+        if (options.option_other_scroll_space_key == true){
+            set_space_key_skip_handler();
+        }
 
-
+        $('.point-plus-debug').fadeOut(500);
     });
 
     // Showing page action
@@ -452,7 +528,6 @@ var months = [
 ];
 
 
-/* Nokita's functions */
 // Картинки с бурятников
 var booru_picture_count = 0;
 function load_all_booru_images() {
@@ -541,7 +616,7 @@ function create_image(domain, id, additional) {
     return a;
 }
 
-/* point */
+// Помечаем непрочитанные посты более видимо чем каким-то баджем
 // Эта часть написана @RainbowSpike
 function mark_unread_post() {
     var divs = $(".post"); // массив постов
@@ -580,6 +655,39 @@ function parse_webm() {
     });
 }
 
+function parse_all_videos() {
+    $('a').each(function (num, obj) {
+        if ($(obj).hasClass('booru_pic')) {
+            return;
+        }
+
+        var href = obj.href;
+        var n = null;
+
+        if (n = href.match(new RegExp('\\.(webm|avi|mp4|mpg|mpeg)(\\?.+)?$', 'i'))) {
+            var player = document.createElement('video');
+            var mime = video_extension_to_mime(n[1]);
+            $(player).html('<source src="' + href + '" type=\'' + mime + '"\' />').attr('controls', 'controls').css({
+                'display': 'block',
+                'max-width': '95%'
+            }).addClass('parsed-webm-link');
+
+            obj.parentElement.insertBefore(player, obj);
+        }
+    });
+}
+
+function video_extension_to_mime(extension) {
+    switch(extension){
+        case 'webm':return 'video/webm; codecs="vp8, vorbis';
+        case 'avi' :return 'video/avi;';
+        case 'mp4' :return 'video/mp4;';
+        case 'mpg' :return 'video/mp4;';
+        case 'mpeg':return 'video/mp4;';
+    }
+
+}
+
 // Плашки у постов
 function set_posts_count_label() {
     var ids = [];
@@ -611,7 +719,7 @@ function set_posts_count_label() {
                 postid.appendChild(e1);
 
                 var e2 = document.createElement('span');
-                $(e2).addClass('recomendation_count').html('~' + answer.list[id].count_recommendation).attr('title', 'Количество рекомендаций. Работает криво, спасибо @arts\'у за это');
+                $(e2).addClass('recommendation_count').html('~' + answer.list[id].count_recommendation).attr('title', 'Количество рекомендаций. Работает криво, спасибо @arts\'у за это');
                 postid.appendChild(e2);
             });
         }
@@ -692,4 +800,54 @@ function create_pleercom_ajax(id){
 
     });
 
+}
+
+// Проставляем теги у постов
+function create_tag_system() {
+    $('.post').each(function () {
+        var tags = $(this).find('div.tags a.tag');
+        for (var i = 0; i < tags.length; i++) {
+            var tag_name = $(tags[i]).html().toLowerCase();
+            $(this).addClass('post-tag-' + tag_name);
+        }
+    });
+}
+
+// Скролл по пробелу
+function set_space_key_skip_handler() {
+    if ($('#comments').length > 0) {
+        return;
+    }
+
+    // @todo Свериться с Best-practice биндинга функций. Мб там on или bind
+    $(document.body).keydown(function (e) {
+        // @todo Я хотел по отпусканию кнопки, но там уже скролл срабатывает
+        // проверяем фокус
+        if ($(':focus').length > 0) {
+            return;
+        }
+
+        var k = event.keyCode;
+        if (k == 32) {
+            space_key_event();
+            return false;
+        }
+    });
+}
+
+function space_key_event() {
+    var scroll_current = $('body').scrollTop();
+    var scroll_step_size = 0;
+    var scroll_real = Math.max(scroll_current - scroll_step_size, 0);
+
+    var posts = $('.post');
+    for (var i = 0; i < posts.length; i++) {
+        var this_top_px = $(posts[i]).offset().top;
+        if (this_top_px > scroll_real) {
+            $('body').animate({
+                'scrollTop': this_top_px
+            }, 200);
+            return;
+        }
+    }
 }
\ No newline at end of file
diff --git a/chrome_point_plus/manifest.json b/chrome_point_plus/manifest.json
index 8f24022..6e24aef 100644
--- a/chrome_point_plus/manifest.json
+++ b/chrome_point_plus/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Point+",
-    "version": "1.13.0",
+    "version": "1.14.2",
     "default_locale": "ru",
     "author": "__MSG_ext_author__",
     "homepage_url": "https://bitbucket.org/skobkin/chrome_point_plus",
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index 7921687..6589ae5 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -51,6 +51,10 @@
 
                         <div class="option">
                             <input type="checkbox" id="option-videos-parse-webm"><label for="option-videos-parse-webm" data-i18n="option_videos_parse_webm"></label>
+
+                            <div class="option">
+                                <input type="checkbox" id="option-videos-parse-all-videos"><label for="option-videos-parse-all-videos" data-i18n="option_videos_parse_all_videos"></label>
+                            </div>
                         </div>
 
                         <div class="option">
@@ -72,12 +76,24 @@
                     
                     <div class="option">
                         <input type="checkbox" id="option-nsfw"><label for="option-nsfw" data-i18n="option_nsfw"></label>
-                        
+
                         <div class="option">
-                            <input type="checkbox" id="option-nsfw-blur"><label for="option-nsfw-blur" data-i18n="option_nsfw_blur"></label>
-                            
+                            <input type="checkbox" id="option-nsfw-hide-posts"><label for="option-nsfw-hide-posts" data-i18n="option_nsfw_hide_posts"></label>
+                        </div>
+
+                        <div class="option">
+                            <input type="checkbox" id="option-nsfw-blur-posts-images"><label for="option-nsfw-blur-posts-images" data-i18n="option_nsfw_blur_posts_images"></label>
+
                             <div class="option">
-                                <input type="checkbox" id="option-nsfw-blur-comments"><label for="option-nsfw-blur-comments" data-i18n="option_nsfw_blur_comments"></label>
+                                <input type="checkbox" id="option-nsfw-blur-posts-entire"><label for="option-nsfw-blur-posts-entire" data-i18n="option_nsfw_blur_posts_entire"></label>
+                            </div>
+                        </div>
+
+                        <div class="option">
+                            <input type="checkbox" id="option-nsfw-blur-comments-images"><label for="option-nsfw-blur-comments-images" data-i18n="option_nsfw_blur_comments_images"></label>
+
+                            <div class="option">
+                                <input type="checkbox" id="option-nsfw-blur-comments-entire"><label for="option-nsfw-blur-comments-entire" data-i18n="option_nsfw_blur_comments_entire"></label>
                             </div>
                         </div>
                     </div>
@@ -122,6 +138,9 @@
                         <input type="checkbox" id="option-other-show-recommendation-count"><label for="option-other-show-recommendation-count" data-i18n="option_other_show_recommendation_count"></label>
                     </div>
 
+                    <div class="option">
+                        <input type="checkbox" id="option-other-scroll-space-key"><label for="option-other-scroll-space-key" data-i18n="option_other_scroll_space_key"></label>
+                    </div>
                 </div>
                 
                 <div class="tab-content" id="websocket">

From 7b7836b2b20828136bfde449c0d3254ed6614941 Mon Sep 17 00:00:00 2001
From: Nokita Kaze <admin@kanaria.ru>
Date: Sat, 22 Nov 2014 15:18:07 +0300
Subject: [PATCH 4/4] =?UTF-8?q?*=20=D0=9E=D1=82=D0=BA=D1=83=D0=B4=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B0=20=D1=82=D1=83=D1=82=20=D0=BF=D0=BE=D1=8F?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=D0=B0=D1=81=D1=8C=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chrome_point_plus/js/point-plus.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 8b7561b..36600ab 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -839,8 +839,6 @@ function set_space_key_skip_handler(){
     });
 }
 
-}
-
 // Проставляем теги у постов
 function create_tag_system() {
     $('.post').each(function () {