summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/tree.js.coffee
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-06 17:12:28 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-06 17:12:28 +0200
commit40f18681948d4662812f342700533c1a99991927 (patch)
treec12a934ceb63f37d86fd1408b0aa49085136512a /app/assets/javascripts/tree.js.coffee
parente38e2ce29a2d0ce731bafd5012eae8d21de05d4b (diff)
downloadgitlab-ce-40f18681948d4662812f342700533c1a99991927.tar.gz
Fix loading animation while browsing tree
Diffstat (limited to 'app/assets/javascripts/tree.js.coffee')
-rw-r--r--app/assets/javascripts/tree.js.coffee14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/tree.js.coffee b/app/assets/javascripts/tree.js.coffee
index 5003f9b00c7..2603b9a96c6 100644
--- a/app/assets/javascripts/tree.js.coffee
+++ b/app/assets/javascripts/tree.js.coffee
@@ -11,12 +11,7 @@ $ ->
# Make the entire tree-item row clickable, but not if clicking another link (like a commit message)
$("#tree-slider .tree-item").live 'click', (e) ->
$('.tree-item-file-name a', this).trigger('click') if (e.target.nodeName != "A")
-
- # Show/Hide the loading spinner
- $('#tree-slider .tree-item-file-name a, .breadcrumb a, .project-refs-form').live
- "ajax:beforeSend": -> $('.tree_progress').addClass("loading")
- "ajax:complete": -> $('.tree_progress').removeClass("loading")
-
+
# Maintain forward/back history while browsing the file tree
((window) ->
History = window.History
@@ -33,7 +28,12 @@ $ ->
History.Adapter.bind window, 'statechange', ->
state = History.getState()
- window.ajaxGet(state.url)
+ $.ajax({
+ url: state.url,
+ dataType: 'script',
+ beforeSend: -> $('.tree_progress').addClass("loading"),
+ complete: -> $('.tree_progress').removeClass("loading")
+ })
)(window)
# See if there are lines selected