diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-22 20:17:15 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-22 20:17:15 +0000 |
| commit | eee14a0c740b53dfba50e1b091d4017ada92ee97 (patch) | |
| tree | 09c8ab3260b9db1fd85c119a3cb63dac2e20dfc1 /app | |
| parent | ebe2a34a6b81f468187a8049ddae8242b00d1ebe (diff) | |
| parent | 74079fe2369c20767cb6c639eec1886c9822fefc (diff) | |
| download | gitlab-ce-eee14a0c740b53dfba50e1b091d4017ada92ee97.tar.gz | |
Merge branch 'fix-scroll-to' into 'master'
Fix js error when use scroll to highlighted line
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/blob.js.coffee | 2 |
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) |