From 6639ef9e1cbc97697471d81f756f4cd7cbb67e5a Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Mon, 26 Aug 2019 23:33:21 +0300
Subject: [PATCH 1/6] refactor(admin-plugin): move js code from base.html #186

new: tail section for base.html
---
 site/plugins/admin/views/partials/base.html            |  8 ++------
 .../admin/views/templates/extends/snippets/index.html  | 10 ++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index db45d72c..154a5256 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -253,6 +253,8 @@
     {% include "plugins/admin/views/partials/custom-file-input.html" %}
     {% include "plugins/admin/views/partials/trumbowyg.html" %}
 
+    {% block tail %}{% endblock %}
+
     <script type="text/javascript">
             $(document).ready(function() {
 
@@ -277,12 +279,6 @@
                     $('.js-plugin-license-placeholder').html($(this).attr('data-license'));
                 });
 
-                $('.js-snippets-info').click(function () {
-                    $('#snippetsInfoModal').modal();
-                    $('.js-snippets-snippet-placeholder').html($(this).attr('data-name'));
-                    $('.js-snippets-php-placeholder').html($(this).attr('data-name'));
-                });
-
                 $('.js-entries-image-preview').click(function () {
                     $('#entriesImagePreview').modal();
                     $('.js-entry-image-preview-placeholder').css('background-image', 'url(' + $(this).attr('data-image-url') + ')');
diff --git a/site/plugins/admin/views/templates/extends/snippets/index.html b/site/plugins/admin/views/templates/extends/snippets/index.html
index 3d7cc509..2547bd59 100644
--- a/site/plugins/admin/views/templates/extends/snippets/index.html
+++ b/site/plugins/admin/views/templates/extends/snippets/index.html
@@ -86,3 +86,13 @@
   </div>
 </div>
 {% endblock %}
+
+{% block tail %}
+<script type="text/javascript">
+    $('.js-snippets-info').click(function () {
+        $('#snippetsInfoModal').modal();
+        $('.js-snippets-snippet-placeholder').html($(this).attr('data-name'));
+        $('.js-snippets-php-placeholder').html($(this).attr('data-name'));
+    });
+</script>
+{% endblock %}

From e31fbd65b682cb20c6bbe3fb8c05009d40c2413e Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Mon, 26 Aug 2019 23:40:38 +0300
Subject: [PATCH 2/6] refactor(admin-plugin): move js code from base.html #186

---
 site/plugins/admin/views/partials/base.html    | 13 -------------
 .../views/templates/extends/plugins/index.html | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index 154a5256..8ca2b286 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -266,19 +266,6 @@
                     $("#form").submit();
                 });
 
