better account list get for reblog yourself

- use Tumblr's blog switcher Option+Tab
jcutler · Nov 12, 2012 · 5b873e6 · 5b873e6
1 parent ec91dc6
commit 5b873e6
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 20 deletions.
diff --git a/core/common/getAccounts.js b/core/common/getAccounts.js
@@ -26,7 +26,20 @@
 MissingE.packages.getAccounts = {
 
    run: function() {
-      var list = $('#popover_blogs div');
+      var list = $('#tab_switching .tab_blog');
+      if (list.length > 0) {
+         var accounts = [];
+         list.each(function(i) {
+            var acct = this.id ? this.id.match(/tab_blog_(.*)/) : null;
+            if (!acct) { return; }
+            var name = $(this).find('.blog_name_span').text();
+            name = name.replace(/%/g,"%%").replace(/,/g,"%2C");
+            accounts.push(acct[1] + ":" + name);
+         });
+         extension.backupVal("MissingE_tumblrs",accounts.join(","));
+         return;
+      }
+      list = $('#popover_blogs div');
       if (list.length > 0) {
          var accounts = [];
          list.each(function(i) {

diff --git a/core/reblogYourself/reblogYourself_fill.js b/core/reblogYourself/reblogYourself_fill.js
@@ -85,27 +85,39 @@ MissingE.packages.reblogYourselfFill = {
    },
 
    init: function() {
-      extension.sendRequest("getBackupVal", {key: "MissingE_tumblrs"},
-                            function(response) {
-         if (response.key === "MissingE_tumblrs") {
-            MissingE.packages.reblogYourselfFill.accounts = [];
-            if (response.val !== "") {
-               var txt = response.val;
-               while (txt.length > 0) {
-                  var len = txt.indexOf(":");
-                  var acct = txt.substring(0,len);
-                  txt = txt.substring(len+1);
-                  len = txt.indexOf(",");
-                  if (len < 0) { len = txt.length; }
-                  var acctTxt = txt.substring(0,len);
-                  txt = txt.substring(len+1);
-                  acctTxt = acctTxt.replace(/%%/g,"%").replace(/%2C/g,",");
-                  MissingE.packages.reblogYourselfFill.accounts.push({account:acct,name:acctTxt});
+      MissingE.packages.reblogYourselfFill.accounts = [];
+      var list = $('#tab_switching .tab_blog');
+      if (list.length > 0) {
+         list.each(function(i) {
+            var acct = this.id ? this.id.match(/tab_blog_(.*)/) : null;
+            if (!acct) { return; }
+            var acctTxt = $(this).find('.blog_name_span').text();
+            MissingE.packages.reblogYourselfFill.accounts.push({account:acct[1],name:acctTxt});
+         });
+         MissingE.packages.reblogYourselfFill.run();
+      }
+      else {
+         extension.sendRequest("getBackupVal", {key: "MissingE_tumblrs"},
+                               function(response) {
+            if (response.key === "MissingE_tumblrs") {
+               if (response.val !== "") {
+                  var txt = response.val;
+                  while (txt.length > 0) {
+                     var len = txt.indexOf(":");
+                     var acct = txt.substring(0,len);
+                     txt = txt.substring(len+1);
+                     len = txt.indexOf(",");
+                     if (len < 0) { len = txt.length; }
+                     var acctTxt = txt.substring(0,len);
+                     txt = txt.substring(len+1);
+                     acctTxt = acctTxt.replace(/%%/g,"%").replace(/%2C/g,",");
+                     MissingE.packages.reblogYourselfFill.accounts.push({account:acct,name:acctTxt});
+                  }
                }
+               MissingE.packages.reblogYourselfFill.run();
             }
-            MissingE.packages.reblogYourselfFill.run();
-         }
-      });
+         });
+      }
    }
 };