Commit 01b965f6 authored by Phil Hughes's avatar Phil Hughes

Correctly checks if tree view is on screen

parent d80205b7
...@@ -77,7 +77,7 @@ class Dispatcher ...@@ -77,7 +77,7 @@ class Dispatcher
when 'projects:show' when 'projects:show'
shortcut_handler = new ShortcutsNavigation() shortcut_handler = new ShortcutsNavigation()
new TreeView() if $('#tree-slider') new TreeView() if $('#tree-slider').length
when 'groups:show' when 'groups:show'
new Activities() new Activities()
shortcut_handler = new ShortcutsNavigation() shortcut_handler = new ShortcutsNavigation()
......
...@@ -64,7 +64,7 @@ class Projects::RefsController < Projects::ApplicationController ...@@ -64,7 +64,7 @@ class Projects::RefsController < Projects::ApplicationController
} }
end end
offset = (@offset + @limit) offset = (@offset + @limit)
if contents.size > offset if contents.size > offset
@more_log_url = logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '', offset: offset) @more_log_url = logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '', offset: offset)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment