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

Don't double-up on #main-outlet when static content is rendered through Ember

This commit is contained in:
tms 2013-03-03 10:47:40 -05:00
parent dfafadfe41
commit f46c819956
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/controllers/static_controller.js
View File

@ -18,7 +18,8 @@ Discourse.StaticController = Discourse.Controller.extend({
$preloaded = $("noscript[data-path=\"" + path + "\"]"); $preloaded = $("noscript[data-path=\"" + path + "\"]");
if ($preloaded.length) { if ($preloaded.length) {
text = $preloaded.text(); text = $preloaded.text();
text = text.replace(/<header[\s\S]*<\/header\>/, ''); text = text.match(/<!-- preload-content: -->((?:.|[\n\r])*)<!-- :preload-content -->/);
text = text[1];
return this.set('content', text); return this.set('content', text);
} else { } else {
return jQuery.ajax({ return jQuery.ajax({

2
app/views/layouts/application.html.erb
View File

@ -40,7 +40,9 @@
</div> </div>
</header> </header>
<div id="main-outlet" class="container"> <div id="main-outlet" class="container">
<!-- preload-content: -->
<%= yield %> <%= yield %>
<!-- :preload-content -->
</div> </div>
</noscript> </noscript>
</section> </section>