Merge branch 'b-7.1.x-OEVE-190-default-protocol-option-for-links' int…

…o b-7.1.x
OXID-eSales · Dec 27, 2023 · 61240e2 · 61240e2
2 parents 4826d46 + fd3fdfa
commit 61240e2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/assets/out/src/js/ddoesummernote.min.js b/assets/out/src/js/ddoesummernote.min.js
diff --git a/assets/out/src/js/ddoesummernote.min.js.map b/assets/out/src/js/ddoesummernote.min.js.map
diff --git a/assets/out/src/js/lang/summernote-de.min.js b/assets/out/src/js/lang/summernote-de.min.js
diff --git a/assets/out/src/js/lang/summernote-de.min.js.map b/assets/out/src/js/lang/summernote-de.min.js.map
diff --git a/build/grunt/uglify.js b/build/grunt/uglify.js
@@ -18,25 +18,20 @@ module.exports = {
                 "build/vendor/summernote/plugin/ddmedia.summernote.js",
                 "build/vendor/summernote/plugin/summernote.js",
                 "build/js/plugins/summernote-video-responsive/summernote-video-responsive.js",
-                "build/js/plugins/summernote-lang-extends/summernote-de-DE.js",
                 "build/js/plugins/summernote-lang-extends/summernote-en-US.js",
                 "build/js/summernote.js"
             ],
+            "assets/out/src/js/lang/summernote-de.min.js": [
+                "build/vendor/summernote/dist/lang/summernote-de-DE.js",
+                "build/js/plugins/summernote-lang-extends/summernote-de-DE.js"
+            ],
             "assets/out/src/js/backend.min.js": [
                 "build/js/backend.js"
             ]
 
         }
     },
 
-    wysiwyglang: {
-
-        files: {
-            "assets/out/src/js/lang/summernote-de.min.js": "build/vendor/summernote/dist/lang/summernote-de-DE.js"
-        }
-
-    },
-
     bootstrap: {
         files: {
             "assets/out/src/js/bootstrap.min.js": [

diff --git a/views/twig/ddoewysiwyg.html.twig b/views/twig/ddoewysiwyg.html.twig
@@ -68,5 +68,5 @@
 {{ script({ include: oViewConf.getModuleUrl('ddoewysiwyg', 'out/src/js/backend.min.js'), priority: 1, dynamic: __oxid_include_dynamic }) }}
 
 {% if langabbr == 'de' %}
-    <script type="text/javascript" src="{{ oViewConf.getModuleUrl('ddoewysiwyg','out/src/js/lang/summernote-de.min.js') }}"></script>
+    {{ script({ include: oViewConf.getModuleUrl('ddoewysiwyg', 'out/src/js/lang/summernote-de.min.js'), priority: 1, dynamic: __oxid_include_dynamic }) }}
 {% endif %}