From 4cca9a3e0f388210883ea2e3be97e92ac0576b38 Mon Sep 17 00:00:00 2001 From: Connor Shea <connor.james.shea@gmail.com> Date: Thu, 23 Jun 2016 10:55:40 -0600 Subject: [PATCH] Reorganize the lib directory. --- app/assets/javascripts/application.js.coffee | 2 +- .../lib/{chart/application.js.coffee => chart.js.coffee} | 0 .../javascripts/lib/{d3/application.js.coffee => d3.js.coffee} | 0 .../lib/{raphael/application.js.coffee => raphael.js.coffee} | 0 app/assets/javascripts/lib/{ => utils}/animate.js.coffee | 0 app/assets/javascripts/lib/{ => utils}/common_utils.js.coffee | 0 .../javascripts/lib/{ => utils}/datetime_utility.js.coffee | 0 .../javascripts/lib/{ => utils}/emoji_aliases.js.coffee.erb | 0 app/assets/javascripts/lib/{ => utils}/jquery.timeago.js | 0 app/assets/javascripts/lib/{ => utils}/md5.js | 0 app/assets/javascripts/lib/{ => utils}/notify.js.coffee | 0 app/assets/javascripts/lib/{ => utils}/text_utility.js.coffee | 0 app/assets/javascripts/lib/{ => utils}/type_utility.js.coffee | 0 app/assets/javascripts/lib/{ => utils}/url_utility.js.coffee | 0 app/assets/javascripts/lib/{ => utils}/utf8_encode.js | 0 app/assets/javascripts/network/application.js.coffee | 3 --- app/views/projects/graphs/_head.html.haml | 2 +- app/views/projects/network/show.html.haml | 2 +- app/views/users/show.html.haml | 2 +- 19 files changed, 4 insertions(+), 7 deletions(-) rename app/assets/javascripts/lib/{chart/application.js.coffee => chart.js.coffee} (100%) rename app/assets/javascripts/lib/{d3/application.js.coffee => d3.js.coffee} (100%) rename app/assets/javascripts/lib/{raphael/application.js.coffee => raphael.js.coffee} (100%) rename app/assets/javascripts/lib/{ => utils}/animate.js.coffee (100%) rename app/assets/javascripts/lib/{ => utils}/common_utils.js.coffee (100%) rename app/assets/javascripts/lib/{ => utils}/datetime_utility.js.coffee (100%) rename app/assets/javascripts/lib/{ => utils}/emoji_aliases.js.coffee.erb (100%) rename app/assets/javascripts/lib/{ => utils}/jquery.timeago.js (100%) rename app/assets/javascripts/lib/{ => utils}/md5.js (100%) rename app/assets/javascripts/lib/{ => utils}/notify.js.coffee (100%) rename app/assets/javascripts/lib/{ => utils}/text_utility.js.coffee (100%) rename app/assets/javascripts/lib/{ => utils}/type_utility.js.coffee (100%) rename app/assets/javascripts/lib/{ => utils}/url_utility.js.coffee (100%) rename app/assets/javascripts/lib/{ => utils}/utf8_encode.js (100%) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 07b45eae9bb..5c5a4ca7670 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -50,7 +50,7 @@ #= require_directory ./ci #= require_directory ./commit #= require_directory ./extensions -#= require_directory ./lib/. +#= require_directory ./lib/utils #= require_directory ./u2f #= require_directory . #= require fuzzaldrin-plus diff --git a/app/assets/javascripts/lib/chart/application.js.coffee b/app/assets/javascripts/lib/chart.js.coffee similarity index 100% rename from app/assets/javascripts/lib/chart/application.js.coffee rename to app/assets/javascripts/lib/chart.js.coffee diff --git a/app/assets/javascripts/lib/d3/application.js.coffee b/app/assets/javascripts/lib/d3.js.coffee similarity index 100% rename from app/assets/javascripts/lib/d3/application.js.coffee rename to app/assets/javascripts/lib/d3.js.coffee diff --git a/app/assets/javascripts/lib/raphael/application.js.coffee b/app/assets/javascripts/lib/raphael.js.coffee similarity index 100% rename from app/assets/javascripts/lib/raphael/application.js.coffee rename to app/assets/javascripts/lib/raphael.js.coffee diff --git a/app/assets/javascripts/lib/animate.js.coffee b/app/assets/javascripts/lib/utils/animate.js.coffee similarity index 100% rename from app/assets/javascripts/lib/animate.js.coffee rename to app/assets/javascripts/lib/utils/animate.js.coffee diff --git a/app/assets/javascripts/lib/common_utils.js.coffee b/app/assets/javascripts/lib/utils/common_utils.js.coffee similarity index 100% rename from app/assets/javascripts/lib/common_utils.js.coffee rename to app/assets/javascripts/lib/utils/common_utils.js.coffee diff --git a/app/assets/javascripts/lib/datetime_utility.js.coffee b/app/assets/javascripts/lib/utils/datetime_utility.js.coffee similarity index 100% rename from app/assets/javascripts/lib/datetime_utility.js.coffee rename to app/assets/javascripts/lib/utils/datetime_utility.js.coffee diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb similarity index 100% rename from app/assets/javascripts/lib/emoji_aliases.js.coffee.erb rename to app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb diff --git a/app/assets/javascripts/lib/jquery.timeago.js b/app/assets/javascripts/lib/utils/jquery.timeago.js similarity index 100% rename from app/assets/javascripts/lib/jquery.timeago.js rename to app/assets/javascripts/lib/utils/jquery.timeago.js diff --git a/app/assets/javascripts/lib/md5.js b/app/assets/javascripts/lib/utils/md5.js similarity index 100% rename from app/assets/javascripts/lib/md5.js rename to app/assets/javascripts/lib/utils/md5.js diff --git a/app/assets/javascripts/lib/notify.js.coffee b/app/assets/javascripts/lib/utils/notify.js.coffee similarity index 100% rename from app/assets/javascripts/lib/notify.js.coffee rename to app/assets/javascripts/lib/utils/notify.js.coffee diff --git a/app/assets/javascripts/lib/text_utility.js.coffee b/app/assets/javascripts/lib/utils/text_utility.js.coffee similarity index 100% rename from app/assets/javascripts/lib/text_utility.js.coffee rename to app/assets/javascripts/lib/utils/text_utility.js.coffee diff --git a/app/assets/javascripts/lib/type_utility.js.coffee b/app/assets/javascripts/lib/utils/type_utility.js.coffee similarity index 100% rename from app/assets/javascripts/lib/type_utility.js.coffee rename to app/assets/javascripts/lib/utils/type_utility.js.coffee diff --git a/app/assets/javascripts/lib/url_utility.js.coffee b/app/assets/javascripts/lib/utils/url_utility.js.coffee similarity index 100% rename from app/assets/javascripts/lib/url_utility.js.coffee rename to app/assets/javascripts/lib/utils/url_utility.js.coffee diff --git a/app/assets/javascripts/lib/utf8_encode.js b/app/assets/javascripts/lib/utils/utf8_encode.js similarity index 100% rename from app/assets/javascripts/lib/utf8_encode.js rename to app/assets/javascripts/lib/utils/utf8_encode.js diff --git a/app/assets/javascripts/network/application.js.coffee b/app/assets/javascripts/network/application.js.coffee index cb9eead855b..f75f63869c5 100644 --- a/app/assets/javascripts/network/application.js.coffee +++ b/app/assets/javascripts/network/application.js.coffee @@ -4,9 +4,6 @@ # It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the # the compiled file. # -#= require raphael -#= require g.raphael -#= require g.bar #= require_tree . $ -> diff --git a/app/views/projects/graphs/_head.html.haml b/app/views/projects/graphs/_head.html.haml index 5ea4adcd0fa..ca04a782fcf 100644 --- a/app/views/projects/graphs/_head.html.haml +++ b/app/views/projects/graphs/_head.html.haml @@ -2,7 +2,7 @@ %ul{ class: (container_class) } - content_for :page_specific_javascripts do - = javascript_include_tag 'lib/chart/application.js', {integrity: true, "data-turbolinks-track" => true} + = javascript_include_tag 'lib/chart.js', {integrity: true, "data-turbolinks-track" => true} = javascript_include_tag 'graphs/application.js', {integrity: true, "data-turbolinks-track" => true} = nav_link(action: :show) do = link_to 'Contributors', namespace_project_graph_path diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index 749afe6b6ab..8bfda9776c7 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -1,6 +1,6 @@ - page_title "Network", @ref - content_for :page_specific_javascripts do - = javascript_include_tag 'lib/raphael/application.js', {integrity: true, "data-turbolinks-track" => true} + = javascript_include_tag 'lib/raphael.js', {integrity: true, "data-turbolinks-track" => true} = javascript_include_tag 'network/application.js', {integrity: true, "data-turbolinks-track" => true} = render "projects/commits/head" = render "head" diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 9ca351e5147..0fabc2a7714 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,7 +1,7 @@ - page_title @user.name - page_description @user.bio - content_for :page_specific_javascripts do - = javascript_include_tag 'lib/d3/application.js', {integrity: true, "data-turbolinks-track" => true} + = javascript_include_tag 'lib/d3.js', {integrity: true, "data-turbolinks-track" => true} = javascript_include_tag 'users/application.js', {integrity: true, "data-turbolinks-track" => true} - header_title @user.name, user_path(@user) - @no_container = true -- 2.30.9