summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/app/directives/newsitemscroll.coffee4
-rw-r--r--js/public/app.js2
2 files changed, 4 insertions, 2 deletions
diff --git a/js/app/directives/newsitemscroll.coffee b/js/app/directives/newsitemscroll.coffee
index 5d8345999..f0cf69543 100644
--- a/js/app/directives/newsitemscroll.coffee
+++ b/js/app/directives/newsitemscroll.coffee
@@ -37,7 +37,9 @@ angular.module('News').directive 'newsItemScroll', ['$rootScope', 'Config',
scrolling = true
, Config.ScrollTimeout
- if markingRead
+ # dont scroll if the value is set to false or there is already
+ # a mark read request
+ if markingRead and elm.attr('news-item-scroll') == 'true'
markingRead = false
setTimeout ->
markingRead = true
diff --git a/js/public/app.js b/js/public/app.js
index c345d54d5..680a411ad 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -285,7 +285,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
setTimeout(function() {
return scrolling = true;
}, Config.ScrollTimeout);
- if (markingRead) {
+ if (markingRead && elm.attr('news-item-scroll') === 'true') {
markingRead = false;
setTimeout(function() {
var $elems, feedItem, id, offset, _i, _len, _results;