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

Fixing bookmarklet, removing old preference for finding oldest story on site open.

Browse source
This commit is contained in:
Samuel Clay 2012-07-31 13:04:33 -07:00
parent 54e6d97c3d
commit ef971f06fd
7 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets.yml
View file

@ -84,7 +84,7 @@ javascripts:
- media/js/newsblur/payments/paypal_return.js
- media/js/newsblur/payments/stripe_form.js
bookmarklet:
- media/js/vendor/jquery-1.5.1.min.js
- media/js/vendor/jquery-1.7.2.min.js
- media/js/vendor/jquery.noConflict.js
- media/js/vendor/jquery.newsblur.js
- media/js/vendor/jquery.tinysort.js

2
fabfile.py vendored
View file

@ -686,7 +686,7 @@ def copy_task_settings():
# ==============
def restore_postgres():
backup_date = '2012-05-03-08-00'
backup_date = '2012-07-21-08-00'
run('PYTHONPATH=/home/sclay/newsblur python s3.py get backup_postgresql_%s.sql.gz' % backup_date)
sudo('su postgres -c "createuser -U newsblur"')
sudo('su postgres -c "createdb newsblur -O newsblur"')

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

@ -658,8 +658,6 @@
if (open_feed_action == 'newest') {
this.show_next_unread_story();
} else if (open_feed_action == 'oldest') {
this.show_last_unread_story();
}
},
@ -2097,7 +2095,7 @@
self.flags.scrolling_by_selecting_story_title = false;
}, 550);
if (view == 'page') {
NEWSBLUR.log(["iframe_prevented_from_loading", this.flags['iframe_prevented_from_loading']]);
// NEWSBLUR.log(["iframe_prevented_from_loading", this.flags['iframe_prevented_from_loading']]);
if (this.flags['iframe_prevented_from_loading']) {
NEWSBLUR.app.original_tab_view.load_feed_iframe();
}

10
media/js/newsblur/reader/reader_preferences.js
View file

@ -309,17 +309,11 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, {
$.make('div', [
$.make('input', { id: 'NB-preference-openfeedaction-1', type: 'radio', name: 'open_feed_action', value: 'newest' }),
$.make('label', { 'for': 'NB-preference-openfeedaction-1' }, [
'Open the newest unread story'
'Open the first story'
])
]),
$.make('div', [
$.make('input', { id: 'NB-preference-openfeedaction-2', type: 'radio', name: 'open_feed_action', value: 'oldest' }),
$.make('label', { 'for': 'NB-preference-openfeedaction-2' }, [
'Open the oldest unread story'
])
]),
$.make('div', [
$.make('input', { id: 'NB-preference-openfeedaction-0', type: 'radio', name: 'open_feed_action', value: 0 }),
$.make('input', { id: 'NB-preference-openfeedaction-0', type: 'radio', name: 'open_feed_action', value: 0, checked: true }),
$.make('label', { 'for': 'NB-preference-openfeedaction-0' }, [
'Show all stories'
])

16
media/js/vendor/jquery-1.5.1.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
media/js/vendor/jquery-1.7.2.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
templates/api/bookmarklet_subscribe.js
View file

@ -1,6 +1,7 @@
{% load bookmarklet_includes utils_tags %}
(function() {
window.NEWSBLUR = window.NEWSBLUR || {};
{% include_bookmarklet_js %}