Merge remote-tracking branch 'galen/spam' into pending

This commit is contained in:
Philip C Monk 2015-11-04 18:36:22 -05:00
commit c8bd8446e6
3 changed files with 3 additions and 2 deletions

View File

@ -1,6 +1,7 @@
---
title: Hoon 101.0: nouns, spans, and molds
sort: 0
spam: true
next: true
---

View File

@ -57,7 +57,7 @@ module.exports = query {
render: ->
className = (@props.meta.layout?.replace /,/g," ") || ""
body = [reactify @props.body]
if document.location.hostname is 'urbit.org'
if document.location.hostname is 'urbit.org' and @props.meta.spam?
body.unshift (Spam {}, "")
if @props.meta.logo?
body.unshift (Logo color:@props.meta.logo)

View File

@ -519,7 +519,7 @@ module.exports = query({
var body, className, ref1;
className = ((ref1 = this.props.meta.layout) != null ? ref1.replace(/,/g, " ") : void 0) || "";
body = [reactify(this.props.body)];
if (document.location.hostname === 'urbit.org') {
if (document.location.hostname === 'urbit.org' && (this.props.meta.spam != null)) {
body.unshift(Spam({}, ""));
}
if (this.props.meta.logo != null) {