From 63b763ce30e8b4da7d10fd378973b3453e106a34 Mon Sep 17 00:00:00 2001 From: Brice Sanchez Date: Thu, 19 Jul 2018 10:30:25 -0400 Subject: [PATCH] Move image crop libs to vendor Also don't import cropper css in main refinery --- core/app/assets/config/refinery_core_manifest.js | 4 ++-- core/app/assets/stylesheets/refinery/refinery.scss | 1 - .../refinery/plugins => vendor/assets/javascripts}/cropper.js | 0 .../plugins => vendor/assets/stylesheets}/cropper.css | 0 images/app/views/refinery/admin/images/_form.html.erb | 4 ++-- 5 files changed, 4 insertions(+), 5 deletions(-) rename core/{app/assets/javascripts/refinery/plugins => vendor/assets/javascripts}/cropper.js (100%) rename core/{app/assets/stylesheets/refinery/plugins => vendor/assets/stylesheets}/cropper.css (100%) diff --git a/core/app/assets/config/refinery_core_manifest.js b/core/app/assets/config/refinery_core_manifest.js index b82383850c..76c86c1514 100644 --- a/core/app/assets/config/refinery_core_manifest.js +++ b/core/app/assets/config/refinery_core_manifest.js @@ -13,6 +13,6 @@ //= link refinery/site_bar.css //= link refinery/theme.css -//= link refinery/plugins/cropper.css -//= link refinery/plugins/cropper.js +//= link cropper.css +//= link cropper.js //= link refinery/image_crop.js \ No newline at end of file diff --git a/core/app/assets/stylesheets/refinery/refinery.scss b/core/app/assets/stylesheets/refinery/refinery.scss index 629df9e63c..15ed8a80b7 100644 --- a/core/app/assets/stylesheets/refinery/refinery.scss +++ b/core/app/assets/stylesheets/refinery/refinery.scss @@ -10,7 +10,6 @@ @import 'mixins/rounded'; @import 'plugins/ui'; -@import 'plugins/cropper'; @import 'components/icons'; @import 'components/dialog'; diff --git a/core/app/assets/javascripts/refinery/plugins/cropper.js b/core/vendor/assets/javascripts/cropper.js similarity index 100% rename from core/app/assets/javascripts/refinery/plugins/cropper.js rename to core/vendor/assets/javascripts/cropper.js diff --git a/core/app/assets/stylesheets/refinery/plugins/cropper.css b/core/vendor/assets/stylesheets/cropper.css similarity index 100% rename from core/app/assets/stylesheets/refinery/plugins/cropper.css rename to core/vendor/assets/stylesheets/cropper.css diff --git a/images/app/views/refinery/admin/images/_form.html.erb b/images/app/views/refinery/admin/images/_form.html.erb index 074f88e449..f9e6291ab1 100644 --- a/images/app/views/refinery/admin/images/_form.html.erb +++ b/images/app/views/refinery/admin/images/_form.html.erb @@ -107,9 +107,9 @@ <% content_for :after_javascript_libraries do %> - <%= javascript_include_tag 'refinery/plugins/cropper' %> + <%= javascript_include_tag 'cropper' %> <%= javascript_include_tag 'refinery/image_crop' %> <% end %> - <% content_for :stylesheets, stylesheet_link_tag('refinery/plugins/cropper') -%> + <% content_for :stylesheets, stylesheet_link_tag('cropper') -%> <% end %> \ No newline at end of file