From 485310a43c23ecaf2670b8a7c9203110ea4fc7dc Mon Sep 17 00:00:00 2001 From: Eugen Date: Thu, 13 Apr 2017 22:21:20 +0200 Subject: [PATCH 1/2] Make browserify respect changes in node_modules for asset compilation (#1722) --- config/application.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index f3f1f7bf..5a3548d6 100644 --- a/config/application.rb +++ b/config/application.rb @@ -62,7 +62,9 @@ module Mastodon config.middleware.use Rack::Attack config.middleware.use Rack::Deflater - config.browserify_rails.commandline_options = '--transform [ babelify --presets [ es2015 react ] ] --extension=".jsx"' + config.browserify_rails.source_map_environments << 'development' + config.browserify_rails.commandline_options = '--transform [ babelify --presets [ es2015 react ] ] --extension=".jsx"' + config.browserify_rails.evaluate_node_modules = true config.to_prepare do Doorkeeper::AuthorizationsController.layout 'public' From c5afe573da39aff73a309d95d3a8ce492a73d3a6 Mon Sep 17 00:00:00 2001 From: Eugen Date: Thu, 13 Apr 2017 22:21:34 +0200 Subject: [PATCH 2/2] Fix drag & drop overlay not appearing on firefox (#1721) --- app/assets/javascripts/components/features/ui/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/components/features/ui/index.jsx b/app/assets/javascripts/components/features/ui/index.jsx index 89fb8256..5c7cc6ef 100644 --- a/app/assets/javascripts/components/features/ui/index.jsx +++ b/app/assets/javascripts/components/features/ui/index.jsx @@ -47,7 +47,7 @@ const UI = React.createClass({ this.dragTargets.push(e.target); } - if (e.dataTransfer && e.dataTransfer.files.length > 0) { + if (e.dataTransfer && e.dataTransfer.items.length > 0) { this.setState({ draggingOver: true }); } },