Attachment 107268 Details for Bug 22660 – Bug 22660: (follow-up) Improve asset handling, add linting

[patch] Bug 22660: (follow-up) Improve asset handling, add linting

Bug-22660-follow-up-Improve-asset-handling-add-lin.patch (text/plain), 6.00 KB, created by Owen Leonard on 2020-07-23 18:15:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-07-23 18:15:31 UTC

Size: 6.00 KB

patch

obsolete

>From 73fb6963091f08c22a2100ca6776c16bb39ea9fa Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 23 Jul 2020 17:58:22 +0000
>Subject: [PATCH] Bug 22660: (follow-up) Improve asset handling, add linting
>
>This patch makes some changes to the way assets are included based on
>the value of the system preferece in order to minimize unnecessary
>JavaScript includes.
>
>The patch also adds HTML syntax-highlighting and linting like we have in
>the system preferences editor.
>
>Removed are two JS files which were not required.
>
>To test, apply the patch and set the NewsToolEditor preference to
>"CodeMirror."
>
> - Edit a news item and confirm that the contents of the
>   editor show HTML syntax highlighting.
> - Test HTML linting by adding some malformed HTML (missing closing tag,
>   for instance). The error should be highlighted.
> - Set the NewsToolEditor to "TinyMCE" and confirm that WYSIWYG editing
>   still works correctly.
>---
> .../prog/en/modules/tools/koha-news.tt             | 87 +++++++++++++---------
> 1 file changed, 50 insertions(+), 37 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>index 80d6d68dff..8c66ff08cc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>@@ -1,19 +1,23 @@
> [% USE raw %]
> [% USE Asset %]
>+[% USE Koha %]
> [% USE KohaDates %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-[% Asset.css("lib/codemirror/codemirror.css") | $raw %]
>-<style>
>-.CodeMirror {
>-    resize: vertical;
>-}
>-</style>
> <title>Koha &rsaquo; Tools &rsaquo; News</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% IF ( opac_news_count ) %]
> [% END %]
>+[% IF Koha.Preference('NewsToolEditor') == 'codemirror' %]
>+    [% Asset.css("lib/codemirror/codemirror.css") | $raw %]
>+    [% Asset.css("lib/codemirror/lint.min.css") | $raw %]
>+    <style>
>+        .CodeMirror {
>+            resize: vertical;
>+        }
>+    </style>
>+[% END %]
> </head>
> 
> <body id="tools_koha-news" class="tools">
>@@ -208,12 +212,12 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
>                 </div> 
>             [% END %]
>         </div> 
>+    </div> 
>+
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'calendar.inc' %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>-    [% Asset.js("lib/d3c3/d3.min.js") | $raw %]
>-    [% Asset.js("lib/d3c3/c3.min.js") | $raw %]
>     [% IF ( opac_news_count ) %]
>         [% INCLUDE 'datatables.inc' %]
>         <script>
>@@ -300,35 +304,44 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
>             });
>         </script>
>     [% END %]
>-    [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
>-    [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %]
>-    [% INCLUDE 'str/tinymce_i18n.inc' %]
>-    <script>
>-        [% IF Koha.Preference('NewsToolEditor') == 'codemirror' %]
>-        var editor = CodeMirror.fromTextArea(document.getElementById('content'), {
>-            lineNumbers: true,
>-            mode: "text/html",
>-            lineWrapping: true
>-        });
>-        [% ELSE %]
>-        tinyMCE.init({
>-            verify_html: false,
>-            force_br_newlines : false,
>-            force_p_newlines : false,
>-            forced_root_block : '',
>-            branding : false,
>-            relative_urls : false,
>-            content_css : "[% interface | html %]/[% theme | html %]/css/tinymce.css",
>-            menubar : "file edit view insert format tools table",
>-            mode : "specific_textareas",
>-            plugins : "autoresize table hr link image charmap lists code emoticons",
>-            toolbar : [
>-                "formatselect | bold italic | cut copy paste | alignleft aligncenter alignright | outdent indent | image link unlink anchor cleanup hr",
>-                "table | bullist numlist | undo redo | removeformat | emoticons charmap | forecolor backcolor | code visualaid help"
>-            ],
>-        });
>-        [% END %]
>-    </script>
>+    [% IF Koha.Preference('NewsToolEditor') == 'codemirror' %]
>+        [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
>+        [% Asset.js( "lib/codemirror/xml.min.js" ) | $raw %]
>+        [% Asset.js( "lib/codemirror/lint.min.js" ) | $raw %]
>+        [% Asset.js( "lib/linters/htmlhint.min.js" ) | $raw %]
>+        [% Asset.js( "lib/codemirror/html-lint.min.js" ) | $raw %]
>+        <script>
>+            var editor = CodeMirror.fromTextArea(document.getElementById('content'), {
>+                lineNumbers: true,
>+                lineWrapping: true,
>+                lint: true,
>+                mode: "text/html",
>+                gutters: ["CodeMirror-lint-markers"],
>+                viewportMargin: Infinity,
>+            });
>+        </script>
>+    [% ELSE %]
>+        <script>
>+            [% INCLUDE 'str/tinymce_i18n.inc' %]
>+            [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %]
>+            tinyMCE.init({
>+                verify_html: false,
>+                force_br_newlines : false,
>+                force_p_newlines : false,
>+                forced_root_block : '',
>+                branding : false,
>+                relative_urls : false,
>+                content_css : "[% interface | html %]/[% theme | html %]/css/tinymce.css",
>+                menubar : "file edit view insert format tools table",
>+                mode : "specific_textareas",
>+                plugins : "autoresize table hr link image charmap lists code emoticons",
>+                toolbar : [
>+                    "formatselect | bold italic | cut copy paste | alignleft aligncenter alignright | outdent indent | image link unlink anchor cleanup hr",
>+                    "table | bullist numlist | undo redo | removeformat | emoticons charmap | forecolor backcolor | code visualaid help"
>+                ],
>+            });
>+        </script>
>+    [% END # /IF NewsToolEditor %]
> [% END %]
> 
> [% BLOCK lang_locations %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 22660: 104624 | 104948 | 104951 | 105129 | 105158 | 107267 | 107268 | 107269 | 107270 | 107361 | 107362 | 107363 | 107554 | 107555 | 107556 | 107557 | 107592