Browse Source

update livereload settings

Felix Niklas 9 years ago
parent
commit
08a372cb75
4 changed files with 12 additions and 15 deletions
  1. 3 3
      Gemfile
  2. 0 3
      Gemfile.lock
  3. 5 3
      Guardfile
  4. 4 6
      config/environments/development.rb

+ 3 - 3
Gemfile

@@ -78,10 +78,10 @@ group :development, :test do
   gem 'selenium-webdriver'
 
   # livereload on template changes (html, js, css)
-  gem 'guard', '>= 2.2.2', require: false
-  gem 'guard-livereload',  require: false
+  gem 'guard', '>= 2.2.2', :require => false
+  gem 'guard-livereload',  :require => false
   gem 'rack-livereload'
-  gem 'rb-fsevent',        require: false
+  gem 'rb-fsevent',        :require => false
 
   # code QA
   gem 'rubocop'

+ 0 - 3
Gemfile.lock

@@ -340,6 +340,3 @@ DEPENDENCIES
   twitter (~> 5.13.0)
   uglifier
   writeexcel
-
-BUNDLED WITH
-   1.10.5

+ 5 - 3
Guardfile

@@ -1,11 +1,13 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'livereload', port: '35738' do
+guard :livereload, :port => "35738" do
   watch(%r{app/views/.+\.(erb|haml|slim)$})
   watch(%r{app/helpers/.+\.rb})
-  watch(%r{public/.+\.(css|js|html|svg)})
+  watch(%r{public/.+\.(css|js|html)})
   watch(%r{config/locales/.+\.yml})
   # Rails Assets Pipeline
-  watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg|svg))).*}) { |m| "/assets/#{m[3]}" }
+  watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
+  watch(%r{(app|vendor)(/assets/\w+/(.+)\.(scss))}) { |m| "/assets/#{m[3]}.css" }
+  watch(%r{(app|vendor)(/assets/\w+/(.+)\.(svg))}) { |m| "/assets/#{m[3]}.svg" }
 end

+ 4 - 6
config/environments/development.rb

@@ -32,12 +32,10 @@ Rails.application.configure do
   config.assets.debug = false
 
   # Automatically inject JavaScript needed for LiveReload
-  config.middleware.use(
-    Rack::LiveReload,
-    min_delay: 500,    # default 1000
-    max_delay: 10_000, # default 60_000
-    live_reload_port: 35_738,
-    source: :vendored
+  config.middleware.insert_after(ActionDispatch::Static, Rack::LiveReload,
+    :min_delay        => 500,    # default 1000
+    :max_delay        => 10_000, # default 60_000
+    :live_reload_port => 35738
   )
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,