Changeset 1030

Timestamp:

11/25/05 16:23:52 (3 years ago)

Author:

sdcosta

Message:

Hack to fix #179 , #144 and partially #216
Instead of determining where to go via ajax, we just get the javascript
to click the "markall as read" button. Currently we are not changing the
markReadIds but maybe we should if there are problems in the future...

Location:

trunk/rss

Files:

• ajax.php (modified) (2 diffs)
• feed.php (modified) (3 diffs)

trunk/rss/ajax.php

@@ -441 +441 @@
        
        // remove parent elements (heading, ul) if all the children are gone
-       if (ul.getElementsByTagName('li').length == 0) {
+       if (!redirect && (ul.getElementsByTagName('li').length == 0)) {
         pn = ul.parentNode;
         
@@ -455 +455 @@
        
        if (redirect) {
-        self.setTimeout('setRedirect()', 1000);
+    if (t = document.getElementById("_markReadButton")) {
+        // Maybe we should fix the array of ids also...
+        self.setTimeout('t.click()', 1000);
+    }else{
+             self.setTimeout('setRedirect()', 1000);
+    }
        }
     }

trunk/rss/feed.php

@@ -1325 +1325 @@
     }
     echo "\n\n<form action=\"". getPath() ."feed.php\" method=\"post\">\n"
-    ."\t<p><input type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_CHANNEL_READ ."\"/>\n"
+    ."\t<p><input id=\"_markReadButton\" type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_CHANNEL_READ ."\"/>\n"
     ."\t<input type=\"hidden\" name=\"metaaction\" value=\"LBL_MARK_CHANNEL_READ\"/>\n"
     ."\t<input type=\"hidden\" name=\"channel\" value=\"$cid\"/>\n"
@@ -1341 +1341 @@
     }
     echo "\n\n<form action=\"". getPath() ."feed.php\" method=\"post\">\n"
-    ."\t<p><input type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_FOLDER_READ ."\"/>\n"
+    ."\t<p><input id=\"_markReadButton\" type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_FOLDER_READ ."\"/>\n"
     ."\t<input type=\"hidden\" name=\"metaaction\" value=\"LBL_MARK_FOLDER_READ\"/>\n"
     ."\t<input type=\"hidden\" name=\"folder\" value=\"$fid\"/>\n"
@@ -1358 +1358 @@
     }
     echo "\n\n<form action=\"". getPath() ."feed.php\" method=\"post\">\n"
-    ."\t<p><input type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_FOLDER_READ ."\"/>\n"
+    ."\t<p><input id=\"_markReadButton\" type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_FOLDER_READ ."\"/>\n"
     ."\t<input type=\"hidden\" name=\"metaaction\" value=\"LBL_MARK_VFOLDER_READ\"/>\n"
     ."\t<input type=\"hidden\" name=\"vfolder\" value=\"$vfid\"/>\n"