Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-22 19:19:50 +0400
committerMarin Jankovski <marin@gitlab.com>2014-05-27 11:12:45 +0400
commit01b03a819192d4677f68d84d46e7f7c95a3cd306 (patch)
tree6c782097591a4578395bfdc804709ac0e85774dc /app
parentf0a32c69494a1d4dda4c5ec8a7f3b94bc7ceed65 (diff)
Fix scroll to highlighted line. Replace scrollTO js file with gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/application.js.coffee2
-rw-r--r--app/assets/javascripts/blob.js.coffee2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index a22ff6dec31..587e51a7a83 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -13,7 +13,7 @@
#= require jquery.history
#= require jquery.waitforimages
#= require jquery.atwho
-#= require jquery.scrollto
+#= require jquery.scrollTo
#= require jquery.blockUI
#= require turbolinks
#= require jquery.turbolinks
diff --git a/app/assets/javascripts/blob.js.coffee b/app/assets/javascripts/blob.js.coffee
index 584f6faea16..9db919e5a62 100644
--- a/app/assets/javascripts/blob.js.coffee
+++ b/app/assets/javascripts/blob.js.coffee
@@ -26,7 +26,7 @@ class BlobView
unless isNaN first_line
$("#tree-content-holder .highlight .line").removeClass("hll")
$("#LC#{line}").addClass("hll") for line in [first_line..last_line]
- $("#L#{first_line}").ScrollTo() unless e?
+ $.scrollTo("#L#{first_line}") unless e?
# parse selected lines from hash
# always return first and last line (initialized to NaN)