From bdaa51c5cc36ff3e39395a20bf6a304197c87800 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Mon, 24 Jul 2017 17:11:15 +0200 Subject: [PATCH] Move old js in a directory to avoid conflicts with require_tree --- app/assets/javascripts/application.js | 2 +- app/assets/javascripts/{ => old_design}/action_btn_rules.js | 0 app/assets/javascripts/{ => old_design}/address_typeahead.js | 0 app/assets/javascripts/{ => old_design}/admin.js | 0 .../javascripts/{ => old_design}/admin_procedures_modal.js | 0 app/assets/javascripts/{ => old_design}/archive.js | 0 app/assets/javascripts/{ => old_design}/bootstrap_wysihtml5.js | 0 app/assets/javascripts/{ => old_design}/carte/cadastre.js | 0 app/assets/javascripts/{ => old_design}/carte/carte.js | 0 app/assets/javascripts/{ => old_design}/carte/qp.js | 0 app/assets/javascripts/{ => old_design}/cgu.js | 0 app/assets/javascripts/{ => old_design}/default_data_block.js | 0 app/assets/javascripts/{ => old_design}/description.js | 0 .../javascripts/{ => old_design}/dossier_commentaires_modal.js | 0 app/assets/javascripts/{ => old_design}/dossiers.js | 0 app/assets/javascripts/{ => old_design}/dossiers_list_filter.js | 0 app/assets/javascripts/{ => old_design}/dossiers_list_link.js | 0 app/assets/javascripts/{ => old_design}/franceconnect_kit.js | 0 .../javascripts/{ => old_design}/gestionnaire_dossier_modal.js | 0 app/assets/javascripts/{ => old_design}/new-description.js | 0 app/assets/javascripts/{ => old_design}/pref_list_dossier.js | 0 app/assets/javascripts/{ => old_design}/procedure.js | 0 app/assets/javascripts/{ => old_design}/search.js | 0 app/assets/javascripts/{ => old_design}/start.js | 0 app/assets/javascripts/{ => old_design}/user/description.js | 0 25 files changed, 1 insertion(+), 1 deletion(-) rename app/assets/javascripts/{ => old_design}/action_btn_rules.js (100%) rename app/assets/javascripts/{ => old_design}/address_typeahead.js (100%) rename app/assets/javascripts/{ => old_design}/admin.js (100%) rename app/assets/javascripts/{ => old_design}/admin_procedures_modal.js (100%) rename app/assets/javascripts/{ => old_design}/archive.js (100%) rename app/assets/javascripts/{ => old_design}/bootstrap_wysihtml5.js (100%) rename app/assets/javascripts/{ => old_design}/carte/cadastre.js (100%) rename app/assets/javascripts/{ => old_design}/carte/carte.js (100%) rename app/assets/javascripts/{ => old_design}/carte/qp.js (100%) rename app/assets/javascripts/{ => old_design}/cgu.js (100%) rename app/assets/javascripts/{ => old_design}/default_data_block.js (100%) rename app/assets/javascripts/{ => old_design}/description.js (100%) rename app/assets/javascripts/{ => old_design}/dossier_commentaires_modal.js (100%) rename app/assets/javascripts/{ => old_design}/dossiers.js (100%) rename app/assets/javascripts/{ => old_design}/dossiers_list_filter.js (100%) rename app/assets/javascripts/{ => old_design}/dossiers_list_link.js (100%) rename app/assets/javascripts/{ => old_design}/franceconnect_kit.js (100%) rename app/assets/javascripts/{ => old_design}/gestionnaire_dossier_modal.js (100%) rename app/assets/javascripts/{ => old_design}/new-description.js (100%) rename app/assets/javascripts/{ => old_design}/pref_list_dossier.js (100%) rename app/assets/javascripts/{ => old_design}/procedure.js (100%) rename app/assets/javascripts/{ => old_design}/search.js (100%) rename app/assets/javascripts/{ => old_design}/start.js (100%) rename app/assets/javascripts/{ => old_design}/user/description.js (100%) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f17bf80df..d5ce61307 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,7 +15,7 @@ //= require turbolinks //= require highcharts //= require chartkick -//= require_tree . +//= require_tree ./old_design //= require bootstrap-sprockets //= require bootstrap-datepicker/core //= require bootstrap-datepicker/locales/bootstrap-datepicker.fr.js diff --git a/app/assets/javascripts/action_btn_rules.js b/app/assets/javascripts/old_design/action_btn_rules.js similarity index 100% rename from app/assets/javascripts/action_btn_rules.js rename to app/assets/javascripts/old_design/action_btn_rules.js diff --git a/app/assets/javascripts/address_typeahead.js b/app/assets/javascripts/old_design/address_typeahead.js similarity index 100% rename from app/assets/javascripts/address_typeahead.js rename to app/assets/javascripts/old_design/address_typeahead.js diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/old_design/admin.js similarity index 100% rename from app/assets/javascripts/admin.js rename to app/assets/javascripts/old_design/admin.js diff --git a/app/assets/javascripts/admin_procedures_modal.js b/app/assets/javascripts/old_design/admin_procedures_modal.js similarity index 100% rename from app/assets/javascripts/admin_procedures_modal.js rename to app/assets/javascripts/old_design/admin_procedures_modal.js diff --git a/app/assets/javascripts/archive.js b/app/assets/javascripts/old_design/archive.js similarity index 100% rename from app/assets/javascripts/archive.js rename to app/assets/javascripts/old_design/archive.js diff --git a/app/assets/javascripts/bootstrap_wysihtml5.js b/app/assets/javascripts/old_design/bootstrap_wysihtml5.js similarity index 100% rename from app/assets/javascripts/bootstrap_wysihtml5.js rename to app/assets/javascripts/old_design/bootstrap_wysihtml5.js diff --git a/app/assets/javascripts/carte/cadastre.js b/app/assets/javascripts/old_design/carte/cadastre.js similarity index 100% rename from app/assets/javascripts/carte/cadastre.js rename to app/assets/javascripts/old_design/carte/cadastre.js diff --git a/app/assets/javascripts/carte/carte.js b/app/assets/javascripts/old_design/carte/carte.js similarity index 100% rename from app/assets/javascripts/carte/carte.js rename to app/assets/javascripts/old_design/carte/carte.js diff --git a/app/assets/javascripts/carte/qp.js b/app/assets/javascripts/old_design/carte/qp.js similarity index 100% rename from app/assets/javascripts/carte/qp.js rename to app/assets/javascripts/old_design/carte/qp.js diff --git a/app/assets/javascripts/cgu.js b/app/assets/javascripts/old_design/cgu.js similarity index 100% rename from app/assets/javascripts/cgu.js rename to app/assets/javascripts/old_design/cgu.js diff --git a/app/assets/javascripts/default_data_block.js b/app/assets/javascripts/old_design/default_data_block.js similarity index 100% rename from app/assets/javascripts/default_data_block.js rename to app/assets/javascripts/old_design/default_data_block.js diff --git a/app/assets/javascripts/description.js b/app/assets/javascripts/old_design/description.js similarity index 100% rename from app/assets/javascripts/description.js rename to app/assets/javascripts/old_design/description.js diff --git a/app/assets/javascripts/dossier_commentaires_modal.js b/app/assets/javascripts/old_design/dossier_commentaires_modal.js similarity index 100% rename from app/assets/javascripts/dossier_commentaires_modal.js rename to app/assets/javascripts/old_design/dossier_commentaires_modal.js diff --git a/app/assets/javascripts/dossiers.js b/app/assets/javascripts/old_design/dossiers.js similarity index 100% rename from app/assets/javascripts/dossiers.js rename to app/assets/javascripts/old_design/dossiers.js diff --git a/app/assets/javascripts/dossiers_list_filter.js b/app/assets/javascripts/old_design/dossiers_list_filter.js similarity index 100% rename from app/assets/javascripts/dossiers_list_filter.js rename to app/assets/javascripts/old_design/dossiers_list_filter.js diff --git a/app/assets/javascripts/dossiers_list_link.js b/app/assets/javascripts/old_design/dossiers_list_link.js similarity index 100% rename from app/assets/javascripts/dossiers_list_link.js rename to app/assets/javascripts/old_design/dossiers_list_link.js diff --git a/app/assets/javascripts/franceconnect_kit.js b/app/assets/javascripts/old_design/franceconnect_kit.js similarity index 100% rename from app/assets/javascripts/franceconnect_kit.js rename to app/assets/javascripts/old_design/franceconnect_kit.js diff --git a/app/assets/javascripts/gestionnaire_dossier_modal.js b/app/assets/javascripts/old_design/gestionnaire_dossier_modal.js similarity index 100% rename from app/assets/javascripts/gestionnaire_dossier_modal.js rename to app/assets/javascripts/old_design/gestionnaire_dossier_modal.js diff --git a/app/assets/javascripts/new-description.js b/app/assets/javascripts/old_design/new-description.js similarity index 100% rename from app/assets/javascripts/new-description.js rename to app/assets/javascripts/old_design/new-description.js diff --git a/app/assets/javascripts/pref_list_dossier.js b/app/assets/javascripts/old_design/pref_list_dossier.js similarity index 100% rename from app/assets/javascripts/pref_list_dossier.js rename to app/assets/javascripts/old_design/pref_list_dossier.js diff --git a/app/assets/javascripts/procedure.js b/app/assets/javascripts/old_design/procedure.js similarity index 100% rename from app/assets/javascripts/procedure.js rename to app/assets/javascripts/old_design/procedure.js diff --git a/app/assets/javascripts/search.js b/app/assets/javascripts/old_design/search.js similarity index 100% rename from app/assets/javascripts/search.js rename to app/assets/javascripts/old_design/search.js diff --git a/app/assets/javascripts/start.js b/app/assets/javascripts/old_design/start.js similarity index 100% rename from app/assets/javascripts/start.js rename to app/assets/javascripts/old_design/start.js diff --git a/app/assets/javascripts/user/description.js b/app/assets/javascripts/old_design/user/description.js similarity index 100% rename from app/assets/javascripts/user/description.js rename to app/assets/javascripts/old_design/user/description.js