diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-16 20:26:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-16 20:26:04 +0000 |
| commit | 67312fceaa69abb2bc88aa62601625e9f6a62270 (patch) | |
| tree | f67e39bab7386f870e4908dba0746914a4db7d29 /app/views | |
| parent | e66b811d81d399fdfeed13563db108242f9021e6 (diff) | |
| parent | b0a163208c1b428fc9f5adad6489f8a3ab884a2b (diff) | |
| download | gitlab-ce-67312fceaa69abb2bc88aa62601625e9f6a62270.tar.gz | |
Merge branch 'dm-blob-viewer-concerns' into 'master'
Move some blob viewer stuff around without changing behavior
See merge request !11358
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/blob/_viewer.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/blob/_viewer.html.haml b/app/views/projects/blob/_viewer.html.haml index 3d9c3a59980..4252f27d007 100644 --- a/app/views/projects/blob/_viewer.html.haml +++ b/app/views/projects/blob/_viewer.html.haml @@ -1,10 +1,10 @@ - hidden = local_assigns.fetch(:hidden, false) - render_error = viewer.render_error -- load_asynchronously = local_assigns.fetch(:load_asynchronously, viewer.server_side?) && render_error.nil? +- load_async = local_assigns.fetch(:load_async, viewer.load_async?) -- viewer_url = local_assigns.fetch(:viewer_url) { url_for(params.merge(viewer: viewer.type, format: :json)) } if load_asynchronously +- viewer_url = local_assigns.fetch(:viewer_url) { url_for(params.merge(viewer: viewer.type, format: :json)) } if load_async .blob-viewer{ data: { type: viewer.type, url: viewer_url }, class: ('hidden' if hidden) } - - if load_asynchronously + - if load_async = render viewer.loading_partial_path, viewer: viewer - elsif render_error = render 'projects/blob/render_error', viewer: viewer |