Merge pull request #5421 from nanasess/fix-backdrop

[4.2]モーダルの背景をクリックするとモーダルが消えてしまうのを修正
EC-CUBE · Jul 11, 2022 · 3c6c26a · 3c6c26a
2 parents 58a0516 + 308f759
commit 3c6c26a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/src/Eccube/Resource/template/admin/Order/index.twig b/src/Eccube/Resource/template/admin/Order/index.twig
@@ -612,7 +612,7 @@ file that was distributed with this source code.
  {% endif %}
 
  <!-- 出荷済にする確認モーダル -->
- <div class="modal fade" id="sentUpdateModal" tabindex="-1" role="dialog" aria-labelledby="sentUpdateModal" aria-hidden="true" data-keyboard="false" data-backdrop="static">
+ <div class="modal fade" id="sentUpdateModal" tabindex="-1" role="dialog" aria-labelledby="sentUpdateModal" aria-hidden="true" data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog modal-lg" role="document">
  <div class="modal-content">
  <div class="modal-header">
@@ -651,7 +651,7 @@ file that was distributed with this source code.
  </div>
 
  <!-- 一括削除の確認モーダル -->
- <div class="modal fade" id="bulkDeleteModal" tabindex="-1" role="dialog" aria-labelledby="discontinuance" aria-hidden="true" data-keyboard="false" data-backdrop="static">
+ <div class="modal fade" id="bulkDeleteModal" tabindex="-1" role="dialog" aria-labelledby="discontinuance" aria-hidden="true" data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog" role="document">
  <div class="modal-content">
  <div class="modal-header">

diff --git a/src/Eccube/Resource/template/admin/Order/shipping.twig b/src/Eccube/Resource/template/admin/Order/shipping.twig
@@ -187,7 +187,7 @@ file that was distributed with this source code.
  </div>
  </div>
  <!-- 出荷済にするモーダル / 出荷メール送信モーダル -->
- <div class="modal fade" id="sentUpdateModal" tabindex="-1" role="dialog" aria-labelledby="sentUpdateModal" aria-hidden="true" data-keyboard="false" data-backdrop="static">
+ <div class="modal fade" id="sentUpdateModal" tabindex="-1" role="dialog" aria-labelledby="sentUpdateModal" aria-hidden="true" data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog modal-lg" role="document">
  <div class="modal-content">
  <div class="modal-header">

diff --git a/src/Eccube/Resource/template/admin/Product/csv_product.twig b/src/Eccube/Resource/template/admin/Product/csv_product.twig
@@ -254,7 +254,7 @@ file that was distributed with this source code.
  </div>
  </div>
  </div>
- <div class="modal fade" id="importCsvModal" tabindex="-1" role="dialog" aria-labelledby="importCsvModal" aria-hidden="true" data-keyboard="false" data-backdrop="static">
+ <div class="modal fade" id="importCsvModal" tabindex="-1" role="dialog" aria-labelledby="importCsvModal" aria-hidden="true" data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog" role="document">
  <div class="modal-content">
  <div class="modal-header">

diff --git a/src/Eccube/Resource/template/admin/Product/index.twig b/src/Eccube/Resource/template/admin/Product/index.twig
@@ -469,7 +469,7 @@ file that was distributed with this source code.
  </div>
 
  <!-- 完全に削除の確認モーダル-->
- <div class="modal fade" id="bulkDeleteModal" tabindex="-1" role="dialog" aria-labelledby="discontinuance" aria-hidden="true" data-keyboard="false" data-backdrop="static">
+ <div class="modal fade" id="bulkDeleteModal" tabindex="-1" role="dialog" aria-labelledby="discontinuance" aria-hidden="true" data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog" role="document">
  <div class="modal-content">
  <div class="modal-header">

diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/mail.twig b/src/Eccube/Resource/template/admin/Setting/Shop/mail.twig
@@ -228,7 +228,7 @@ file that was distributed with this source code.
  </form>
 
  <!-- HTMLメールを確認するモーダル -->
- <div class="modal fade" id="htmlPreviewModal" tabindex="-1" role="dialog" aria-labelledby="htmlPreviewModal" aria-hidden="true" data-keyboard="false" data-backdrop="static">
+ <div class="modal fade" id="htmlPreviewModal" tabindex="-1" role="dialog" aria-labelledby="htmlPreviewModal" aria-hidden="true" data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog modal-lg" role="document">
  <div class="modal-content">
  <div class="modal-header">

diff --git a/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig b/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig
@@ -229,7 +229,7 @@ $(function() {
  </div>
  </div>
 
- <div id="installModal" class="modal" tabindex="-1" role="dialog" data-keyboard="false" data-backdrop="static">
+ <div id="installModal" class="modal" tabindex="-1" role="dialog" data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog" role="document">
  <div class="modal-content">
  <div class="modal-header">
@@ -258,4 +258,4 @@ $(function() {
  </div>
  </div>
  </div>
-{% endblock %}
+{% endblock %}
diff --git a/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig b/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig
@@ -176,7 +176,7 @@ $(function() {
 
 <div class="modal fade" id="officialPluginDeleteModal" tabindex="-1" role="dialog"
  aria-labelledby="officialPluginDeleteModal" aria-hidden="true"
- data-keyboard="false" data-backdrop="static">
+ data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog" role="document">
  <div class="modal-content">
  <div class="modal-header">

diff --git a/src/Eccube/Resource/template/install/complete.twig b/src/Eccube/Resource/template/install/complete.twig
@@ -135,7 +135,7 @@ file that was distributed with this source code.
 </div>
 <div class="modal fade" id="PluginProgressModal" tabindex="-1" role="dialog"
  aria-labelledby="PluginProgressModal" aria-hidden="true"
- data-keyboard="false" data-backdrop="static">
+ data-bs-keyboard="false" data-bs-backdrop="static">
  <div class="modal-dialog" role="document">
  <div class="modal-content">
  <div class="modal-header">