block cdmWatchdog() in Fresh feed

diff --git a/localized_schema.php b/localized_schema.php
index 623160ec15ec76af8fbd914bb28eebdc8c7ab00a..1a543c7ec11a40d134018dc5500b68a18d3be97e 100644 (file)
--- a/localized_schema.php
+++ b/localized_schema.php
@@ -39,7 +39,7 @@
        __("Enable search toolbar");
        __("Hide feeds with no unread messages");
        __("Mark articles as read automatically");
-       __("This option enables marking articles as read automatically in combined mode while you scroll article list.");
+       __("This option enables marking articles as read automatically in combined mode (except for Fresh articles feed) while you scroll article list.");
        __("On catchup show next feed");
        __("When \"Mark as read\" button is clicked in toolbar, automatically open next feed with unread articles.");
        __("Open article links in new browser window");

diff --git a/sanity_check.php b/sanity_check.php
index 30ed6ff24bab02c4972910a58d3c364e5547dea6..e84fb9f86b5d450ae23ac3cf3e45db0c30c34edf 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 17);
-       define('SCHEMA_VERSION', 44);
+       define('SCHEMA_VERSION', 45);
 
        if (!file_exists("config.php")) {
                print __("<b>Fatal Error</b>: You forgot to copy 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 889ca6a033d856772adc3db0fca85571260680f9..e4fdfcca3120b51fd32d6767c3068731454640f4 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -219,7 +219,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB;
 
-insert into ttrss_version values (44);
+insert into ttrss_version values (45);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,
@@ -305,7 +305,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('CDM_AUTO_CATCHUP', 1, 'false', 'Mark articles as read automatically',2,
-'This option enables marking articles as read automatically in combined mode while you scroll article list.');
+'This option enables marking articles as read automatically in combined mode (except for Fresh articles feed) while you scroll article list.');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_MODE', 2, 'adaptive', '', 1);
 

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 9d716f235f12e44f919324b6a2a9c1bee890b907..5b40fab33eb72aa71b2ba701d3f67de8b8c92762 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -196,7 +196,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (44);
+insert into ttrss_version values (45);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,
@@ -276,7 +276,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3);
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('CDM_AUTO_CATCHUP', 1, 'false', 'Mark articles as read automatically',2,
-'This option enables marking articles as read automatically in combined mode while you scroll article list.');
+'This option enables marking articles as read automatically in combined mode (except for Fresh articles feed) while you scroll article list.');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_MODE', 2, 'adaptive', '', 1);
 

diff --git a/viewfeed.js b/viewfeed.js
index ba9b13e06fabc95b556dbf7256d36149ab786fb5..94554a42207194b6db81eb3ed7c4e2963f445fc3 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -220,6 +220,7 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
                if (_cdm_wd_timeout) window.clearTimeout(_cdm_wd_timeout);
        
                if (!document.getElementById("headlinesList") && 
+                               getActiveFeedId() != -3 &&
                                getInitParam("cdm_auto_catchup") == 1) {
                        debug("starting CDM watchdog");
                        _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000);