-                $('.js-plugins-info').click(function () {
-                    $('#pluginInfoModal').modal();
-                    $('.js-plugin-name-placeholder').html($(this).attr('data-name'));
-                    $('.js-plugin-version-placeholder').html($(this).attr('data-version'));
-                    $('.js-plugin-description-placeholder').html($(this).attr('data-description'));
-                    $('.js-plugin-author-name-placeholder').html($(this).attr('data-author-name'));
-                    $('.js-plugin-author-email-placeholder').html($(this).attr('data-author-email'));
-                    $('.js-plugin-author-url-placeholder').html($(this).attr('data-author-url'));
-                    $('.js-plugin-homepage-placeholder').html($(this).attr('data-homepage'));
-                    $('.js-plugin-bugs-placeholder').html($(this).attr('data-bugs'));
-                    $('.js-plugin-license-placeholder').html($(this).attr('data-license'));
-                });
-
                 $('.js-entries-image-preview').click(function () {
                     $('#entriesImagePreview').modal();
                     $('.js-entry-image-preview-placeholder').css('background-image', 'url(' + $(this).attr('data-image-url') + ')');
diff --git a/site/plugins/admin/views/templates/extends/plugins/index.html b/site/plugins/admin/views/templates/extends/plugins/index.html
index 5785ea20..ef536ec0 100644
--- a/site/plugins/admin/views/templates/extends/plugins/index.html
+++ b/site/plugins/admin/views/templates/extends/plugins/index.html
@@ -73,5 +73,21 @@
     </div>
   </div>
 </div>
-
+{% endblock %}
+
+{% block tail %}
+<script type="text/javascript">
+$('.js-plugins-info').click(function () {
+    $('#pluginInfoModal').modal();
+    $('.js-plugin-name-placeholder').html($(this).attr('data-name'));
+    $('.js-plugin-version-placeholder').html($(this).attr('data-version'));
+    $('.js-plugin-description-placeholder').html($(this).attr('data-description'));
+    $('.js-plugin-author-name-placeholder').html($(this).attr('data-author-name'));
+    $('.js-plugin-author-email-placeholder').html($(this).attr('data-author-email'));
+    $('.js-plugin-author-url-placeholder').html($(this).attr('data-author-url'));
+    $('.js-plugin-homepage-placeholder').html($(this).attr('data-homepage'));
+    $('.js-plugin-bugs-placeholder').html($(this).attr('data-bugs'));
+    $('.js-plugin-license-placeholder').html($(this).attr('data-license'));
+});
+</script>
 {% endblock %}

From 81a9559f861704b2918e49556f2d0e42517a0e15 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Mon, 26 Aug 2019 23:43:28 +0300
Subject: [PATCH 3/6] refactor(admin-plugin): move js code from base.html #186

---
 site/plugins/admin/views/partials/base.html          | 10 +---------
 .../admin/views/templates/content/entries/media.html | 12 ++++++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index 8ca2b286..c9268fb3 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -265,15 +265,7 @@
                 $('.js-save-editor-form-submit').click(function() {
                     $("#form").submit();
                 });
-
-                $('.js-entries-image-preview').click(function () {
-                    $('#entriesImagePreview').modal();
-                    $('.js-entry-image-preview-placeholder').css('background-image', 'url(' + $(this).attr('data-image-url') + ')');
-                    $('.js-entry-image-url-placeholder').val($(this).attr('data-image-url'));
-                    $('.js-media-id').attr('value', $(this).attr('data-media-id'));
-                    $('.js-entry-id').attr('value', $(this).attr('data-entry-id'));
-                });
-
+                
                 {% if is_current_path('admin.fieldsets.edit') or is_current_path('admin.templates.edit') or is_current_path('admin.snippets.edit') or (is_current_path('admin.entries.edit') and type == 'source') %}
                 var editor = CodeMirror.fromTextArea(document.getElementById("codeMirrorEditor"), {
                     lineNumbers: true,
diff --git a/site/plugins/admin/views/templates/content/entries/media.html b/site/plugins/admin/views/templates/content/entries/media.html
index b1acd89b..76fca3bc 100644
--- a/site/plugins/admin/views/templates/content/entries/media.html
+++ b/site/plugins/admin/views/templates/content/entries/media.html
@@ -72,3 +72,15 @@
   </div>
 </div>
 {% endblock %}
+
+{% block tail %}
+<script type="text/javascript">
+$('.js-entries-image-preview').click(function () {
+    $('#entriesImagePreview').modal();
+    $('.js-entry-image-preview-placeholder').css('background-image', 'url(' + $(this).attr('data-image-url') + ')');
+    $('.js-entry-image-url-placeholder').val($(this).attr('data-image-url'));
+    $('.js-media-id').attr('value', $(this).attr('data-media-id'));
+    $('.js-entry-id').attr('value', $(this).attr('data-entry-id'));
+});
+</script>
+{% endblock %}

From 070ca039d3abc98bea9225a0635751a7ff12d74a Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Mon, 26 Aug 2019 23:56:03 +0300
Subject: [PATCH 4/6] refactor(admin-plugin): remove unused js code from
 base.html #186

remove: js-settings-entry-modal
---
 site/plugins/admin/app/Controllers/EntriesController.php | 6 +++---
 site/plugins/admin/views/partials/base.html              | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index 422d9cad..ad4986fd 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -761,7 +761,7 @@ class EntriesController extends Controller
                             'save_entry' => [
                                             'link'       => 'javascript:;',
                                             'title'      => __('admin_save'),
-                                            'attributes' => ['class' => 'js-save-editor-form-submit float-right btn']
+                                            'attributes' => ['class' => 'js-save-form-submit float-right btn']
                                         ],
                         ]
                 ]
@@ -803,7 +803,7 @@ class EntriesController extends Controller
                             'save_entry' => [
                                             'link'       => 'javascript:;',
                                             'title'      => __('admin_save'),
-                                            'attributes' => ['class' => 'js-save-editor-form-submit float-right btn']
+                                            'attributes' => ['class' => 'js-save-form-submit float-right btn']
                                         ],
                         ]
                 ]
