Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/topic.hbs
View File

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

5
vendor/assets/javascripts/ember-cloaking.js vendored
View File

@ -201,8 +201,9 @@
for (var j=bottomView; j<childViews.length; j++) { for (var j=bottomView; j<childViews.length; j++) {
var checkView = childViews[j]; var checkView = childViews[j];
if (!checkView._containedView) { if (!checkView._containedView) {
if (!checkView.get('loading')) { var loadingHTML = this.get('loadingHTML');
checkView.$().html(this.get('loadingHTML')); if (!Em.isEmpty(loadingHTML) && !checkView.get('loading')) {
checkView.$().html(loadingHTML);
} }
return; return;
} }