FIX: Disable loading below HTML, we have our own spinner for that and it

broke scrolling on some custom CSS.
This commit is contained in:
Robin Ward 2014-12-04 17:10:30 -05:00
parent 917a91eb40
commit 5f6f85b182
2 changed files with 4 additions and 3 deletions
app/assets/javascripts/discourse/templates
vendor/assets/javascripts

View File

@ -78,7 +78,7 @@
defaultHeight="200"
content=postStream.posts
slackRatio="15"
loadingHTML=controller.loadingHTML
loadingHTML=""
preservesContext="true"
uncloakDefault="true"
offsetFixedTop="header"

View File

@ -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;
}