valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retire DEFAULT_ARTICLE_LIMIT, infinite scrolling is fast enough to make it superfluous

This commit is contained in:
Andrew Dolgov 2013-04-02 15:32:47 +04:00
parent 4b7726f0b4
commit f17cac6b26
5 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeds.php
View File

@ -796,7 +796,7 @@ class Feeds extends Handler_Protected {
$feed = db_escape_string($this->link, $_REQUEST["feed"]); $feed = db_escape_string($this->link, $_REQUEST["feed"]);
$method = db_escape_string($this->link, $_REQUEST["m"]); $method = db_escape_string($this->link, $_REQUEST["m"]);
$view_mode = db_escape_string($this->link, $_REQUEST["view_mode"]); $view_mode = db_escape_string($this->link, $_REQUEST["view_mode"]);
$limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT"); $limit = 30;
@$cat_view = $_REQUEST["cat"] == "true"; @$cat_view = $_REQUEST["cat"] == "true";
@$next_unread_feed = db_escape_string($this->link, $_REQUEST["nuf"]); @$next_unread_feed = db_escape_string($this->link, $_REQUEST["nuf"]);
@$offset = db_escape_string($this->link, $_REQUEST["skip"]); @$offset = db_escape_string($this->link, $_REQUEST["skip"]);

11
classes/pref/prefs.php
View File

@ -120,7 +120,7 @@ class Pref_Prefs extends Handler_Protected {
global $access_level_names; global $access_level_names;
$prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES", $prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
"SORT_HEADLINES_BY_FEED_DATE"); "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT");
/* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */ /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */
@ -498,13 +498,6 @@ class Pref_Prefs extends Handler_Protected {
'dojoType="dijit.form.Select"'); 'dojoType="dijit.form.Select"');
} else if ($pref_name == "DEFAULT_ARTICLE_LIMIT") {
$limits = array(15, 30, 45, 60);
print_select($pref_name, $value, $limits,
'dojoType="dijit.form.Select"');
} else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") { } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") {
global $update_intervals_nodefault; global $update_intervals_nodefault;
@ -528,7 +521,7 @@ class Pref_Prefs extends Handler_Protected {
print "<input type='checkbox' name='$pref_name' $checked $disabled print "<input type='checkbox' name='$pref_name' $checked $disabled
dojoType='dijit.form.CheckBox' id='CB_$pref_name' value='1'>"; dojoType='dijit.form.CheckBox' id='CB_$pref_name' value='1'>";
} else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE', 'DEFAULT_ARTICLE_LIMIT', } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE',
'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) { 'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) {
$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';

4
include/db-prefs.php
View File

@ -166,10 +166,6 @@
$value = sprintf("%d", $value); $value = sprintf("%d", $value);
} }
if ($pref_name == 'DEFAULT_ARTICLE_LIMIT' && $value == 0) {
$value = 30;
}
if ($pref_name == 'USER_TIMEZONE' && $value == '') { if ($pref_name == 'USER_TIMEZONE' && $value == '') {
$value = 'UTC'; $value = 'UTC';
} }

2
include/functions.php
View File

@ -1840,7 +1840,7 @@
foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS", foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
"ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP", "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
"CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT", "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
"HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) { "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
$params[strtolower($param)] = (int) get_pref($link, $param); $params[strtolower($param)] = (int) get_pref($link, $param);

2
js/viewfeed.js
View File

@ -64,7 +64,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
vgroup_last_feed = reply['headlines-info']['vgroup_last_feed']; vgroup_last_feed = reply['headlines-info']['vgroup_last_feed'];
if (parseInt(headlines_count) < getInitParam("default_article_limit")) { if (parseInt(headlines_count) < 30) {
_infscroll_disable = 1; _infscroll_disable = 1;
} else { } else {
_infscroll_disable = 0; _infscroll_disable = 0;