From e7f32ad3c31b8bc91bf5f07f11325688fee37ca7 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 14 Mar 2012 17:48:28 -0700
Subject: [PATCH] Fixing tryfeed for social subs.

---
 .../{0016_hide_modules.py => 0017_hide_modules.py}    |  0
 media/iphone/NewsBlur.xcodeproj/project.pbxproj       |  4 +++-
 .../sclay.xcuserdatad/xcschemes/NewsBlur.xcscheme     | 11 ++++++++---
 media/iphone/NewsBlur_Prefix.pch                      |  4 ++--
 .../ShareKit/Configuration/LegacySHKConfigurator.m    |  1 +
 media/js/newsblur/common/assetmodel.js                |  7 +++++--
 media/js/newsblur/models/social_subscription.js       |  5 +++--
 media/js/newsblur/reader/reader.js                    | 10 ++++++++--
 media/js/newsblur/views/social_profile_badge.js       |  5 +++--
 9 files changed, 33 insertions(+), 14 deletions(-)
 rename apps/profile/migrations/{0016_hide_modules.py => 0017_hide_modules.py} (100%)

diff --git a/apps/profile/migrations/0016_hide_modules.py b/apps/profile/migrations/0017_hide_modules.py
similarity index 100%
rename from apps/profile/migrations/0016_hide_modules.py
rename to apps/profile/migrations/0017_hide_modules.py
diff --git a/media/iphone/NewsBlur.xcodeproj/project.pbxproj b/media/iphone/NewsBlur.xcodeproj/project.pbxproj
index 0906473fb..fbc65d2e4 100755
--- a/media/iphone/NewsBlur.xcodeproj/project.pbxproj
+++ b/media/iphone/NewsBlur.xcodeproj/project.pbxproj
@@ -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";
diff --git a/media/iphone/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcschemes/NewsBlur.xcscheme b/media/iphone/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcschemes/NewsBlur.xcscheme
index de2ca08e5..fb1666e49 100644
--- a/media/iphone/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcschemes/NewsBlur.xcscheme
+++ b/media/iphone/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcschemes/NewsBlur.xcscheme
@@ -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"
diff --git a/media/iphone/NewsBlur_Prefix.pch b/media/iphone/NewsBlur_Prefix.pch
index 98e9374b9..df7b5154b 100644
--- a/media/iphone/NewsBlur_Prefix.pch
+++ b/media/iphone/NewsBlur_Prefix.pch
@@ -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
diff --git a/media/iphone/ShareKit/Configuration/LegacySHKConfigurator.m b/media/iphone/ShareKit/Configuration/LegacySHKConfigurator.m
index 27235f156..c72215bb0 100755
--- a/media/iphone/ShareKit/Configuration/LegacySHKConfigurator.m
+++ b/media/iphone/ShareKit/Configuration/LegacySHKConfigurator.m
@@ -41,6 +41,7 @@
 - (void)dealloc 
 {
     [configuration release];
+    [super dealloc];
 }
 
 - (id)init
diff --git a/media/js/newsblur/common/assetmodel.js b/media/js/newsblur/common/assetmodel.js
index 069045d49..f7e6c0dd7 100644
--- a/media/js/newsblur/common/assetmodel.js
+++ b/media/js/newsblur/common/assetmodel.js
@@ -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) {
diff --git a/media/js/newsblur/models/social_subscription.js b/media/js/newsblur/models/social_subscription.js
index fa225cb86..9b21bea80 100644
--- a/media/js/newsblur/models/social_subscription.js
+++ b/media/js/newsblur/models/social_subscription.js
@@ -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'));
         }
     }
     
diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js
index 67af7582a..89e4472a5 100644
--- a/media/js/newsblur/reader/reader.js
+++ b/media/js/newsblur/reader/reader.js
@@ -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();
             }
diff --git a/media/js/newsblur/views/social_profile_badge.js b/media/js/newsblur/views/social_profile_badge.js
index 63755147f..4ea23ca65 100644
--- a/media/js/newsblur/views/social_profile_badge.js
+++ b/media/js/newsblur/views/social_profile_badge.js
@@ -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));
     }