Merged in NokitaKaze/chrome_point_plus-nokita-version (pull request #2)

1.9.2

chrome_point_plus/css/point-plus.css

@@ -157,25 +157,26 @@ div#markItUpText-input {
 }
 
 /* Auto-loaded Booru pictures */
-.booru_pic{
- display: block;
+.booru_pic {
+    display: block !important;
+    float: none !important;
 }
 
-.booru_pic img{
+.booru_pic img {
     border: none;
     max-width: 60%;
     max-height: 300px;
 }
 
 /* Labels in post */
-.post .post-id a .authors_unique_count, .post .post-id a .recomendation_count{
+.post .post-id a .authors_unique_count, .post .post-id a .recomendation_count {
     padding: 0 .5em;
     font-weight: normal;
     color: #35587c;
     background: #f2f2eb;
 }
 
-.post .post-id a .recomendation_count{
+.post .post-id a .recomendation_count {
     margin-left: 0.2em;
     background: #f2eceb;
 }

chrome_point_plus/js/options.js

@@ -7,6 +7,8 @@ var ppOptions = [
         'option_fancybox_videos',
         // Open posts in Fancybox
         'option_fancybox_posts',
+        // Bind all images from fancybox to one flow
+        'option_fancybox_bind_images_to_one_flow',
     // CTRL+Enter
     'option_ctrl_enter',
     // Load original images
@@ -47,6 +49,7 @@ function pp_save_options() {
     ppOptions.option_fancybox_images = document.getElementById('option-fancybox-images').checked;
     ppOptions.option_fancybox_videos = document.getElementById('option-fancybox-videos').checked;
     ppOptions.option_fancybox_posts = document.getElementById('option-fancybox-posts').checked;
+    ppOptions.option_fancybox_bind_images_to_one_flow = document.getElementById('option-fancybox-bind-images-to-one-flow').checked;
     ppOptions.option_fluid_layout = document.getElementById('option-fluid-layout').checked;
     ppOptions.option_images_load_original = document.getElementById('option-images-load-original').checked;
     ppOptions.option_embedding = document.getElementById('option-embedding').checked;
@@ -67,6 +70,7 @@ function pp_save_options() {
     ppOptions.option_other_hightlight_post_comments = document.getElementById('option-other-hightlight-post-comments').checked;
     ppOptions.option_other_show_recommendation_count = document.getElementById('option-other-show-recommendation-count').checked;
 
+
     // Saving parameters
     chrome.storage.sync.set(ppOptions, function() {
         // Update status to let user know options were saved.

chrome_point_plus/js/point-plus.js

@@ -9,16 +9,39 @@ $(document).ready(function() {
         // Options debug
         console.debug('Options loaded: %O', options);
 
+        // Embedding
+        if (options.option_embedding == true) {
+            // Load pictures from Booru, Tumblr and some other sites
+            if (options.option_images_load_booru == true){
+                load_all_booru_images();
+            }
+            // Parse webm-links and create video instead
+            if (options.option_videos_parse_webm == true){
+                parse_webm();
+            }
+        }
+
         // Fancybox
         if (options.option_fancybox == 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');
+                });
+            }
+
             // Images
             if (options.option_fancybox_images == true) {
+                if (options.option_fancybox_bind_images_to_one_flow!==true) {
                     // Linking images in posts to the galleries
-                $('.post-content .text').each(function(idxPost) {
+                    $('.post-content .text').each(function (idxPost) {
                         $(this).find('a.postimg:not(.youtube)').attr('rel', 'post' + idxPost);
                     });
+                }
                 // Init fancybox
-                $('.postimg:not(.youtube)').fancybox();
+                $('.postimg:not(.youtube)').fancybox({
+                    type: 'image'
+                });
             }
             // Videos
             if (options.option_fancybox_videos == true) {
@@ -43,18 +66,6 @@ $(document).ready(function() {
             }
         }
         
-        // Embedding
-        if (options.option_embedding == true) {
-            // Load pictures from Booru, Tumblr and some other sites
-            if (options.option_images_load_booru == true){
-                load_all_booru_images();
-            }
-            // Parse webm-links and create video instead
-            if (options.option_videos_parse_webm == true){
-                parse_webm();
-            }
-        }
-
         // Hotkeys
         // Send by CTRL+Enter
         if (options.option_ctrl_enter == true) {
@@ -453,10 +464,11 @@ function create_image(domain, id, additional) {
             a.href += '&add_' + encodeURIComponent(index) + '=' + encodeURIComponent(additional[index]);
         }
     }
-    a.id = 'booru_pic_' + booru_picture_count;
-    $(a).addClass('booru_pic').addClass('booru-' + domain + '-' + id);
-    a.title = domain + ' image #' + id;
-    a.target = '_blank';
+    $(a).addClass('booru_pic').addClass('booru-' + domain + '-' + id).addClass('postimg').attr({
+        'id': 'booru_pic_' + booru_picture_count,
+        'title': domain + ' image #' + id,
+        'target': '_blank'
+    });
 
     var image = document.createElement('img');
     image.alt = a.title;

chrome_point_plus/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Point+",
-    "version": "1.9.1",
+    "version": "1.9.2",
     "author": "Alexey Skobkin",
     "homepage_url": "https://bitbucket.org/skobkin/chrome_point_plus",
     "description": "More features for point.im",

chrome_point_plus/options.html

@@ -32,6 +32,10 @@
                         <div class="option">
                             <input type="checkbox" id="option-fancybox-posts"><label for="option-fancybox-posts">Use for post links</label>
                         </div>
+
+                        <div class="option">
+                            <input type="checkbox" id="option-fancybox-bind-images-to-one-flow"><label for="option-fancybox-bind-images-to-one-flow">Bind all images from fancybox to one flow</label>
+                        </div>
                     </div>
 
                     <div class="option">