diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b48188774..6acec19d9 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -6,4 +6,4 @@ //= require jquery.storageapi.js //= require rails.js //= require common.js -//= require_tree . +//= require_tree ./default diff --git a/app/assets/javascripts/bulk_update_requests.js.coffee b/app/assets/javascripts/bulk_update_requests.js.coffee deleted file mode 100644 index 24f83d18b..000000000 --- a/app/assets/javascripts/bulk_update_requests.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/artist_commentaries.js b/app/assets/javascripts/default/artist_commentaries.js similarity index 100% rename from app/assets/javascripts/artist_commentaries.js rename to app/assets/javascripts/default/artist_commentaries.js diff --git a/app/assets/javascripts/artists.js b/app/assets/javascripts/default/artists.js similarity index 100% rename from app/assets/javascripts/artists.js rename to app/assets/javascripts/default/artists.js diff --git a/app/assets/javascripts/autocomplete.js b/app/assets/javascripts/default/autocomplete.js similarity index 100% rename from app/assets/javascripts/autocomplete.js rename to app/assets/javascripts/default/autocomplete.js diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/default/blacklists.js similarity index 100% rename from app/assets/javascripts/blacklists.js rename to app/assets/javascripts/default/blacklists.js diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/default/comments.js similarity index 100% rename from app/assets/javascripts/comments.js rename to app/assets/javascripts/default/comments.js diff --git a/app/assets/javascripts/cookie.js b/app/assets/javascripts/default/cookie.js similarity index 100% rename from app/assets/javascripts/cookie.js rename to app/assets/javascripts/default/cookie.js diff --git a/app/assets/javascripts/dtext.js b/app/assets/javascripts/default/dtext.js similarity index 100% rename from app/assets/javascripts/dtext.js rename to app/assets/javascripts/default/dtext.js diff --git a/app/assets/javascripts/favorites.js b/app/assets/javascripts/default/favorites.js similarity index 100% rename from app/assets/javascripts/favorites.js rename to app/assets/javascripts/default/favorites.js diff --git a/app/assets/javascripts/forum_posts.js b/app/assets/javascripts/default/forum_posts.js similarity index 100% rename from app/assets/javascripts/forum_posts.js rename to app/assets/javascripts/default/forum_posts.js diff --git a/app/assets/javascripts/janitor_trials.js b/app/assets/javascripts/default/janitor_trials.js similarity index 100% rename from app/assets/javascripts/janitor_trials.js rename to app/assets/javascripts/default/janitor_trials.js diff --git a/app/assets/javascripts/mod_queue.js b/app/assets/javascripts/default/mod_queue.js similarity index 100% rename from app/assets/javascripts/mod_queue.js rename to app/assets/javascripts/default/mod_queue.js diff --git a/app/assets/javascripts/news_updates.js b/app/assets/javascripts/default/news_updates.js similarity index 100% rename from app/assets/javascripts/news_updates.js rename to app/assets/javascripts/default/news_updates.js diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/default/notes.js similarity index 100% rename from app/assets/javascripts/notes.js rename to app/assets/javascripts/default/notes.js diff --git a/app/assets/javascripts/paginator.js b/app/assets/javascripts/default/paginator.js similarity index 100% rename from app/assets/javascripts/paginator.js rename to app/assets/javascripts/default/paginator.js diff --git a/app/assets/javascripts/pools.js b/app/assets/javascripts/default/pools.js similarity index 100% rename from app/assets/javascripts/pools.js rename to app/assets/javascripts/default/pools.js diff --git a/app/assets/javascripts/post_appeals.js b/app/assets/javascripts/default/post_appeals.js similarity index 100% rename from app/assets/javascripts/post_appeals.js rename to app/assets/javascripts/default/post_appeals.js diff --git a/app/assets/javascripts/post_flags.js b/app/assets/javascripts/default/post_flags.js similarity index 100% rename from app/assets/javascripts/post_flags.js rename to app/assets/javascripts/default/post_flags.js diff --git a/app/assets/javascripts/post_mode_menu.js b/app/assets/javascripts/default/post_mode_menu.js similarity index 100% rename from app/assets/javascripts/post_mode_menu.js rename to app/assets/javascripts/default/post_mode_menu.js diff --git a/app/assets/javascripts/post_moderation.js b/app/assets/javascripts/default/post_moderation.js similarity index 100% rename from app/assets/javascripts/post_moderation.js rename to app/assets/javascripts/default/post_moderation.js diff --git a/app/assets/javascripts/post_popular.js b/app/assets/javascripts/default/post_popular.js similarity index 100% rename from app/assets/javascripts/post_popular.js rename to app/assets/javascripts/default/post_popular.js diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/default/posts.js similarity index 100% rename from app/assets/javascripts/posts.js rename to app/assets/javascripts/default/posts.js diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/default/related_tag.js similarity index 100% rename from app/assets/javascripts/related_tag.js rename to app/assets/javascripts/default/related_tag.js diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/default/shortcuts.js similarity index 100% rename from app/assets/javascripts/shortcuts.js rename to app/assets/javascripts/default/shortcuts.js diff --git a/app/assets/javascripts/sources.js b/app/assets/javascripts/default/sources.js similarity index 100% rename from app/assets/javascripts/sources.js rename to app/assets/javascripts/default/sources.js diff --git a/app/assets/javascripts/tag_script.js b/app/assets/javascripts/default/tag_script.js similarity index 100% rename from app/assets/javascripts/tag_script.js rename to app/assets/javascripts/default/tag_script.js diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/default/uploads.js similarity index 100% rename from app/assets/javascripts/uploads.js rename to app/assets/javascripts/default/uploads.js diff --git a/app/assets/javascripts/utility.js b/app/assets/javascripts/default/utility.js similarity index 100% rename from app/assets/javascripts/utility.js rename to app/assets/javascripts/default/utility.js diff --git a/app/assets/javascripts/wiki_pages.js b/app/assets/javascripts/default/wiki_pages.js similarity index 100% rename from app/assets/javascripts/wiki_pages.js rename to app/assets/javascripts/default/wiki_pages.js diff --git a/app/assets/javascripts/mobile.js b/app/assets/javascripts/mobile/mobile.js similarity index 100% rename from app/assets/javascripts/mobile.js rename to app/assets/javascripts/mobile/mobile.js diff --git a/app/views/layouts/mobile.html.erb b/app/views/layouts/mobile.html.erb index 768a5485c..fa3ec5b42 100644 --- a/app/views/layouts/mobile.html.erb +++ b/app/views/layouts/mobile.html.erb @@ -5,7 +5,7 @@ <%= csrf_meta_tag %> <%= stylesheet_link_tag "mobile", :media => "screen" %> - <%= javascript_include_tag "mobile" %> + <%= javascript_include_tag "mobile/mobile" %> <%= Danbooru.config.custom_html_header_content %> <%= yield :html_header %>