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' of github.com:samuelclay/NewsBlur into requests

Browse source 
* 'master' of github.com:samuelclay/NewsBlur:
  jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues.
  Adding shift+u as a shortcut for marking a story unread.
  Boosting fillout pages.
  Small cleanup in ajax manager.
This commit is contained in:
Samuel Clay 2012-01-04 21:50:06 -08:00
commit fdaa25c2fc
4 changed files with 2038 additions and 1704 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3720
media/js/jquery-1.6.1.js → media/js/jquery-1.7.1.js vendored
View file

File diff suppressed because it is too large Load diff

9
media/js/newsblur/assetmodel.js
View file

@ -43,10 +43,10 @@ NEWSBLUR.AssetModel.Reader.prototype = {
init: function() {
this.ajax = {};
this.ajax['queue'] = $.manageAjax.create('queue', {queue: false});
this.ajax['queue'] = $.manageAjax.create('queue', {queue: true});
this.ajax['queue_clear'] = $.manageAjax.create('queue_clear', {queue: 'clear'});
this.ajax['feed'] = $.manageAjax.create('feed', {queue: 'clear', abortOld: true, domCompleteTrigger: true});
this.ajax['feed_page'] = $.manageAjax.create('feed_page', {queue: false, abortOld: true, abortIsNoSuccess: false, domCompleteTrigger: true});
this.ajax['feed_page'] = $.manageAjax.create('feed_page', {queue: 'clear', abortOld: true, abortIsNoSuccess: false, domCompleteTrigger: true});
this.ajax['statistics'] = $.manageAjax.create('statistics', {queue: 'clear', abortOld: true});
$.ajaxSettings.traditional = true;
return;
@ -68,7 +68,6 @@ NEWSBLUR.AssetModel.Reader.prototype = {
}
if (options['ajax_group'] == 'statistics') {
clear_queue = true;
request_type = 'GET';
}
if (clear_queue) {
@ -131,8 +130,6 @@ NEWSBLUR.AssetModel.Reader.prototype = {
feed_id: feed_id
}, null, null, {
'ajax_group': 'queue_clear',
'abortOld': true,
'traditional': true,
'beforeSend': function() {
self.queued_read_stories[feed_id] = [];
}
@ -806,7 +803,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
get_feed_statistics: function(feed_id, callback) {
this.make_request('/rss_feeds/statistics/'+feed_id, {}, callback, callback, {
'ajax_group': 'statistics',
'requesst_type': 'GET'
'request_type': 'GET'
});
},

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

@ -62,7 +62,7 @@
this.layout = {};
this.constants = {
FEED_REFRESH_INTERVAL: (1000 * 60) * 1, // 1 minute
FILL_OUT_PAGES: 8,
FILL_OUT_PAGES: 50,
RIVER_STORIES_FOR_STANDARD_ACCOUNT: 12
};
@ -6787,6 +6787,13 @@
e.preventDefault();
self.open_river_stories();
});
$document.bind('keydown', 'shift+u', function(e) {
e.preventDefault();
if (self.active_story) {
var story_id = self.active_story.id;
self.mark_story_as_unread(story_id);
}
});
}
};

4
settings.py
View file

@ -165,7 +165,7 @@ LOGGING = {
COMPRESS_JS = {
'all': {
'source_filenames': (
'js/jquery-1.6.1.js',
'js/jquery-1.7.1.js',
'js/inflector.js',
'js/jquery.json.js',
'js/jquery.easing.js',
@ -220,7 +220,7 @@ COMPRESS_JS = {
},
'mobile': {
'source_filenames': (
'js/jquery-1.6.1.js',
'js/jquery-1.7.1.js',
'js/mobile/jquery.mobile-1.0b1.js',
'js/jquery.ajaxmanager.3.js',
'js/underscore.js',