Skip to content

Commit

Permalink
Add skip_display_none option
Browse files Browse the repository at this point in the history
  • Loading branch information
tangrufus authored and aaronvb committed Jan 23, 2016
1 parent 84e05e1 commit cae4eeb
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Lint/HandleExceptions:

# Offense count: 1
Metrics/AbcSize:
Max: 23
Max: 24

# Offense count: 1
# Configuration parameters: CountComments.
Expand All @@ -69,4 +69,3 @@ Metrics/ModuleLength:
Style/GlobalVars:
Exclude:
- 'spec/dummy/config/environments/development.rb'

Empty file modified README.md
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion app/helpers/react_on_rails_helper.rb
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def react_component(component_name, props = {}, options = {})
content_tag(:div,
"",
class: "js-react-on-rails-component",
style: "display:none",
style: ReactOnRails.configuration.skip_display_none ? nil : "display:none",
data: data)

# Create the HTML rendering part
Expand Down
2 changes: 2 additions & 0 deletions lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@
config.prerender = false
# Default is true for development, off otherwise
config.trace = Rails.env.development?
# Default is false, enable if your content security policy doesn't include `style-src: 'unsafe-inline'`
config.skip_display_none = false
end
10 changes: 7 additions & 3 deletions lib/react_on_rails/configuration.rb
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,22 @@ def self.configuration
trace: Rails.env.development?,
development_mode: Rails.env.development?,
server_renderer_pool_size: 1,
server_renderer_timeout: 20)
server_renderer_timeout: 20,
skip_display_none: false)
end

class Configuration
attr_accessor :server_bundle_js_file, :prerender, :replay_console,
:trace, :development_mode,
:logging_on_server, :server_renderer_pool_size,
:server_renderer_timeout, :raise_on_prerender_error
:server_renderer_timeout, :raise_on_prerender_error,
:skip_display_none

def initialize(server_bundle_js_file: nil, prerender: nil, replay_console: nil,
trace: nil, development_mode: nil,
logging_on_server: nil, server_renderer_pool_size: nil,
server_renderer_timeout: nil, raise_on_prerender_error: nil)
server_renderer_timeout: nil, raise_on_prerender_error: nil,
skip_display_none: nil)
if File.exist?(server_bundle_js_file)
self.server_bundle_js_file = server_bundle_js_file
else
Expand All @@ -43,6 +46,7 @@ def initialize(server_bundle_js_file: nil, prerender: nil, replay_console: nil,
end
self.trace = trace.nil? ? Rails.env.development? : trace
self.raise_on_prerender_error = raise_on_prerender_error
self.skip_display_none = skip_display_none

# Server rendering:
self.server_renderer_pool_size = self.development_mode ? 1 : server_renderer_pool_size
Expand Down
Empty file modified spec/dummy/spec/helpers/react_on_rails_helper_spec.rb
100644 → 100755
Empty file.

0 comments on commit cae4eeb

Please sign in to comment.