From bee837d7b5025a2e170dc0c857b188b4d89c014f Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 15 Feb 2018 08:53:09 +0100 Subject: some initial refactoring --- app/views/projects/blob/_header.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/projects/blob') diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml index 2a77dedd9a2..da0c0ed6cb4 100644 --- a/app/views/projects/blob/_header.html.haml +++ b/app/views/projects/blob/_header.html.haml @@ -11,8 +11,8 @@ = view_on_environment_button(@commit.sha, @path, @environment) if @environment .btn-group{ role: "group" }< - = edit_blob_link - = ide_blob_link + = edit_blob_element + = ide_edit_element - if current_user = replace_blob_link = delete_blob_link -- cgit v1.2.1 From 0767861bcdc62cedf374c6a4b53d8526efb4ff58 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 22 Feb 2018 13:54:19 +0100 Subject: refactor code based on feedback --- app/views/projects/blob/_header.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/projects/blob') diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml index da0c0ed6cb4..1b150ec3e5c 100644 --- a/app/views/projects/blob/_header.html.haml +++ b/app/views/projects/blob/_header.html.haml @@ -11,8 +11,8 @@ = view_on_environment_button(@commit.sha, @path, @environment) if @environment .btn-group{ role: "group" }< - = edit_blob_element - = ide_edit_element + = edit_blob_button + = ide_edit_button - if current_user = replace_blob_link = delete_blob_link -- cgit v1.2.1 From a06152540794d247a34826313e7ab466bf5ee8bb Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Mon, 26 Feb 2018 17:27:42 +0000 Subject: Remove webpack bundle tags for blob --- app/views/projects/blob/_upload.html.haml | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/views/projects/blob') diff --git a/app/views/projects/blob/_upload.html.haml b/app/views/projects/blob/_upload.html.haml index b3afd16f900..f1324c61500 100644 --- a/app/views/projects/blob/_upload.html.haml +++ b/app/views/projects/blob/_upload.html.haml @@ -27,6 +27,3 @@ - unless can?(current_user, :push_code, @project) .inline.prepend-left-10 = commit_in_fork_help - -- content_for :page_specific_javascripts do - = webpack_bundle_tag('blob') -- cgit v1.2.1 From 2d8966f7f521c3d5eae47ff5f1cbc13d37cfc185 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 1 Mar 2018 01:33:06 -0600 Subject: migrate balsamiq_viewer to dynamic import --- app/views/projects/blob/_viewer.html.haml | 3 ++- app/views/projects/blob/viewers/_balsamiq.html.haml | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'app/views/projects/blob') diff --git a/app/views/projects/blob/_viewer.html.haml b/app/views/projects/blob/_viewer.html.haml index cc85e5de40f..3124443b4e4 100644 --- a/app/views/projects/blob/_viewer.html.haml +++ b/app/views/projects/blob/_viewer.html.haml @@ -1,9 +1,10 @@ - hidden = local_assigns.fetch(:hidden, false) - render_error = viewer.render_error +- rich_type = viewer.type == :rich ? viewer.partial_name : nil - load_async = local_assigns.fetch(:load_async, viewer.load_async? && render_error.nil?) - 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) } +.blob-viewer{ data: { type: viewer.type, rich_type: rich_type, url: viewer_url }, class: ('hidden' if hidden) } - if render_error = render 'projects/blob/render_error', viewer: viewer - elsif load_async diff --git a/app/views/projects/blob/viewers/_balsamiq.html.haml b/app/views/projects/blob/viewers/_balsamiq.html.haml index 15349387eb2..b20106e8c3a 100644 --- a/app/views/projects/blob/viewers/_balsamiq.html.haml +++ b/app/views/projects/blob/viewers/_balsamiq.html.haml @@ -1,4 +1 @@ -- content_for :page_specific_javascripts do - = webpack_bundle_tag('balsamiq_viewer') - .file-content.balsamiq-viewer#js-balsamiq-viewer{ data: { endpoint: blob_raw_path } } -- cgit v1.2.1 From e2c87838157d90062725fd648788c6e1839bc8d8 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 1 Mar 2018 01:47:06 -0600 Subject: migrate notebook_viewer to dynamic import --- app/views/projects/blob/viewers/_notebook.html.haml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/views/projects/blob') diff --git a/app/views/projects/blob/viewers/_notebook.html.haml b/app/views/projects/blob/viewers/_notebook.html.haml index d1ffaca35b9..eb4ca1b9816 100644 --- a/app/views/projects/blob/viewers/_notebook.html.haml +++ b/app/views/projects/blob/viewers/_notebook.html.haml @@ -1,5 +1 @@ -- content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('notebook_viewer') - .file-content#js-notebook-viewer{ data: { endpoint: blob_raw_path } } -- cgit v1.2.1 From 4e86a7378cd96ffebfb1c128c9fcb614ee479ffe Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 1 Mar 2018 02:02:18 -0600 Subject: migrate pdf_viewer to dynamic import --- app/views/projects/blob/viewers/_pdf.html.haml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/views/projects/blob') diff --git a/app/views/projects/blob/viewers/_pdf.html.haml b/app/views/projects/blob/viewers/_pdf.html.haml index fc3f0d922b1..95d837a57dc 100644 --- a/app/views/projects/blob/viewers/_pdf.html.haml +++ b/app/views/projects/blob/viewers/_pdf.html.haml @@ -1,5 +1 @@ -- content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('pdf_viewer') - .file-content#js-pdf-viewer{ data: { endpoint: blob_raw_path } } -- cgit v1.2.1 From 9d9d0105947e4cc23f150135e0c904d6ad31f315 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 1 Mar 2018 02:11:07 -0600 Subject: migrate sketch_viewer to dynamic import --- app/views/projects/blob/viewers/_sketch.html.haml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/views/projects/blob') diff --git a/app/views/projects/blob/viewers/_sketch.html.haml b/app/views/projects/blob/viewers/_sketch.html.haml index 8fb67c819c1..b4b6492b92f 100644 --- a/app/views/projects/blob/viewers/_sketch.html.haml +++ b/app/views/projects/blob/viewers/_sketch.html.haml @@ -1,7 +1,3 @@ -- content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('sketch_viewer') - .file-content#js-sketch-viewer{ data: { endpoint: blob_raw_path } } .js-loading-icon.text-center.prepend-top-default.append-bottom-default.js-loading-icon{ 'aria-label' => 'Loading Sketch preview' } = icon('spinner spin 2x', 'aria-hidden' => 'true'); -- cgit v1.2.1 From ce4dd19e09612dc9347b055190f86d805cdc8ef3 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 1 Mar 2018 02:21:08 -0600 Subject: migrate stl_viewer to dynamic import --- app/views/projects/blob/viewers/_stl.html.haml | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/views/projects/blob') diff --git a/app/views/projects/blob/viewers/_stl.html.haml b/app/views/projects/blob/viewers/_stl.html.haml index e58809ec008..55dd8cba7fe 100644 --- a/app/views/projects/blob/viewers/_stl.html.haml +++ b/app/views/projects/blob/viewers/_stl.html.haml @@ -1,6 +1,3 @@ -- content_for :page_specific_javascripts do - = webpack_bundle_tag('stl_viewer') - .file-content.is-stl-loading .text-center#js-stl-viewer{ data: { endpoint: blob_raw_path } } = icon('spinner spin 2x', class: 'prepend-top-default append-bottom-default', 'aria-hidden' => 'true', 'aria-label' => 'Loading') -- cgit v1.2.1