From cdf90ed5be583fccadc279f6c510106d95043180 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Tue, 14 Jan 2014 18:15:02 -0800
Subject: [PATCH] Fixing accidental truncation on story when saved.

---
 media/js/newsblur/views/story_detail_view.js | 13 +++++++++----
 media/js/newsblur/views/story_save_view.js   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/media/js/newsblur/views/story_detail_view.js b/media/js/newsblur/views/story_detail_view.js
index 104163221..8d6517cd8 100644
--- a/media/js/newsblur/views/story_detail_view.js
+++ b/media/js/newsblur/views/story_detail_view.js
@@ -437,16 +437,21 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({
         this.model.on('change:images_loaded', _.bind(function() {
             this.resize_starred_tags();
         }, this));
+        var is_truncatable = this.is_truncatable();
         
-        if (!this.is_truncatable()) return;
+        if (!is_truncatable && !this.model.get('starred')) return;
         
         this.truncate_delay = 100;
         this.images_to_load = this.$('img').length;
-        this.truncate_story_height();
-
+        if (is_truncatable) this.truncate_story_height();
         this.$('img').load(_.bind(function() {
             this.images_to_load -= 1;
-            this.truncate_story_height();
+            if (is_truncatable) this.truncate_story_height();
+            if (this.images_to_load <= 0) {
+                this.model.set('images_loaded', true);
+            } else {
+                this.model.set('images_loaded', false);
+            }
         }, this));
     },
     
diff --git a/media/js/newsblur/views/story_save_view.js b/media/js/newsblur/views/story_save_view.js
index 732c4bfc5..0cc579163 100644
--- a/media/js/newsblur/views/story_save_view.js
+++ b/media/js/newsblur/views/story_save_view.js
@@ -182,7 +182,7 @@ NEWSBLUR.Views.StorySaveView = Backbone.View.extend({
         if (!NEWSBLUR.reader.flags.narrow_content &&
             !options.close && !options.force && new_sideoptions_height >= original_height) {
             // Sideoptions too big, embiggen left side
-            console.log(["Sideoption too big, embiggening", content_height, sideoptions_height]);
+            console.log(["Sideoption too big, embiggening", content_height, sideoptions_height, new_sideoptions_height]);
             $story_content.stop(true, true).animate({
                 'height': new_sideoptions_height
             }, {