Merge pull request #93 from steemplus/master

Steemplus 2.16 : Resteem Indicator
stoodkev · May 30, 2018 · a6b6814 · a6b6814
2 parents 3d93049 + e2971af
commit a6b6814
Show file tree

Hide file tree

Showing 7 changed files with 304 additions and 6 deletions.
diff --git a/main.js b/main.js
@@ -86,7 +86,7 @@ Promise.all([steem.api.getDynamicGlobalPropertiesAsync(), steem.api.getCurrentMe
   });
 });
 
-chrome.storage.local.get(['author_popup_info','rewards_tab','wallet_history','wallet_history_memo_key','article_count','witnesses_tab','classification_user','board_reward','favorite_section','votePowerReserveRateLS','totalSteemLS','totalVestsLS','rewardBalanceLS','recentClaimsLS','steemPriceLS','post_floating_bottom_bar','post_floating_bottom_bar_size','last_post_url','smi_installed_remind_me', 'smi_installed_remind_me_time','md_editor_beautifier','blog_histogram','user_info_popover','gif_picker','boost_button','followers_table','vote_weight_slider','mentions_tab','search_bar','external_link_tab','vote_tab','steemit_more_info','post_votes_list', 'oneup','weight','del','transfers','acc_v','ben','drop','badge','username', 'nb_posts','resteem','sort','tag','list_tags','voted_check', 'rep_feed', 'rep_feed_check', 'classif','whitelist', 'blacklist','feedp','sessionToken','tokenExpire','market'], function (items) {
+chrome.storage.local.get(['resteem_indicator','add_signature','author_popup_info','rewards_tab','wallet_history','wallet_history_memo_key','article_count','witnesses_tab','classification_user','board_reward','favorite_section','votePowerReserveRateLS','totalSteemLS','totalVestsLS','rewardBalanceLS','recentClaimsLS','steemPriceLS','post_floating_bottom_bar','post_floating_bottom_bar_size','last_post_url','smi_installed_remind_me', 'smi_installed_remind_me_time','md_editor_beautifier','blog_histogram','user_info_popover','gif_picker','boost_button','followers_table','vote_weight_slider','mentions_tab','search_bar','external_link_tab','vote_tab','steemit_more_info','post_votes_list', 'oneup','weight','del','transfers','acc_v','ben','drop','badge','username', 'nb_posts','resteem','sort','tag','list_tags','voted_check', 'rep_feed', 'rep_feed_check', 'classif','whitelist', 'blacklist','feedp','sessionToken','tokenExpire','market'], function (items) {
   var steemConnect=(items.sessionToken===undefined||items.tokenExpire===undefined)?{connect:false}:{connect:true,sessionToken:items.sessionToken,tokenExpire:items.tokenExpire};
   chrome.runtime.sendMessage({ token:token, to: 'steemConnect', order: 'start',data:{steemConnect:steemConnect,steemit:steemit,busy:busy,utopian:utopian}} );
   market=items.market==undefined?{SBDperSteem:0,priceSteem:0,priceSBD:0}:items.market;
@@ -250,6 +250,7 @@ function startOfflineFeatures(items, user, account)
   const rewards_tab=(items.rewards_tab == undefined || items.rewards_tab=='show');
   const author_popup_info=(items.author_popup_info == undefined || items.author_popup_info=='show');
   const add_signature=(items.add_signature == undefined || items.add_signature=='show');
+  const resteem_indicator=(items.resteem_indicator == undefined || items.resteem_indicator=='show');
 
 
   const smi_installed_remind_me=(items.smi_installed_remind_me == undefined || items.smi_installed_remind_me);
@@ -288,6 +289,9 @@ function startOfflineFeatures(items, user, account)
       chrome.runtime.sendMessage({ token:token, to: 'author_popup_info', order: 'start',data:{user:user}});
   if(add_signature&&steemit)
       chrome.runtime.sendMessage({ token:token, to: 'add_signature', order: 'start',data:{user:user, steemit:steemit, busy:busy, utopian:utopian}});
+  if(add_signature&&steemit)
+      chrome.runtime.sendMessage({ token:token, to: 'resteem_indicator', order: 'start',data:{}});
+
 
   if (steemit&&steemit_more_info) {
     if(post_votes_list)
@@ -369,6 +373,8 @@ function startOfflineFeatures(items, user, account)
           chrome.runtime.sendMessage({ token:token, to: 'author_popup_info', order: 'click',data:{user:user}});
         if(add_signature&&steemit)
           chrome.runtime.sendMessage({ token:token, to: 'add_signature', order: 'click',data:{user:user, steemit:steemit, busy:busy, utopian:utopian}});
+        if(resteem_indicator&&steemit)
+          chrome.runtime.sendMessage({ token:token, to: 'resteem_indicator', order: 'click',data:{}});
 
 
         if($('.favorite-star').length > 0){

diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
 
   "name": "SteemPlus",
   "description": "Lightweight toolbox for Steemit",
-  "version": "2.15",
+  "version": "2.16",
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
   "browser_action": {
     "default_icon": "src/img/logo.png",
@@ -96,7 +96,8 @@
         "src/js/wallet_history.js",
         "src/js/rewards_tab.js",
         "src/js/author_popup_info.js",
-        "src/js/add_signature.js"],
+        "src/js/add_signature.js",
+        "src/js/resteem_indicator.js"],
 
       "css":["vendor/unslider/unslider.css","vendor/font-awesome.min.css","vendor/unslider/unslider-dots.css","vendor/bootstrap.css","vendor/bootstrap-grid.css","vendor/btn.css","vendor/datatables.min.css","vendor/justifiedGallery.min.css","vendor/toastr.min.css",
         "src/css/delegate.css",
@@ -118,7 +119,8 @@
         "src/css/wallet_history.css",
         "src/css/rewards_tab.css",
         "src/css/author_popup_info.css",
-        "src/css/add_signature.css"],
+        "src/css/add_signature.css",
+        "src/css/resteem_indicator.css"],
       "run_at": "document_idle"
     }
   ]

diff --git a/popup.html b/popup.html
@@ -248,6 +248,16 @@ <h3>Login</h3>
                         <p class="option-description">Add a signature to your account. Now you can easily add this signature to any comment or post.</a></p>
                     </div>
 
+                    <div class="sp_option">
+                        <label class="switch">
+                            <input type="checkbox" name="resteem_indicator"  id="resteem_indicator">
+                            <span class="slider2 round"></span>
+                        </label>
+                        <p class="option-title">Resteem Indicator</p>
+                        <div class="platform-indicators"><img class="platform-indicator-logo" src="src/img/platform-logos/steemit.png"></div>
+                        <p class="option-description">Display who resteemed a post></a></p>
+                    </div>
+
                     <div class="sp_option_list_title">
                         <label class="switch">
                             <input type="checkbox" name="steemit_more_info"  id="steemit_more_info">

diff --git a/popup.js b/popup.js
@@ -11,7 +11,7 @@ var isConnectedToSteemConnect=null;
 
 $('#shortcuts, .switch-text').hide();
 // Get local parameters stored using Chrome Storage API
-chrome.storage.local.get(['add_signature','author_popup_info','rewards_tab','wallet_history','article_count','witnesses_tab','classification_user','board_reward','favorite_section','post_floating_bottom_bar','md_editor_beautifier','blog_histogram','user_info_popover','gif_picker','boost_button','followers_table','vote_weight_slider','mentions_tab','search_bar','external_link_tab','vote_tab','steemit_more_info','post_votes_list','onboarding','oneup','sessionToken','tokenExpire','weight','resteem','blacklist','whitelist','reputation','rep','badge','del','ben','feedp','drop','acc_v','transfers'], function (items) {
+chrome.storage.local.get(['resteem_indicator','add_signature','author_popup_info','rewards_tab','wallet_history','article_count','witnesses_tab','classification_user','board_reward','favorite_section','post_floating_bottom_bar','md_editor_beautifier','blog_histogram','user_info_popover','gif_picker','boost_button','followers_table','vote_weight_slider','mentions_tab','search_bar','external_link_tab','vote_tab','steemit_more_info','post_votes_list','onboarding','oneup','sessionToken','tokenExpire','weight','resteem','blacklist','whitelist','reputation','rep','badge','del','ben','feedp','drop','acc_v','transfers'], function (items) {
     var steemConnect=(items.sessionToken===undefined||items.tokenExpire===undefined||items.tokenExpire<Date.now())?{connect:false}:{connect:true,sessionToken:items.sessionToken,tokenExpire:items.tokenExpire};
     isConnectedToSteemConnect = steemConnect.connect;
     // Connected
@@ -97,6 +97,7 @@ chrome.storage.local.get(['add_signature','author_popup_info','rewards_tab','wal
     rewards_tab=items.rewards_tab==undefined?'show':items.rewards_tab;
     author_popup_info=items.author_popup_info==undefined?'show':items.author_popup_info;
     add_signature=items.add_signature==undefined?'show':items.add_signature;
+    resteem_indicator=items.resteem_indicator==undefined?'show':items.resteem_indicator;
 
     // Steemit more info
     steemit_more_info=items.steemit_more_info==undefined?'show':items.steemit_more_info;
@@ -144,6 +145,7 @@ chrome.storage.local.get(['add_signature','author_popup_info','rewards_tab','wal
     $('input[name=rewards_tab]').prop('checked',rewards_tab=='show');
     $('input[name=author_popup_info]').prop('checked',author_popup_info=='show');
     $('input[name=add_signature]').prop('checked',add_signature=='show');
+    $('input[name=resteem_indicator]').prop('checked',resteem_indicator=='show');
 
     // Steemit more info
     $('input[name=steemit_more_info]').prop('checked',steemit_more_info=='show');
@@ -463,6 +465,12 @@ $(document).on("change","input[name=add_signature]",function(){
     });
 });
 
+$(document).on("change","input[name=resteem_indicator]",function(){
+    chrome.storage.local.set({
+        resteem_indicator:$("input[name=resteem_indicator]").prop('checked')?'show':'hide'
+    });
+});
+
 $(document).on("change","input[name=steemit_more_info]",function(){
 
     chrome.storage.local.set({

diff --git a/src/css/resteem_indicator.css b/src/css/resteem_indicator.css
@@ -0,0 +1,24 @@
+.resteem-list
+{
+	margin-right: 0.25rem;
+}
+
+.resteem-item > a
+{
+	line-height: 1 !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    margin-bottom: 0.25rem !important;
+
+}
+.ul-resteem-list
+{
+	padding-left: 0.25rem !important;
+	overflow-y: scroll;
+	max-height: 200px;
+}
+
+.count-resteem-label
+{
+	font-weight: normal;
+}