@@ -844,7 +844,7 @@ class EntriesController extends Controller
                             'save_entry' => [
                                             'link'       => 'javascript:;',
                                             'title'      => __('admin_save'),
-                                            'attributes' => ['class' => 'js-save-editor-form-submit float-right btn']
+                                            'attributes' => ['class' => 'js-save-form-submit float-right btn']
                                         ],
                         ]
                 ]
diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index c9268fb3..53e21253 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -262,10 +262,6 @@
                     $("#form").submit();
                 });
 
-                $('.js-save-editor-form-submit').click(function() {
-                    $("#form").submit();
-                });
-                
                 {% if is_current_path('admin.fieldsets.edit') or is_current_path('admin.templates.edit') or is_current_path('admin.snippets.edit') or (is_current_path('admin.entries.edit') and type == 'source') %}
                 var editor = CodeMirror.fromTextArea(document.getElementById("codeMirrorEditor"), {
                     lineNumbers: true,

From f387422f39096b12a3c6f9057ca9c90f7a3f65df Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Tue, 27 Aug 2019 00:24:49 +0300
Subject: [PATCH 5/6] refactor(admin-plugin): decouple js components from
 base.html #186

Decouple:
- codemirror

add: ability to display several codemirror editors with .js-code
---
 site/plugins/admin/views/partials/base.html   | 48 +----------------
 .../admin/views/partials/codemirror.html      | 51 +++++++++++++++++++
 .../templates/content/entries/source.html     |  2 +-
 .../templates/extends/fieldsets/edit.html     |  2 +-
 .../templates/extends/snippets/edit.html      |  2 +-
 .../extends/themes/templates/edit.html        |  2 +-
 6 files changed, 57 insertions(+), 50 deletions(-)
 create mode 100644 site/plugins/admin/views/partials/codemirror.html

diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index 53e21253..4901584f 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -252,61 +252,17 @@
     {% include "plugins/admin/views/partials/clipboard.html" %}
     {% include "plugins/admin/views/partials/custom-file-input.html" %}
     {% include "plugins/admin/views/partials/trumbowyg.html" %}
+    {% include "plugins/admin/views/partials/codemirror.html" %}
 
     {% block tail %}{% endblock %}
 
-    <script type="text/javascript">
+        <script type="text/javascript">
             $(document).ready(function() {
 
                 $('.js-save-form-submit').click(function() {
                     $("#form").submit();
                 });
 
-                {% if is_current_path('admin.fieldsets.edit') or is_current_path('admin.templates.edit') or is_current_path('admin.snippets.edit') or (is_current_path('admin.entries.edit') and type == 'source') %}
-                var editor = CodeMirror.fromTextArea(document.getElementById("codeMirrorEditor"), {
-                    lineNumbers: true,
-                    {% if is_current_path('admin.fieldsets.edit') %}
-                    indentUnit: 4,
-                    tabSize: 4,
-                    {% else %}
-                    tabSize: 4,
-                    indentUnit: 4,
-                    {% endif %}
-                    {% if is_current_path('admin.fieldsets.edit') %}
-                    mode: "text/javascript",
-                    {% else %}
-                    mode: "application/x-httpd-php",
-                    {% endif %}
-                    indentWithTabs: false,
-                    {% if registry.settings.admin_panel.theme == light %}
-                    theme: "elegant",
-                    {% elseif registry.settings.admin_panel.theme == dark %}
-                    theme: "monokai",
-                    {% endif %}
-                    styleActiveLine: true,
-                });
-
-                editor.addKeyMap({
-                    "Tab": function (cm) {
-                        if (cm.somethingSelected()) {
-                            var sel = editor.getSelection("\n");
-                            // Indent only if there are multiple lines selected, or if the selection spans a full line
-                            if (sel.length > 0 && (sel.indexOf("\n") > -1 || sel.length === cm.getLine(cm.getCursor().line).length)) {
-                                cm.indentSelection("add");
-                                return;
-                            }
-                        }
-
-                        if (cm.options.indentWithTabs)
-                            cm.execCommand("insertTab");
-                        else
-                            cm.execCommand("insertSoftTab");
-                    },
-                    "Shift-Tab": function (cm) {
-                        cm.indentSelection("subtract");
-                    }
-                });
-                {% endif %}
             });
         </script>
     </body>
diff --git a/site/plugins/admin/views/partials/codemirror.html b/site/plugins/admin/views/partials/codemirror.html
new file mode 100644
index 00000000..9fc5fd52
--- /dev/null
+++ b/site/plugins/admin/views/partials/codemirror.html
@@ -0,0 +1,51 @@
+<script type="text/javascript">
+    function qsa(sel) {
+        return Array.apply(null, document.querySelectorAll(sel));
+    }
+
+    qsa(".js-code").forEach(function (editorEl) {
+        var editor = CodeMirror.fromTextArea(editorEl, {
+            lineNumbers: true,
+            {% if is_current_path('admin.fieldsets.edit') %}
+            indentUnit: 4,
+            tabSize: 4,
+            {% else %}
+            tabSize: 4,
+            indentUnit: 4,
+            {% endif %}
+            {% if is_current_path('admin.fieldsets.edit') %}
+            mode: "text/javascript",
+            {% else %}
+            mode: "application/x-httpd-php",
+            {% endif %}
+            indentWithTabs: false,
+            {% if registry.settings.admin_panel.theme == light %}
+            theme: "elegant",
+            {% elseif registry.settings.admin_panel.theme == dark %}
+            theme: "monokai",
+            {% endif %}
+            styleActiveLine: true,
+        });
+
+        editor.addKeyMap({
+            "Tab": function (cm) {
+                if (cm.somethingSelected()) {
+                    var sel = editor.getSelection("\n");
+                    // Indent only if there are multiple lines selected, or if the selection spans a full line
+                    if (sel.length > 0 && (sel.indexOf("\n") > -1 || sel.length === cm.getLine(cm.getCursor().line).length)) {
+                        cm.indentSelection("add");
+                        return;
+                    }
+                }
+
+                if (cm.options.indentWithTabs)
+                    cm.execCommand("insertTab");
+                else
+                    cm.execCommand("insertSoftTab");
+            },
+            "Shift-Tab": function (cm) {
+                cm.indentSelection("subtract");
+            }
+        });
+    });
+</script>
diff --git a/site/plugins/admin/views/templates/content/entries/source.html b/site/plugins/admin/views/templates/content/entries/source.html
index 1ae6e564..26a913ba 100644
--- a/site/plugins/admin/views/templates/content/entries/source.html
+++ b/site/plugins/admin/views/templates/content/entries/source.html
@@ -9,7 +9,7 @@
     <div class="row">
         <div class="col-12">
             <div class="form-group">
-                <textarea id="codeMirrorEditor" style="min-height:500px;" name="data" rows="8" cols="80" class="form-control">{{ data }}</textarea>
+                <textarea style="min-height:500px;" name="data" rows="8" cols="80" class="form-control js-code">{{ data }}</textarea>
             </div>
         </div>
     </div>
diff --git a/site/plugins/admin/views/templates/extends/fieldsets/edit.html b/site/plugins/admin/views/templates/extends/fieldsets/edit.html
index a9874288..209493c2 100644
--- a/site/plugins/admin/views/templates/extends/fieldsets/edit.html
+++ b/site/plugins/admin/views/templates/extends/fieldsets/edit.html
@@ -8,7 +8,7 @@
     <div class="row">
         <div class="col-12">
             <div class="form-group">
-                <textarea id="codeMirrorEditor" style="min-height:500px;" name="data" rows="8" cols="80" class="form-control">{{ data }}</textarea>
+                <textarea style="min-height:500px;" name="data" rows="8" cols="80" class="form-control js-code">{{ data }}</textarea>
             </div>
         </div>
     </div>
diff --git a/site/plugins/admin/views/templates/extends/snippets/edit.html b/site/plugins/admin/views/templates/extends/snippets/edit.html
index 662b5021..a3241a4c 100644
--- a/site/plugins/admin/views/templates/extends/snippets/edit.html
+++ b/site/plugins/admin/views/templates/extends/snippets/edit.html
@@ -8,7 +8,7 @@
     <div class="row">
         <div class="col-12">
             <div class="form-group">
-                <textarea id="codeMirrorEditor" style="min-height:500px;" name="data" rows="8" cols="80" class="form-control">{{ data }}</textarea>
+                <textarea style="min-height:500px;" name="data" rows="8" cols="80" class="form-control js-code">{{ data }}</textarea>
             </div>
         </div>
     </div>
diff --git a/site/plugins/admin/views/templates/extends/themes/templates/edit.html b/site/plugins/admin/views/templates/extends/themes/templates/edit.html
index 48b31b05..bf7bbcab 100644
--- a/site/plugins/admin/views/templates/extends/themes/templates/edit.html
+++ b/site/plugins/admin/views/templates/extends/themes/templates/edit.html
@@ -10,7 +10,7 @@
     <div class="row">
         <div class="col-12">
             <div class="form-group">
-                <textarea id="codeMirrorEditor" style="min-height:500px;" name="data" rows="8" cols="80" class="form-control">{{ data }}</textarea>
+                <textarea style="min-height:500px;" name="data" rows="8" cols="80" class="form-control js-code">{{ data }}</textarea>
             </div>
         </div>
     </div>

From 3d1f918ed9011683217922e3c041584be21284e7 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Tue, 27 Aug 2019 00:27:05 +0300
Subject: [PATCH 6/6] refactor(admin-plugin): decouple js components from
 base.html #186

Decouple:
- forms-save
---
 site/plugins/admin/views/partials/base.html       | 11 +----------
 site/plugins/admin/views/partials/forms-save.html |  5 +++++
 2 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 site/plugins/admin/views/partials/forms-save.html

diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index 4901584f..754864dd 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -253,17 +253,8 @@
     {% include "plugins/admin/views/partials/custom-file-input.html" %}
     {% include "plugins/admin/views/partials/trumbowyg.html" %}
     {% include "plugins/admin/views/partials/codemirror.html" %}
+    {% include "plugins/admin/views/partials/forms-save.html" %}
 
     {% block tail %}{% endblock %}
-
-        <script type="text/javascript">
-            $(document).ready(function() {
-
-                $('.js-save-form-submit').click(function() {
-                    $("#form").submit();
-                });
-
-            });
-        </script>
     </body>
 </html>
diff --git a/site/plugins/admin/views/partials/forms-save.html b/site/plugins/admin/views/partials/forms-save.html
new file mode 100644
index 00000000..12c8f9fc
--- /dev/null
+++ b/site/plugins/admin/views/partials/forms-save.html
@@ -0,0 +1,5 @@
+<script type="text/javascript">
+    $('.js-save-form-submit').click(function() {
+        $("#form").submit();
+    });
+</script>