blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

block cdmWatchdog() in Fresh feed

Browse source
This commit is contained in:
Andrew Dolgov 2008-11-13 06:53:41 +01:00
parent f29ba1484f
commit a969b30bb1
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
localized_schema.php
View file

@ -39,7 +39,7 @@
__("Enable search toolbar"); __("Enable search toolbar");
__("Hide feeds with no unread messages"); __("Hide feeds with no unread messages");
__("Mark articles as read automatically"); __("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"); __("On catchup show next feed");
__("When \"Mark as read\" button is clicked in toolbar, automatically open next feed with unread articles."); __("When \"Mark as read\" button is clicked in toolbar, automatically open next feed with unread articles.");
__("Open article links in new browser window"); __("Open article links in new browser window");

2
sanity_check.php
View file

@ -2,7 +2,7 @@
require_once "functions.php"; require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 17); define('EXPECTED_CONFIG_VERSION', 17);
define('SCHEMA_VERSION', 44); define('SCHEMA_VERSION', 45);
if (!file_exists("config.php")) { if (!file_exists("config.php")) {
print __("<b>Fatal Error</b>: You forgot to copy print __("<b>Fatal Error</b>: You forgot to copy

4
schema/ttrss_schema_mysql.sql
View file

@ -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; 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, create table ttrss_enclosures (id serial not null primary key,
content_url text not null, 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) 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, 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); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_MODE', 2, 'adaptive', '', 1);

4
schema/ttrss_schema_pgsql.sql
View file

@ -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); 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, create table ttrss_enclosures (id serial not null primary key,
content_url text not null, 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) 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, 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); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_MODE', 2, 'adaptive', '', 1);

1
viewfeed.js
View file

@ -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 (_cdm_wd_timeout) window.clearTimeout(_cdm_wd_timeout);
if (!document.getElementById("headlinesList") && if (!document.getElementById("headlinesList") &&
getActiveFeedId() != -3 &&
getInitParam("cdm_auto_catchup") == 1) { getInitParam("cdm_auto_catchup") == 1) {
debug("starting CDM watchdog"); debug("starting CDM watchdog");
_cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000); _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000);