Merge branch 'find-file-no-longer-inline' into 'master'
Move find file URL out of global variable See merge request !12846
This commit is contained in:
commit
0c4f512bae
|
@ -1,6 +1,5 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, prefer-arrow-callback, consistent-return, object-shorthand, no-unused-vars, one-var, one-var-declaration-per-line, no-else-return, comma-dangle, max-len */
|
||||
/* global Mousetrap */
|
||||
/* global findFileURL */
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
import findAndFollowLink from './shortcuts_dashboard_navigation';
|
||||
|
@ -20,6 +19,7 @@ import findAndFollowLink from './shortcuts_dashboard_navigation';
|
|||
|
||||
const $globalDropdownMenu = $('.global-dropdown-menu');
|
||||
const $globalDropdownToggle = $('.global-dropdown-toggle');
|
||||
const findFileURL = document.body.dataset.findFile;
|
||||
|
||||
$('.global-dropdown').on('hide.bs.dropdown', () => {
|
||||
$globalDropdownMenu.removeClass('shortcuts');
|
||||
|
|
|
@ -518,4 +518,12 @@ module ProjectsHelper
|
|||
|
||||
current_application_settings.restricted_visibility_levels || []
|
||||
end
|
||||
|
||||
def find_file_path
|
||||
return unless @project && !@project.empty_repo?
|
||||
|
||||
ref = @ref || @project.repository.root_ref
|
||||
|
||||
project_find_file_path(@project, ref)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
!!! 5
|
||||
%html{ lang: I18n.locale, class: "#{page_class}" }
|
||||
= render "layouts/head"
|
||||
%body{ class: @body_class, data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}" } }
|
||||
%body{ class: @body_class, data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
|
||||
= render "layouts/init_auto_complete" if @gfm_form
|
||||
- if show_new_nav?
|
||||
= render "layouts/header/new"
|
||||
|
|
|
@ -91,8 +91,3 @@
|
|||
= yield :header_content
|
||||
|
||||
= render 'shared/outdated_browser'
|
||||
|
||||
- if @project && !@project.empty_repo?
|
||||
- if ref = @ref || @project.repository.root_ref
|
||||
:javascript
|
||||
var findFileURL = "#{project_find_file_path(@project, ref)}";
|
||||
|
|
|
@ -84,8 +84,3 @@
|
|||
= icon('times', class: 'js-navbar-toggle-left', style: 'display: none;')
|
||||
|
||||
= render 'shared/outdated_browser'
|
||||
|
||||
- if @project && !@project.empty_repo?
|
||||
- if ref = @ref || @project.repository.root_ref
|
||||
:javascript
|
||||
var findFileURL = "#{project_find_file_path(@project, ref)}";
|
||||
|
|
Loading…
Reference in New Issue