xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jQuery2.2' into dev

Browse Source
pull/1150/head
Alexandre Alapetite 9 years ago
parent cf2b7b1a64 159ea0aecf
commit 1d4c9d3b3d
4 changed files with 24 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      CHANGELOG.md
  2. 4
      app/layout/layout.phtml
  3. 7
      app/views/helpers/javascript_vars.phtml
  4. 30
      p/scripts/main.js

7
CHANGELOG.md
Unescape View File

@ -1,8 +1,11 @@
# Changelog # Changelog
## 2015-xx-xx FreshRSS 1.3.1-beta ## 2016-xx-xx FreshRSS 1.3.1-beta
* UI
* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
* Updated to jQuery 2.2 and changed code for auto-load on scroll [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
* Nothing for the moment.
## 2015-11-03 FreshRSS 1.2.0 / 1.3.0-beta ## 2015-11-03 FreshRSS 1.2.0 / 1.3.0-beta

4
app/layout/layout.phtml
Unescape View File

@ -5,10 +5,10 @@
<meta name="viewport" content="initial-scale=1.0" /> <meta name="viewport" content="initial-scale=1.0" />
<?php echo self::headTitle(); ?> <?php echo self::headTitle(); ?>
<?php echo self::headStyle(); ?> <?php echo self::headStyle(); ?>
<?php echo self::headScript(); ?>
<script>//<![CDATA[ <script>//<![CDATA[
<?php $this->renderHelper('javascript_vars'); ?> <?php $this->renderHelper('javascript_vars'); ?>
//]]></script> //]]></script>
<?php echo self::headScript(); ?>
<?php <?php
$url_base = Minz_Request::currentRequest(); $url_base = Minz_Request::currentRequest();
if (FreshRSS_Context::$next_id !== '') { if (FreshRSS_Context::$next_id !== '') {
@ -42,7 +42,7 @@
<meta name="robots" content="noindex,nofollow" /> <meta name="robots" content="noindex,nofollow" />
<?php } ?> <?php } ?>
</head> </head>
<body class="<?php echo Minz_Request::param('output', 'normal'); ?>"> <body class="<?php echo Minz_Request::actionName(); ?>">
<?php $this->partial('header'); ?> <?php $this->partial('header'); ?>
<div id="global"> <div id="global">

7
app/views/helpers/javascript_vars.phtml
Unescape View File

@ -4,8 +4,7 @@
$mark = FreshRSS_Context::$user_conf->mark_when; $mark = FreshRSS_Context::$user_conf->mark_when;
$mail = Minz_Session::param('mail', false); $mail = Minz_Session::param('mail', false);
$auto_actualize = Minz_Session::param('actualize_feeds', false); $auto_actualize = Minz_Session::param('actualize_feeds', false);
$hide_posts = (FreshRSS_Context::$user_conf->display_posts || $hide_posts = !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader');
Minz_Request::param('output') === 'reader');
$s = FreshRSS_Context::$user_conf->shortcuts; $s = FreshRSS_Context::$user_conf->shortcuts;
$url_login = Minz_Url::display(array( $url_login = Minz_Url::display(array(
@ -19,7 +18,7 @@ $url_logout = Minz_Url::display(array(
echo 'var context={', echo 'var context={',
'auto_remove_article:', FreshRSS_Context::isAutoRemoveAvailable() ? 'true' : 'false', ',', 'auto_remove_article:', FreshRSS_Context::isAutoRemoveAvailable() ? 'true' : 'false', ',',
'hide_posts:', $hide_posts ? 'false' : 'true', ',', 'hide_posts:', $hide_posts ? 'true' : 'false', ',',
'display_order:"', Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order), '",', 'display_order:"', Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order), '",',
'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',', 'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',',
'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',', 'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',',
@ -31,7 +30,7 @@ echo 'var context={',
'html5_notif_timeout:', FreshRSS_Context::$user_conf->html5_notif_timeout, ',', 'html5_notif_timeout:', FreshRSS_Context::$user_conf->html5_notif_timeout, ',',
'auth_type:"', FreshRSS_Context::$system_conf->auth_type, '",', 'auth_type:"', FreshRSS_Context::$system_conf->auth_type, '",',
'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',', 'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
'current_view:"', Minz_Request::param('output', 'normal'), '"', 'current_view:"', Minz_Request::actionName(), '"',
"},\n"; "},\n";
echo 'shortcuts={', echo 'shortcuts={',

30
p/scripts/main.js
Unescape View File

@ -246,18 +246,18 @@ function toggleContent(new_active, old_active) {
var box_to_move = "html,body", var box_to_move = "html,body",
relative_move = false; relative_move = false;
if (context['current_view'] == 'global') { if (context['current_view'] === 'global') {
box_to_move = "#panel"; box_to_move = "#panel";
relative_move = true; relative_move = true;
} }
if (context['sticky_post']) { if (context['sticky_post']) {
var prev_article = new_active.prevAll('.flux'), var prev_article = new_active.prevAll('.flux'),
new_pos = new_active.position().top, new_pos = new_active.offset().top,
old_scroll = $(box_to_move).scrollTop(); old_scroll = $(box_to_move).scrollTop();
if (prev_article.length > 0 && new_pos - prev_article.position().top <= 150) { if (prev_article.length > 0 && new_pos - prev_article.offset().top <= 150) {
new_pos = prev_article.position().top; new_pos = prev_article.offset().top;
} }
if (context['hide_posts']) { if (context['hide_posts']) {
@ -451,11 +451,8 @@ function auto_share(key) {
} }
} }
function inMarkViewport(flux, box_to_follow, relative_follow) { function inMarkViewport(flux, box_to_follow) {
var top = flux.position().top; var top = flux.offset().top;
if (relative_follow) {
top += box_to_follow.scrollTop();
}
var height = flux.height(), var height = flux.height(),
begin = top + 3 * height / 4, begin = top + 3 * height / 4,
bot = Math.min(begin + 75, top + height), bot = Math.min(begin + 75, top + height),
@ -466,17 +463,15 @@ function inMarkViewport(flux, box_to_follow, relative_follow) {
} }
function init_posts() { function init_posts() {
var box_to_follow = $(window), var box_to_follow = $(window);
relative_follow = false; if (context['current_view'] === 'global') {
if (context['current_view'] == 'global') {
box_to_follow = $("#panel"); box_to_follow = $("#panel");
relative_follow = true;
} }
if (context['auto_mark_scroll']) { if (context['auto_mark_scroll']) {
box_to_follow.scroll(function () { box_to_follow.scroll(function () {
$('.not_read:visible').each(function () { $('.not_read:visible').each(function () {
if ($(this).children(".flux_content").is(':visible') && inMarkViewport($(this), box_to_follow, relative_follow)) { if ($(this).children(".flux_content").is(':visible') && inMarkViewport($(this), box_to_follow)) {
mark_read($(this), true); mark_read($(this), true);
} }
}); });
@ -490,10 +485,7 @@ function init_posts() {
return; return;
} }
var boxBot = box_to_follow.scrollTop() + box_to_follow.height(), var boxBot = box_to_follow.scrollTop() + box_to_follow.height(),
load_more_top = load_more.position().top; load_more_top = load_more.offset().top;
if (relative_follow) {
load_more_top += box_to_follow.scrollTop();
}
if (boxBot >= load_more_top) { if (boxBot >= load_more_top) {
load_more_posts(); load_more_posts();
} }
@ -765,7 +757,7 @@ function init_nav_entries() {
$nav_entries.find('.up').click(function () { $nav_entries.find('.up').click(function () {
var active_item = $(".flux.current"), var active_item = $(".flux.current"),
windowTop = $(window).scrollTop(), windowTop = $(window).scrollTop(),
item_top = active_item.position().top; item_top = active_item.offset().top;
if (windowTop > item_top) { if (windowTop > item_top) {
$("html,body").scrollTop(item_top); $("html,body").scrollTop(item_top);

Write Preview
Loading…
Cancel
Save