From efd276deec5fa30ba187a947849cf72a1a0d74b5 Mon Sep 17 00:00:00 2001
From: Nokita Kaze <admin@kanaria.ru>
Date: Sun, 16 Nov 2014 15:10:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=20=D1=81=D0=BE=D0=B6=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8E=20=D1=8D=D1=82=D0=BE=20=D0=BD=D0=B5=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE.=20=D0=91=D1=80?=
 =?UTF-8?q?=D0=B0=D1=83=D0=B7=D0=B5=D1=80=20=D0=BD=D0=B5=20=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=91=D1=82=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20Cro?=
 =?UTF-8?q?ss-site=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No 'Access-Control-Allow-Origin' header is present on the requested resource
---
 chrome_point_plus/css/point-plus.css |  5 ---
 chrome_point_plus/js/options.js      |  7 +--
 chrome_point_plus/js/point-plus.js   | 66 +++++++++++++++++++++++++---
 chrome_point_plus/manifest.json      |  2 +-
 chrome_point_plus/options.html       |  6 ++-
 5 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/chrome_point_plus/css/point-plus.css b/chrome_point_plus/css/point-plus.css
index 702a25a..5276d68 100644
--- a/chrome_point_plus/css/point-plus.css
+++ b/chrome_point_plus/css/point-plus.css
@@ -180,8 +180,3 @@ div#markItUpText-input {
     margin-left: 0.2em;
     background: #f2eceb;
 }
-
-/* Embeded audio */
-audio.embeded_audio{
-    display: block;
-}
diff --git a/chrome_point_plus/js/options.js b/chrome_point_plus/js/options.js
index 8890c3a..bc75495 100644
--- a/chrome_point_plus/js/options.js
+++ b/chrome_point_plus/js/options.js
@@ -24,6 +24,7 @@ var ppOptions = [
             'option_embedding_soundcloud_orig_link',
         // Pleer.com
         'option_embedding_pleercom',
+            'option_embedding_pleercom_nokita_server',
     // Fluid layout
     'option_fluid_layout', 
     // Visual editor for posts
@@ -62,7 +63,8 @@ function pp_save_options() {
     ppOptions.option_videos_parse_webm = $('#option-videos-parse-webm').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 = $('#option-embedding-pleercom').prop('checked');
+    ppOptions.option_embedding_pleercom_nokita_server = $('#option-embedding-pleercom-nokita-server').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');
@@ -78,7 +80,6 @@ function pp_save_options() {
     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');
 
-
     // Saving parameters
     chrome.storage.sync.set(ppOptions, function() {
         // Update status to let user know options were saved.
@@ -100,8 +101,8 @@ function pp_restore_options() {
             // Detecting option type
             if (typeof(value) == 'boolean') {
                 // Checkbox
-                optionId = '#' + key.replace(/_/g, '-');
                 if (value === true) {
+                    optionId = '#' + key.replace(/_/g, '-');
                     $(optionId).first().prop('checked', true);
                 }
             } else if (typeof(value) == 'number') {
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 35a6edf..a0459d3 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -35,7 +35,7 @@ $(document).ready(function() {
                     $player = $('<div class="pp-soundcloud">\
                                     <object height="81" width="100%" id="pp-soundcloud-' + index + '" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">\
                                       <param name="movie" value="http://player.soundcloud.com/player.swf?url=' + encodeURIComponent($(this).prop('href'))
-                    + '&enable_api=true&object_id=pp-soundcloud-' + index + '"></param>\
+                    + '&enable_api=true&object_id=pp-soundcloud-' + index + '">\
                                       <param name="allowscriptaccess" value="always">\
                                       <embed allowscriptaccess="always" height="81" src="http://player.soundcloud.com/player.swf?url='
                     + encodeURIComponent($(this).prop('href')) + '&enable_api=true&object_id=pp-soundcloud-' + index
@@ -520,7 +520,6 @@ function create_image(domain, id, additional) {
 /* point */
 // Эта часть написана @RainbowSpike
 function mark_unread_post() {
-    // @todo Проверить работает ли
     var divs = $(".post"); // массив постов
     for (var i = 0; i < divs.length; i++) { // обыск постов
         var spans = $(divs[i]).find(".unread"); // поиск метки непрочитанных комментов
@@ -583,6 +582,7 @@ function set_posts_count_label() {
                 }
 
                 var e1 = document.createElement('span');
+                if (typeof(answer.list[id])=='undefined'){return;}
                 $(e1).addClass('authors_unique_count').html(answer.list[id].count_comment_unique).attr('title', 'Количество комментаторов');
                 postid.appendChild(e1);
 
@@ -596,7 +596,17 @@ function set_posts_count_label() {
 
 }
 
-function parse_pleercom_links() {
+function parse_pleercom_links(){
+    chrome.storage.sync.get(ppOptions, function(options) {
+        if (options.option_embedding_pleercom_nokita_server){
+            parse_pleercom_links_nokita();
+        }else{
+            parse_pleercom_links_ajax();
+        }
+    });
+}
+
+function parse_pleercom_links_nokita() {
     $('a').each(function (num, obj) {
         var href = obj.href;
         var n = null;
@@ -607,11 +617,53 @@ function parse_pleercom_links() {
                 'src': 'https://api.kanaria.ru/point/get_pleer_file.php?id=' + n[1],
                 'controls': 'controls',
                 'preload': 'none'
-            }).addClass('embeded_audio');
+            });
 
-            obj.parentElement.insertBefore(player, obj);
+            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);
         }
     });
-
-
 }
+
+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]);
+            obj.parentElement.insertBefore(player_div, obj);
+            create_pleercom_ajax(n[1]);
+        }
+    });
+}
+
+function create_pleercom_ajax(id){
+    $ajax({
+        'url':'https://pleer.com/site_api/files/get_url',
+        'type':'post',
+        'postdata':'action=download&id='+id,
+        'pleer_id':id,
+        'success': function (a) {
+            var answer = JSON.parse(a);
+            var player = document.createElement('audio');
+            // @todo Проверять существование track_link
+            $(player).attr({
+                'src': answer.track_link,
+                'controls': 'controls',
+                'preload': 'auto'
+            });
+            $('.embeded_audio_'+this.settings.pleer_id)[0].appendChild(player);
+        },
+        'error':function(){
+            console.log('Can not get url');
+            setTimeout(new Function('create_pleercom_ajax("'+this.settings.pleer_id+'");'), 1000);
+        }
+
+    });
+
+}
\ No newline at end of file
diff --git a/chrome_point_plus/manifest.json b/chrome_point_plus/manifest.json
index 30e0d54..3dd24f5 100644
--- a/chrome_point_plus/manifest.json
+++ b/chrome_point_plus/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Point+",
-    "version": "1.10.1",
+    "version": "1.10.2",
     "author": "Alexey Skobkin",
     "homepage_url": "https://bitbucket.org/skobkin/chrome_point_plus",
     "description": "More features for point.im",
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index bf6127d..bd8f95a 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -62,7 +62,11 @@
                         </div>
 
                         <div class="option">
-                            <input type="checkbox" id="option-embedding-pleercom"><label for="option-embedding-pleercom">Pleer.com</label>
+                            <input type="checkbox" id="option-embedding-pleercom"><label for="option-embedding-pleercom">Pleer.com &#9660;</label>
+
+                            <div class="option">
+                                <input type="checkbox" id="option-embedding-pleercom-nokita-server"><label for="option-embedding-pleercom-nokita-server">Use Nokita's server</label>
+                            </div>
                         </div>
                     </div>
                 </div>