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 tryfeed for social subs.

Browse source
This commit is contained in:
Samuel Clay 2012-03-14 17:48:28 -07:00
parent de4255c3f2
commit e7f32ad3c3
9 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
apps/profile/migrations/0016_hide_modules.py → apps/profile/migrations/0017_hide_modules.py
View file

4
media/iphone/NewsBlur.xcodeproj/project.pbxproj
View file

@ -1060,7 +1060,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
LastUpgradeCheck = 0430;
ORGANIZATIONNAME = NewsBlur;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "NewsBlur" */;
@ -1272,6 +1272,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = NewsBlur_Prefix.pch;
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "NewsBlur-Info.plist";
@ -1303,6 +1304,7 @@
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = NewsBlur_Prefix.pch;
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "NewsBlur-Info.plist";

11
media/iphone/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcschemes/NewsBlur.xcscheme
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0430"
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
@ -30,13 +31,16 @@
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
displayScaleIsEnabled = "NO"
displayScale = "1.00"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug">
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
@ -62,7 +66,8 @@
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release">
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"

4
media/iphone/NewsBlur_Prefix.pch
View file

@ -15,7 +15,7 @@
// #define BACKGROUND_REFRESH_SECONDS -5
#define BACKGROUND_REFRESH_SECONDS -10*60
// #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host:8000"]
#define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
#define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host:8000"]
// #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
#endif

1
media/iphone/ShareKit/Configuration/LegacySHKConfigurator.m
View file

@ -41,6 +41,7 @@
- (void)dealloc
{
[configuration release];
[super dealloc];
}
- (id)init

7
media/js/newsblur/common/assetmodel.js
View file

@ -672,9 +672,12 @@ NEWSBLUR.AssetModel.Reader.prototype = {
},
add_social_feed: function(feed) {
if (!this.social_feeds.get(feed.get('user_id'))) {
this.social_feeds.add(feed);
var social_feed = this.social_feeds.get(feed.get('user_id'));
if (!social_feed) {
social_feed = new NEWSBLUR.Models.SocialSubscription(feed.attributes);
this.social_feeds.add(social_feed);
}
return social_feed;
},
get_feed: function(feed_id) {

5
media/js/newsblur/models/social_subscription.js
View file

@ -1,9 +1,10 @@
NEWSBLUR.Models.SocialSubscription = Backbone.Model.extend({
initialize: function() {
if (!this.get('photo_url')) {
console.log(["init social sub", this]);
if (!this.get('page_url')) {
console.log(["this sub", this.attributes]);
return '/social/page/' + this.get('user_id');
this.set('page_url', '/social/page/' + this.get('user_id'));
}
}

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

@ -356,13 +356,19 @@
hide_splash_page: function() {
var self = this;
var resize = false;
if (!$('.right-pane').is(':visible')) {
resize = true;
}
$('.right-pane').show();
$('#NB-splash').hide();
$('.NB-splash-info').hide();
$('#NB-splash-overlay').hide();
// this.$s.$body.layout().resizeAll();
this.$s.$dashboard.addClass('NB-active');
if (resize) {
this.$s.$body.layout().resizeAll();
}
if (NEWSBLUR.Globals.is_anonymous) {
this.setup_ftux_signup_callout();
}

5
media/js/newsblur/views/social_profile_badge.js
View file

@ -110,8 +110,9 @@ NEWSBLUR.Views.SocialProfileBadge = Backbone.View.extend({
preview_user: function() {
$.modal.close(_.bind(function() {
NEWSBLUR.reader.model.add_social_feed(this.model);
NEWSBLUR.reader.load_social_feed_in_tryfeed_view(this.model);
window.ss = this.model;
var socialsub = NEWSBLUR.reader.model.add_social_feed(this.model);
NEWSBLUR.reader.load_social_feed_in_tryfeed_view(socialsub);
}, this));
}