Changeset 39079

Timestamp:

11/30/11 02:11:21 (18 months ago)

Author:

NeoCat

Message:

Auto adjust auto_reload timeout after tweet

Files:

• websites/twicli/twicli.js (modified) (7 diffs)

websites/twicli/twicli.js

@@ -126 +126 @@
 }
 var postSeq = 0;
+var postTimeout = 2000;
 function postInIFrame(url, done, err, retry) {
         loading(true);
@@ -136 +137 @@
         pfr.style.display = "none";
         var errTimer = false;
-        // 5秒(エラー処理指定時は3秒→10秒)で正常終了しなければエラーとみなす
+        // 5秒(エラー処理指定時はデフォルト2秒→10秒)で正常終了しなければエラーとみなす
         errTimer = setTimeout(function(){
                 loading(false);
@@ -145 +146 @@
                         postNext();
                 }, 0);
-        }, retry?10000:err?3000:5000);
+        }, retry?10000:err?postTimeout:5000);
         var cnt = 0;
         var onload = pfr.onload = function(){
@@ -507 +508 @@
                 return false;
         }
-        var retry = false;
+        var retry = 0;
         if (st.value == "r" && last_post) {
-                retry = true;
+                retry = 1;
                 st.value = last_post;
                 in_reply_to_user = last_in_reply_to_user;
@@ -527 +528 @@
                                                                                 "&long=" + geo.coords.longitude : "") +
                                 (in_reply_to_status_id ? "&in_reply_to_status_id=" + in_reply_to_status_id : ""),
-                                function(){ resetFrm(); if (auto_update) update() },
+                                function(){ resetFrm(); if (auto_update) { update_post_check = [2,text]; setTimeout(update, postTimeout); }},
                                 function(){ if (auto_update) { update_post_check = [retry,text]; update() }}, retry);
         in_reply_to_user = in_reply_to_status_id = null;
@@ -1061 +1062 @@
                 if (update_post_check && tw[j].user.screen_name == myname && removeLink(tw[j].text) == removeLink(update_post_check[1])) {
                         if ($('fst').value == update_post_check[1]) resetFrm();
+                        if (update_post_check[0] != 1) postTimeout = Math.max(1000, postTimeout-50);
                         update_post_check = false;
                 }
@@ -1078 +1080 @@
         if (update_post_check) {
                 var st = document.frm.status;
-                if (!update_post_check[0] && st.value == update_post_check[1] && st.value == last_post) {
-                        st.value = 'r';
-                        press(1);
+                if (update_post_check[0] != 1)  {
+                        postTimeout = Math.min(10000, postTimeout+500);
+                        if (update_post_check[0] == 0 && st.value == update_post_check[1] && st.value == last_post) {
+                                st.value = 'r';
+                                press(1);
+                        } else
+                                update_post_check = false;
                 } else
-                                update_post_check = false;
+                        update_post_check = false;
         }
 }