From bc139608c2f8fe79b6d66dd649e899f810cbb11d Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sun, 2 Oct 2016 10:09:13 +0800 Subject: [PATCH 1/2] Search.focus() is the new Search.open() --- app/views/explore/active.html.erb | 3 +-- app/views/explore/featured.html.erb | 3 +-- app/views/explore/mapper.html.erb | 3 +-- app/views/explore/mine.html.erb | 3 +-- app/views/explore/shared.html.erb | 3 +-- app/views/explore/starred.html.erb | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/views/explore/active.html.erb b/app/views/explore/active.html.erb index a70cdcae..0ca442e5 100644 --- a/app/views/explore/active.html.erb +++ b/app/views/explore/active.html.erb @@ -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(); diff --git a/app/views/explore/featured.html.erb b/app/views/explore/featured.html.erb index cfe4a627..806b2fac 100644 --- a/app/views/explore/featured.html.erb +++ b/app/views/explore/featured.html.erb @@ -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(); diff --git a/app/views/explore/mapper.html.erb b/app/views/explore/mapper.html.erb index 8c5ecf89..68792f47 100644 --- a/app/views/explore/mapper.html.erb +++ b/app/views/explore/mapper.html.erb @@ -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(); diff --git a/app/views/explore/mine.html.erb b/app/views/explore/mine.html.erb index 17f715f9..8e39c296 100644 --- a/app/views/explore/mine.html.erb +++ b/app/views/explore/mine.html.erb @@ -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(); diff --git a/app/views/explore/shared.html.erb b/app/views/explore/shared.html.erb index fd02c810..246498a0 100644 --- a/app/views/explore/shared.html.erb +++ b/app/views/explore/shared.html.erb @@ -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(); diff --git a/app/views/explore/starred.html.erb b/app/views/explore/starred.html.erb index 4d0e0eb1..825dbf5d 100644 --- a/app/views/explore/starred.html.erb +++ b/app/views/explore/starred.html.erb @@ -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(); From b3c7e12d9a8ef5dc29147cc0c27247c53578ecd8 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sun, 2 Oct 2016 10:53:35 +0800 Subject: [PATCH 2/2] assets.debug was why assets were loud --- config/environments/development.rb | 5 +++-- config/initializers/assets.rb | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index b1654921..dd6095b2 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -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 diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 4edab3b6..11f6601e 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -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