summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-26 22:00:23 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-26 22:00:23 +0200
commitffee5bb090c3723bb57e6858d32e9c34baba9912 (patch)
treeb0586c4aa6da02c3412864967da70b13673ef0b5 /app/assets/javascripts
parent76be57fcf2d8c5bb9ab4ae0837233e6c7b8a0698 (diff)
downloadgitlab-ce-ffee5bb090c3723bb57e6858d32e9c34baba9912.tar.gz
Improve themes. Load highlight.js properly
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/blob.js.coffee2
-rw-r--r--app/assets/javascripts/main.js.coffee5
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/blob.js.coffee b/app/assets/javascripts/blob.js.coffee
index 99cb1cec911..6cdfc182b63 100644
--- a/app/assets/javascripts/blob.js.coffee
+++ b/app/assets/javascripts/blob.js.coffee
@@ -17,7 +17,7 @@ class BlobView
setHash(hash)
e.preventDefault()
-
+
# See if there are lines selected
# "#L12" and "#L34-56" supported
highlightBlobLines = (e) ->
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index 3f7656de5c8..dd71a4a1711 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -56,11 +56,12 @@ document.addEventListener("page:fetch", unbindEvents)
document.addEventListener("page:change", stopSpinner)
$ ->
+ $('pre code').each (i, e) ->
+ hljs.highlightBlock(e)
+
# Click a .one_click_select field, select the contents
$(".one_click_select").on 'click', -> $(@).select()
- hljs.initHighlightingOnLoad()
-
$('.remove-row').bind 'ajax:success', ->
$(this).closest('li').fadeOut()