From 5f6f85b182b8ea412b9abc464a01ec0f0a2e5ce5 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 4 Dec 2014 17:10:30 -0500
Subject: [PATCH] FIX: Disable loading below HTML, we have our own spinner for
 that and it broke scrolling on some custom CSS.

---
 app/assets/javascripts/discourse/templates/topic.hbs | 2 +-
 vendor/assets/javascripts/ember-cloaking.js          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index b53bc01ef21..7d4d26a47c9 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -78,7 +78,7 @@
                                  defaultHeight="200"
                                  content=postStream.posts
                                  slackRatio="15"
-                                 loadingHTML=controller.loadingHTML
+                                 loadingHTML=""
                                  preservesContext="true"
                                  uncloakDefault="true"
                                  offsetFixedTop="header"
diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js
index b90c0113b6b..8c5cad2e362 100644
--- a/vendor/assets/javascripts/ember-cloaking.js
+++ b/vendor/assets/javascripts/ember-cloaking.js
@@ -201,8 +201,9 @@
       for (var j=bottomView; j<childViews.length; j++) {
         var checkView = childViews[j];
         if (!checkView._containedView) {
-          if (!checkView.get('loading')) {
-            checkView.$().html(this.get('loadingHTML'));
+          var loadingHTML = this.get('loadingHTML');
+          if (!Em.isEmpty(loadingHTML) && !checkView.get('loading')) {
+            checkView.$().html(loadingHTML);
           }
           return;
         }