From cb7cb397c1733375bb175eb71d34c5992e2bca51 Mon Sep 17 00:00:00 2001
From: isqua <isqua@isqua.ru>
Date: Sat, 31 Jan 2015 13:34:01 +0300
Subject: [PATCH 1/6] Add single option `Remove original link`

---
 chrome_point_plus/_locales/en/messages.json | 4 ++--
 chrome_point_plus/_locales/ru/messages.json | 4 ++--
 chrome_point_plus/options.html              | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/chrome_point_plus/_locales/en/messages.json b/chrome_point_plus/_locales/en/messages.json
index 21a482c..d85c33b 100644
--- a/chrome_point_plus/_locales/en/messages.json
+++ b/chrome_point_plus/_locales/en/messages.json
@@ -98,8 +98,8 @@
     "option_embedding_instagram_posts": {
         "message": "Instagram"
     },
-    "option_embedding_instagram_posts_orig_link": {
-        "message": "Leave original link"
+    "option_embedding_remove_original_link": {
+        "message": "Remove original link"
     },
     "option_nsfw": {
         "message": "NSFW content filtering"
diff --git a/chrome_point_plus/_locales/ru/messages.json b/chrome_point_plus/_locales/ru/messages.json
index d7fe463..f8f6902 100644
--- a/chrome_point_plus/_locales/ru/messages.json
+++ b/chrome_point_plus/_locales/ru/messages.json
@@ -98,8 +98,8 @@
     "option_embedding_instagram_posts": {
         "message": "Instagram"
     },
-    "option_embedding_instagram_posts_orig_link": {
-        "message": "Не убирать ссылку"
+    "option_embedding_remove_original_link": {
+        "message": "Удалять оригинальную ссылку"
     },
     "option_nsfw": {
         "message": "Фильтрация NSFW-контента"
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index 14cd8fa..10a1f6d 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -136,6 +136,11 @@
                                 <span data-i18n="option_embedding_instagram_posts_orig_link"></span>
                             </label>
                         </div>
+
+                        <label class="option-node">
+                            <input type="checkbox" name="option-embedding-remove-original-link">
+                            <span data-i18n="option_embedding_remove_original_link">
+                        </label>
                     </div>
 
                     <div class="option-node">

From fad1e5e689b2bd53fefe89f51c0900119a587765 Mon Sep 17 00:00:00 2001
From: isqua <isqua@isqua.ru>
Date: Sat, 31 Jan 2015 13:38:06 +0300
Subject: [PATCH 2/6] Remove instagram original link option

---
 chrome_point_plus/js/point-plus.js |  2 +-
 chrome_point_plus/options.html     | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 598a9db..30b4e06 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -1578,7 +1578,7 @@ function instagram_posts_embedding_init(options) {
 
                     $link.before($imgLink);
 
-                    if ( ! options.is('option_embedding_instagram_posts_orig_link')) {
+                    if (options.is('option_embedding_remove_original_link')) {
                        $link.remove();
                     }
                 }
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index 10a1f6d..615ae3f 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -127,15 +127,10 @@
                             <span data-i18n="option_embedding_twitter_tweets"></span>
                         </label>
 
-                        <div class="option-node">
-                            <input type="checkbox" name="option-embedding-instagram-posts" id="option-embedding-instagram-posts">
-                            <label for="option-embedding-instagram-posts" data-i18n="option_embedding_instagram_posts"></label>
-
-                            <label class="option-node">
-                                <input type="checkbox" name="option-embedding-instagram-posts-orig-link">
-                                <span data-i18n="option_embedding_instagram_posts_orig_link"></span>
-                            </label>
-                        </div>
+                        <label class="option-node">
+                            <input type="checkbox" name="option-embedding-instagram-posts">
+                            <span data-i18n="option_embedding_instagram_posts"></span>
+                        </label>
 
                         <label class="option-node">
                             <input type="checkbox" name="option-embedding-remove-original-link">

From 82c2ef8442dfb9820e260af8e8b4976e73c01c5f Mon Sep 17 00:00:00 2001
From: isqua <isqua@isqua.ru>
Date: Sat, 31 Jan 2015 13:58:05 +0300
Subject: [PATCH 3/6] Remove coub original link option

---
 chrome_point_plus/_locales/en/messages.json |  5 +----
 chrome_point_plus/_locales/ru/messages.json |  5 +----
 chrome_point_plus/js/point-plus.js          |  2 +-
 chrome_point_plus/options.html              | 13 ++++---------
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/chrome_point_plus/_locales/en/messages.json b/chrome_point_plus/_locales/en/messages.json
index d85c33b..d34fa8f 100644
--- a/chrome_point_plus/_locales/en/messages.json
+++ b/chrome_point_plus/_locales/en/messages.json
@@ -87,10 +87,7 @@
         "message": "Pleer.com &#9660;"
     },
     "option_embedding_coubcom": {
-        "message": "Coub.com &#9660;"
-    },
-    "option_embedding_coubcom_orig_link": {
-        "message": "Leave original link"
+        "message": "Coub.com"
     },
     "option_embedding_twitter_tweets": {
         "message": "Twitter"
diff --git a/chrome_point_plus/_locales/ru/messages.json b/chrome_point_plus/_locales/ru/messages.json
index f8f6902..05a51e1 100644
--- a/chrome_point_plus/_locales/ru/messages.json
+++ b/chrome_point_plus/_locales/ru/messages.json
@@ -87,10 +87,7 @@
         "message": "Pleer.com &#9660;"
     },
     "option_embedding_coubcom": {
-        "message": "Coub.com &#9660;"
-    },
-    "option_embedding_coubcom_orig_link": {
-        "message": "Не убирать ссылку"
+        "message": "Coub.com"
     },
     "option_embedding_twitter_tweets": {
         "message": "Twitter"
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 30b4e06..269d263 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -1171,7 +1171,7 @@ function parse_coub_links(current_options) {
 
             obj.parentElement.insertBefore(player, obj);
 
-            if (current_options.is('option_embedding_coubcom_orig_link', false)) {
+            if (current_options.is('option_embedding_remove_original_link')) {
                 $(obj).hide();
             }
         }
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index 615ae3f..5fa18fa 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -112,15 +112,10 @@
                             </label>
                         </div>
 
-                        <div class="option-node">
-                            <input type="checkbox" name="option-embedding-coubcom" id="option-embedding-coubcom">
-                            <label for="option-embedding-coubcom" data-i18n="option_embedding_coubcom"></label>
-
-                            <label class="option-node">
-                                <input type="checkbox" name="option-embedding-coubcom-orig-link">
-                                <span data-i18n="option_embedding_coubcom_orig_link"></span>
-                            </label>
-                        </div>
+                        <label class="option-node">
+                            <input type="checkbox" name="option-embedding-coubcom">
+                            <span data-i18n="option_embedding_coubcom"></span>
+                        </label>
 
                         <label class="option-node">
                             <input type="checkbox" name="option-embedding-twitter-tweets">

From a2f6aab453906bb9871cd740dc9758ca280bd573 Mon Sep 17 00:00:00 2001
From: isqua <isqua@isqua.ru>
Date: Sat, 31 Jan 2015 14:05:15 +0300
Subject: [PATCH 4/6] Remove audio, soundclound and pleer.com original link
 option

---
 chrome_point_plus/_locales/en/messages.json |  7 ++--
 chrome_point_plus/_locales/ru/messages.json |  7 ++--
 chrome_point_plus/js/point-plus.js          | 12 +++----
 chrome_point_plus/options.html              | 39 +++++++--------------
 4 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/chrome_point_plus/_locales/en/messages.json b/chrome_point_plus/_locales/en/messages.json
index d34fa8f..74942bc 100644
--- a/chrome_point_plus/_locales/en/messages.json
+++ b/chrome_point_plus/_locales/en/messages.json
@@ -78,13 +78,10 @@
         "message": "Leave original link"
     },
     "option_embedding_soundcloud": {
-        "message": "Soundcloud &#9660;"
-    },
-    "option_embedding_soundcloud_orig_link": {
-        "message": "Leave original link"
+        "message": "Soundcloud"
     },
     "option_embedding_pleercom": {
-        "message": "Pleer.com &#9660;"
+        "message": "Pleer.com"
     },
     "option_embedding_coubcom": {
         "message": "Coub.com"
diff --git a/chrome_point_plus/_locales/ru/messages.json b/chrome_point_plus/_locales/ru/messages.json
index 05a51e1..3ecbf23 100644
--- a/chrome_point_plus/_locales/ru/messages.json
+++ b/chrome_point_plus/_locales/ru/messages.json
@@ -78,13 +78,10 @@
         "message": "Оставлять ссылку на видео"
     },
     "option_embedding_soundcloud": {
-        "message": "Soundcloud &#9660;"
-    },
-    "option_embedding_soundcloud_orig_link": {
-        "message": "Не убирать ссылку"
+        "message": "Soundcloud"
     },
     "option_embedding_pleercom": {
-        "message": "Pleer.com &#9660;"
+        "message": "Pleer.com"
     },
     "option_embedding_coubcom": {
         "message": "Coub.com"
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 269d263..70b2cec 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -96,12 +96,10 @@ function PointPlus(ppVersion) {
                                         </div>');
 
                             // Replace or prepend
-                            if (options.is('option_embedding_soundcloud_orig_link')) {
-                                // Before
-                                $(this).before($player);
-                            } else {
-                                // Replace
+                            if (options.is('option_embedding_remove_original_link')) {
                                 $(this).replaceWith($player);
+                            } else {
+                                $(this).before($player);
                             }
                         });
                     }
@@ -919,7 +917,7 @@ function parse_all_audios(current_options){
 
             obj.parentElement.insertBefore(player, obj);
 
-            if (current_options.is('option_audios_parse_leave_links', false)) {
+            if (current_options.is('option_embedding_remove_original_link')) {
                 $(obj).hide();
             }
         }
@@ -984,7 +982,7 @@ function parse_pleercom_links(current_options) {
             '<embed src="' + trackHref + '" type="application/x-shockwave-flash" width="578" height="60">' +
             '</embed></object>');
 
-            if ( ! current_options.is('option_embedding_pleercom_orig_link')) {
+            if (current_options.is('option_embedding_remove_original_link')) {
                 $link.remove();
             }
         }
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index 5fa18fa..b5377b0 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -82,35 +82,20 @@
                             </label>
                         </div>
 
-                        <div class="option-node">
-                            <input type="checkbox" name="option-audios-parse-links" id="option-audios-parse-links">
-                            <label for="option-audios-parse-links" data-i18n="option_audios_parse_links"></label>
+                        <label class="option-node">
+                            <input type="checkbox" name="option-audios-parse-links">
+                            <span data-i18n="option_audios_parse_links"></span>
+                        </label>
 
-                            <label class="option-node">
-                                <input type="checkbox" name="option-audios-parse-leave-links">
-                                <span data-i18n="option_embedding_soundcloud_orig_link"></span>
-                            </label>
-                        </div>
+                        <label class="option-node">
+                            <input type="checkbox" name="option-embedding-soundcloud">
+                            <span data-i18n="option_embedding_soundcloud"></span>
+                        </label>
 
-                        <div class="option-node">
-                            <input type="checkbox" name="option-embedding-soundcloud" id="option-embedding-soundcloud">
-                            <label for="option-embedding-soundcloud" data-i18n="option_embedding_soundcloud"></label>
-
-                            <label class="option-node">
-                                <input type="checkbox" name="option-embedding-soundcloud-orig-link">
-                                <span data-i18n="option_embedding_soundcloud_orig_link"></span>
-                            </label>
-                        </div>
-
-                        <div class="option-node">
-                            <input type="checkbox" name="option-embedding-pleercom" id="option-embedding-pleercom">
-                            <label for="option-embedding-pleercom" data-i18n="option_embedding_pleercom"></label>
-
-                            <label class="option-node">
-                                <input type="checkbox" name="option-embedding-pleercom-orig-link">
-                                <span data-i18n="option_embedding_soundcloud_orig_link"></span>
-                            </label>
-                        </div>
+                        <label class="option-node">
+                            <input type="checkbox" name="option-embedding-pleercom">
+                            <span data-i18n="option_embedding_pleercom"></span>
+                        </label>
 
                         <label class="option-node">
                             <input type="checkbox" name="option-embedding-coubcom">

From 18e75842f8d07f996e9d99d1b8b18906f2517565 Mon Sep 17 00:00:00 2001
From: isqua <isqua@isqua.ru>
Date: Sat, 31 Jan 2015 14:11:29 +0300
Subject: [PATCH 5/6] Remove video original link option

---
 chrome_point_plus/_locales/en/messages.json | 3 ---
 chrome_point_plus/_locales/ru/messages.json | 3 ---
 chrome_point_plus/js/point-plus.js          | 4 ++--
 chrome_point_plus/options.html              | 5 -----
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/chrome_point_plus/_locales/en/messages.json b/chrome_point_plus/_locales/en/messages.json
index 74942bc..f347c64 100644
--- a/chrome_point_plus/_locales/en/messages.json
+++ b/chrome_point_plus/_locales/en/messages.json
@@ -74,9 +74,6 @@
     "option_videos_parse_all_links": {
         "message": "Parse all links"
     },
-    "option_videos_parse_leave_links": {
-        "message": "Leave original link"
-    },
     "option_embedding_soundcloud": {
         "message": "Soundcloud"
     },
diff --git a/chrome_point_plus/_locales/ru/messages.json b/chrome_point_plus/_locales/ru/messages.json
index 3ecbf23..a102ec8 100644
--- a/chrome_point_plus/_locales/ru/messages.json
+++ b/chrome_point_plus/_locales/ru/messages.json
@@ -74,9 +74,6 @@
     "option_videos_parse_all_links": {
         "message": "Все ссылки на видео"
     },
-    "option_videos_parse_leave_links": {
-        "message": "Оставлять ссылку на видео"
-    },
     "option_embedding_soundcloud": {
         "message": "Soundcloud"
     },
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 70b2cec..de2b23f 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -844,7 +844,7 @@ function parse_webm(current_options) {
 
             obj.parentElement.insertBefore(player, obj);
 
-            if (current_options.is('option_videos_parse_leave_links', false)) {
+            if (current_options.is('option_embedding_remove_original_link')) {
                 $(obj).hide();
             }
         }
@@ -868,7 +868,7 @@ function parse_all_videos(current_options) {
 
             obj.parentElement.insertBefore(player, obj);
 
-            if (current_options.is('option_videos_parse_leave_links', false)) {
+            if (current_options.is('option_embedding_remove_original_link')) {
                 $(obj).hide();
             }
         }
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index b5377b0..cac9e6a 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -75,11 +75,6 @@
                                     <span data-i18n="option_videos_parse_all_links"></span>
                                 </label>
                             </div>
-
-                            <label class="option-node">
-                                <input type="checkbox" name="option-videos-parse-leave-links">
-                                <span data-i18n="option_videos_parse_leave_links"></span>
-                            </label>
                         </div>
 
                         <label class="option-node">

From fe6381ccfdd3009e4cc3a5a145a14d3a51d78e56 Mon Sep 17 00:00:00 2001
From: isqua <isqua@isqua.ru>
Date: Sat, 31 Jan 2015 14:12:48 +0300
Subject: [PATCH 6/6] Add chevron to video embedding option

---
 chrome_point_plus/_locales/en/messages.json | 2 +-
 chrome_point_plus/_locales/ru/messages.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome_point_plus/_locales/en/messages.json b/chrome_point_plus/_locales/en/messages.json
index f347c64..9aa5015 100644
--- a/chrome_point_plus/_locales/en/messages.json
+++ b/chrome_point_plus/_locales/en/messages.json
@@ -66,7 +66,7 @@
         "message": "Audio from direct links"
     },
     "option_videos_parse_links": {
-        "message": "Video from direct links"
+        "message": "Video from direct links &#9660;"
     },
     "option_videos_parse_webm": {
         "message": "Only webm"
diff --git a/chrome_point_plus/_locales/ru/messages.json b/chrome_point_plus/_locales/ru/messages.json
index a102ec8..3cfa8e8 100644
--- a/chrome_point_plus/_locales/ru/messages.json
+++ b/chrome_point_plus/_locales/ru/messages.json
@@ -66,7 +66,7 @@
         "message": "Аудио по прямой ссылке"
     },
     "option_videos_parse_links": {
-        "message": "Видео по прямой ссылке"
+        "message": "Видео по прямой ссылке &#9660;"
     },
     "option_videos_parse_webm": {
         "message": "Только webm"