diff options
| -rw-r--r-- | background_scripts/completion.coffee | 16 | ||||
| -rw-r--r-- | content_scripts/vomnibar.coffee | 16 |
2 files changed, 18 insertions, 14 deletions
diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee index 5539f7c7..58725fa0 100644 --- a/background_scripts/completion.coffee +++ b/background_scripts/completion.coffee @@ -29,14 +29,16 @@ class Suggestion relevancyHtml = if @showRelevancy then "<span class='relevancy'>#{@computeRelevancy()}</span>" else "" # NOTE(philc): We're using these vimium-specific class names so we don't collide with the page's CSS. @html = - "<div class='vimiumReset vomnibarTopHalf'> - <span class='vimiumReset vomnibarSource'>#{@type}</span> - <span class='vimiumReset vomnibarTitle'>#{@highlightTerms(Utils.escapeHtml(@title))}</span> + """ + <div class="vimiumReset vomnibarTopHalf"> + <span class="vimiumReset vomnibarSource">#{@type}</span> + <span class="vimiumReset vomnibarTitle">#{@highlightTerms(Utils.escapeHtml(@title))}</span> </div> - <div class='vimiumReset vomnibarBottomHalf'> - <span class='vimiumReset vomnibarUrl'>#{@shortenUrl(@highlightTerms(@url))}</span> + <div class="vimiumReset vomnibarBottomHalf"> + <span class="vimiumReset vomnibarUrl">#{@shortenUrl(@highlightTerms(@url))}</span> #{relevancyHtml} - </div>" + </div> + """ shortenUrl: (url) -> @stripTrailingSlash(url).replace(/^http:\/\//, "") @@ -59,7 +61,7 @@ class Suggestion for [start, end] in ranges string = string.substring(0, start) + - "<span class='vomnibarMatch'>" + string.substring(start, end) + "</span>" + + "<span class='vomnibarMatch'>#{string.substring(start, end)}</span>" + string.substring(end) string diff --git a/content_scripts/vomnibar.coffee b/content_scripts/vomnibar.coffee index 4a23b95c..ec444e9e 100644 --- a/content_scripts/vomnibar.coffee +++ b/content_scripts/vomnibar.coffee @@ -138,7 +138,7 @@ class VomnibarUI populateUiWithCompletions: (completions) -> # update completion list with the new data - @completionList.innerHTML = completions.map((completion) -> "<li>" + completion.html + "</li>").join("") + @completionList.innerHTML = completions.map((completion) -> "<li>#{completion.html}</li>").join("") @completionList.style.display = if completions.length > 0 then "block" else "none" @updateSelection() @@ -161,12 +161,14 @@ class VomnibarUI initDom: -> @box = Utils.createElementFromHtml( - '<div id="vomnibar" class="vimiumReset">' + - '<div class="vimiumReset vomnibarSearchArea">' + - '<input type="text" class="vimiumReset" />' + - '</div>' + - '<ul class="vimiumReset"></ul>' + - '</div>') + """ + <div id="vomnibar" class="vimiumReset"> + <div class="vimiumReset vomnibarSearchArea"> + <input type="text" class="vimiumReset"> + </div> + <ul class="vimiumReset"></ul> + </div> + """) @box.style.display = "none" document.body.appendChild(@box) |