glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #702 from metamaps/feature/quiet-assets

Browse source 
quiet assets again
This commit is contained in:
Devin Howard 2016-10-02 11:01:17 +08:00 committed by GitHub
parent 05c1e4c60d b3c7e12d9a
commit 7ec9feff80
8 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/explore/active.html.erb
View file

@ -11,6 +11,5 @@
<% content_for :mobile_title, "Recently Active" %>
Metamaps.currentSection = "explore";
Metamaps.GlobalUI.Search.open();
Metamaps.GlobalUI.Search.lock();
Metamaps.GlobalUI.Search.focus();
</script>

3
app/views/explore/featured.html.erb
View file

@ -11,6 +11,5 @@
<% content_for :mobile_title, "Featured Maps" %>
Metamaps.currentSection = "explore";
Metamaps.GlobalUI.Search.open();
Metamaps.GlobalUI.Search.lock();
Metamaps.GlobalUI.Search.focus();
</script>

3
app/views/explore/mapper.html.erb
View file

@ -14,6 +14,5 @@
<% content_for :mobile_title, @user.name %>
Metamaps.currentSection = "explore";
Metamaps.GlobalUI.Search.open();
Metamaps.GlobalUI.Search.lock();
Metamaps.GlobalUI.Search.focus();
</script>

3
app/views/explore/mine.html.erb
View file

@ -11,6 +11,5 @@
<% content_for :mobile_title, "My Maps" %>
Metamaps.currentSection = "explore";
Metamaps.GlobalUI.Search.open();
Metamaps.GlobalUI.Search.lock();
Metamaps.GlobalUI.Search.focus();
</script>

3
app/views/explore/shared.html.erb
View file

@ -11,6 +11,5 @@
<% content_for :mobile_title, "Shared With Me" %>
Metamaps.currentSection = "explore";
Metamaps.GlobalUI.Search.open();
Metamaps.GlobalUI.Search.lock();
Metamaps.GlobalUI.Search.focus();
</script>

3
app/views/explore/starred.html.erb
View file

@ -11,6 +11,5 @@
<% content_for :mobile_title, "Starred Maps" %>
Metamaps.currentSection = "explore";
Metamaps.GlobalUI.Search.open();
Metamaps.GlobalUI.Search.lock();
Metamaps.GlobalUI.Search.focus();
</script>

5
config/environments/development.rb
View file

@ -1,5 +1,5 @@
# frozen_string_literal: true
Metamaps::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb
config.log_level = :info
@ -46,5 +46,6 @@ Metamaps::Application.configure do
config.action_mailer.preview_path = '/vagrant/spec/mailers/previews'
# Expands the lines which load the assets
config.assets.debug = true
config.assets.debug = false
config.assets.quiet = true
end

20
config/initializers/assets.rb
View file

@ -1,13 +1,13 @@
# frozen_string_literal: true
# Be sure to restart your server when you modify this file.
Rails.application.configure do
# Version of your assets, change this if you want to expire all your assets.
config.assets.version = '2.0'
config.assets.quiet = true
# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '2.0'
Rails.application.config.assets.quiet = true
# Add additional assets to the asset load path
# Rails.application.config.assets.paths << Emoji.images_path
# Add additional assets to the asset load path
# Rails.application.config.assets.paths << Emoji.images_path
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
Rails.application.config.assets.precompile += %w(webpacked/metamaps.bundle.js)
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
config.assets.precompile += %w(webpacked/metamaps.bundle.js)
end