Commit 5cb6c1a2 authored by Randall Leeds's avatar Randall Leeds

Merge platform INSTALLs and link rendering

Thanks @csillag
parents 4d9411bb 28c9a595
...@@ -346,6 +346,7 @@ class Hypothesis extends Annotator ...@@ -346,6 +346,7 @@ class Hypothesis extends Annotator
.each (d) -> .each (d) ->
_t = d3.select(this) _t = d3.select(this)
unless this and _t.classed('summary') unless this and _t.classed('summary')
window.renderAnnotation(d.message.annotation)
_t.html Handlebars.templates.summary d.message.annotation _t.html Handlebars.templates.summary d.message.annotation
.classed('detail', false) .classed('detail', false)
.classed('summary', true) .classed('summary', true)
...@@ -416,6 +417,7 @@ class Hypothesis extends Annotator ...@@ -416,6 +417,7 @@ class Hypothesis extends Annotator
unless count == 0 unless count == 0
d.message.annotation.replyCount = replyCount d.message.annotation.replyCount = replyCount
.html (d) -> .html (d) ->
window.renderAnnotation(d.message.annotation)
Handlebars.templates.detail d.message.annotation Handlebars.templates.detail d.message.annotation
.classed('paper', (c) -> not c.parent.message?) .classed('paper', (c) -> not c.parent.message?)
.classed('detail', true) .classed('detail', true)
...@@ -555,3 +557,15 @@ class Hypothesis extends Annotator ...@@ -555,3 +557,15 @@ class Hypothesis extends Annotator
annotation.id annotation.id
window.Hypothesis = Hypothesis window.Hypothesis = Hypothesis
renderAnnotation = (annotation) ->
text = annotation.text
#Must do escaping manually, since we will need to disable Handlebar's autoamtic escaping,
# so that it leaves the inserted links intact
safe_text = Handlebars.Utils.escapeExpression(text)
rendered_text = safe_text.replace /(https?:\/\/[^\s]+)/g, (match) ->
"<a href=\"" + match + "\">" + match + "</a>"
annotation.rendered_text = rendered_text
window.renderAnnotation = renderAnnotation
...@@ -385,7 +385,14 @@ blockquote { ...@@ -385,7 +385,14 @@ blockquote {
} }
.body { .body {
white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
white-space: pre-line;
white-space: -pre-wrap;
white-space: -o-pre-wrap;
white-space: -moz-pre-wrap;
white-space: -hp-pre-wrap;
word-wrap: break-word;
} }
.bottombar { .bottombar {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment