public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into chooser

Browse source
This commit is contained in:
Samuel Clay 2010-10-06 19:26:10 -04:00
commit 693eb9272e
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/reader/views.py
View file

@ -613,4 +613,5 @@ def activate_premium_account(request):
return HttpResponseRedirect(reverse('index'))
def iframe_buster(request):
logging.info(" ---> [%s] iFrame bust!" % (request.user,))
return HttpResponse(status=204)

16
media/js/newsblur/reader.js
View file

@ -70,7 +70,7 @@
this.handle_mouse_indicator_hover();
this.position_mouse_indicator();
this.handle_login_and_signup_forms();
// this.iframe_buster_buster();
this.iframe_buster_buster();
};
NEWSBLUR.Reader.prototype = {
@ -155,13 +155,17 @@
iframe_buster_buster: function() {
var self = this;
var prevent_bust = 0;
window.onbeforeunload = function() { prevent_bust++; };
window.onbeforeunload = function() {
prevent_bust++;
};
setInterval(function() {
if (prevent_bust > 0) {
prevent_bust -= 2;
window.top.location = '/reader/buster';
$('.NB-feed-frame').attr('src', '');
$('.task_view_feed').click();
if (!self.flags['iframe_view_loaded'] && self.story_view == 'page' && self.active_feed) {
$('.task_view_feed').click();
$('.NB-feed-frame').attr('src', '');
window.top.location = '/reader/buster';
}
}
}, 1);
},
@ -1275,10 +1279,8 @@
var $feed_view = this.$s.$feed_view;
if (!story || !$story || !$story.length) {
NEWSBLUR.log(['no story', story, $story]);
$story = $('.story:first', $feed_view);
story = this.model.get_story($story.data('story'));
NEWSBLUR.log(['now story', story, $story]);
}
if (!story || !$story || !$story.length) {
return;

1
settings.py
View file

@ -72,7 +72,6 @@ MIDDLEWARE_CLASSES = (
'django.middleware.gzip.GZipMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.cache.CacheMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'apps.profile.middleware.LastSeenMiddleware',
# 'debug_toolbar.middleware.DebugToolbarMiddleware',