mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
Adding index to router.
This commit is contained in:
parent
cb9896b4b7
commit
5ca577e378
3 changed files with 11 additions and 5 deletions
|
@ -42,6 +42,9 @@ class UserSubscription(models.Model):
|
|||
|
||||
def __unicode__(self):
|
||||
return '[' + self.feed.feed_title + '] '
|
||||
|
||||
class Meta:
|
||||
unique_together = ("user", "feed")
|
||||
|
||||
def canonical(self, full=False, include_favicon=True, classifiers=None):
|
||||
feed = self.feed.canonical(full=full, include_favicon=include_favicon)
|
||||
|
@ -361,9 +364,6 @@ class UserSubscription(models.Model):
|
|||
switch_feed_for_classifier(MClassifierFeed)
|
||||
switch_feed_for_classifier(MClassifierTag)
|
||||
|
||||
class Meta:
|
||||
unique_together = ("user", "feed")
|
||||
|
||||
|
||||
class MUserStory(mongo.Document):
|
||||
"""
|
||||
|
|
|
@ -9,7 +9,9 @@ NEWSBLUR.Router = Backbone.Router.extend({
|
|||
"user/*user": "user"
|
||||
},
|
||||
|
||||
index: function() {},
|
||||
index: function() {
|
||||
NEWSBLUR.reader.show_splash_page();
|
||||
},
|
||||
|
||||
add_site: function() {
|
||||
console.log(["add", window.location, $.getQueryString('url')]);
|
||||
|
|
|
@ -351,7 +351,7 @@
|
|||
}
|
||||
},
|
||||
|
||||
show_splash_page: function() {
|
||||
show_splash_page: function(skip_router) {
|
||||
this.reset_feed();
|
||||
this.unload_feed_iframe();
|
||||
this.unload_story_iframe();
|
||||
|
@ -361,6 +361,10 @@
|
|||
$('#NB-splash').show();
|
||||
$('#NB-splash-overlay').show();
|
||||
this.$s.$dashboard.removeClass('NB-active');
|
||||
if (!skip_router) {
|
||||
NEWSBLUR.router.navigate('');
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
iframe_buster_buster: function() {
|
||||
|
|
Loading…
Add table
Reference in a new issue