Merge branch 'release/2.1.6'

Author: w00fz

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.1.6
+## 03/22/2023
+
+1. [](#bugfix)
+   * Fixed NextGen integration where cog icon settings would not work properly
+   
 # v2.1.5
 ## 03/28/2022
 
@@ -63,13 +69,13 @@
 1. [](#bugfix)
    * NextGen Editor: Fixed Page Inject UI links missing the base_root [getgrav/grav-premium-issues#30](https://github.com/getgrav/grav-premium-issues/issues/30)
    * NextGen Editor: Moved list of available templates to input text to support partials and any twig template [getgrav/grav-premium-issues#24](https://github.com/getgrav/grav-premium-issues/issues/24)
-   
+
 # v1.4.3
 ## 01/15/2021
 
 1. [](#improved)
    * NextGen Editor: Updated upcast/downcast syntax to support latest version
-  
+
 # v1.4.2
 ## 12/20/2020
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Page Inject
 type: plugin
 slug: page-inject
-version: 2.1.5
+version: 2.1.6
 description: "**Page Inject** is a powerful plugin that lets you inject entire pages or page content into other pages using simple markdown-style or shortcode syntax"
 icon: trello
 author:

nextgen-editor/plugins/page-inject/page-inject.js

@@ -44,7 +44,7 @@ function uncollapse(input) {
   innerHTML +=   `<span class="pi-type">${itemTypes[attributes.type] || ''}</span>`;
   innerHTML +=   `<span class="pi-title">${attributes.title || ''}</span>`;
   innerHTML +=   `<a_reserved target="_blank" class="pi-route" href="${GravAdmin?.config?.base_url_simple || ''}${attributes.route || ''}">${attributes.route || ''}</a_reserved>`;
-  innerHTML +=   '<svg class="pi-route-settings" viewBox="0 0 24 24" fill="currentColor" stroke="none" onclick="pageInjectRouteSettings.call(this)">';
+  innerHTML +=   '<svg class="pi-route-settings" viewBox="0 0 24 24" fill="currentColor" stroke="none">';
   innerHTML +=     '<path d="M9 4.58V4c0-1.1.9-2 2-2h2a2 2 0 0 1 2 2v.58a8 8 0 0 1 1.92 1.11l.5-.29a2 2 0 0 1 2.74.73l1 1.74a2 2 0 0 1-.73 2.73l-.5.29a8.06 8.06 0 0 1 0 2.22l.5.3a2 2 0 0 1 .73 2.72l-1 1.74a2 2 0 0 1-2.73.73l-.5-.3A8 8 0 0 1 15 19.43V20a2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2v-.58a8 8 0 0 1-1.92-1.11l-.5.29a2 2 0 0 1-2.74-.73l-1-1.74a2 2 0 0 1 .73-2.73l.5-.29a8.06 8.06 0 0 1 0-2.22l-.5-.3a2 2 0 0 1-.73-2.72l1-1.74a2 2 0 0 1 2.73-.73l.5.3A8 8 0 0 1 9 4.57zM7.88 7.64l-.54.51-1.77-1.02-1 1.74 1.76 1.01-.17.73a6.02 6.02 0 0 0 0 2.78l.17.73-1.76 1.01 1 1.74 1.77-1.02.54.51a6 6 0 0 0 2.4 1.4l.72.2V20h2v-2.04l.71-.2a6 6 0 0 0 2.41-1.4l.54-.51 1.77 1.02 1-1.74-1.76-1.01.17-.73a6.02 6.02 0 0 0 0-2.78l-.17-.73 1.76-1.01-1-1.74-1.77 1.02-.54-.51a6 6 0 0 0-2.4-1.4l-.72-.2V4h-2v2.04l-.71.2a6 6 0 0 0-2.41 1.4zM12 16a4 4 0 1 1 0-8 4 4 0 0 1 0 8zm0-2a2 2 0 1 0 0-4 2 2 0 0 0 0 4z"></path>';
   innerHTML +=   '</svg>';
 
@@ -60,7 +60,7 @@ function uncollapse(input) {
 
   innerHTML += '</span>';
   innerHTML += '<span class="pi-settings">';
-  innerHTML +=   '<svg viewBox="0 0 24 24" fill="currentColor" stroke="none" onclick="pageInjectSettings.call(this)">';
+  innerHTML +=   '<svg viewBox="0 0 24 24" fill="currentColor" stroke="none">';
   innerHTML +=     '<path d="M9 4.58V4c0-1.1.9-2 2-2h2a2 2 0 0 1 2 2v.58a8 8 0 0 1 1.92 1.11l.5-.29a2 2 0 0 1 2.74.73l1 1.74a2 2 0 0 1-.73 2.73l-.5.29a8.06 8.06 0 0 1 0 2.22l.5.3a2 2 0 0 1 .73 2.72l-1 1.74a2 2 0 0 1-2.73.73l-.5-.3A8 8 0 0 1 15 19.43V20a2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2v-.58a8 8 0 0 1-1.92-1.11l-.5.29a2 2 0 0 1-2.74-.73l-1-1.74a2 2 0 0 1 .73-2.73l.5-.29a8.06 8.06 0 0 1 0-2.22l-.5-.3a2 2 0 0 1-.73-2.72l1-1.74a2 2 0 0 1 2.73-.73l.5.3A8 8 0 0 1 9 4.57zM7.88 7.64l-.54.51-1.77-1.02-1 1.74 1.76 1.01-.17.73a6.02 6.02 0 0 0 0 2.78l.17.73-1.76 1.01 1 1.74 1.77-1.02.54.51a6 6 0 0 0 2.4 1.4l.72.2V20h2v-2.04l.71-.2a6 6 0 0 0 2.41-1.4l.54-.51 1.77 1.02 1-1.74-1.76-1.01.17-.73a6.02 6.02 0 0 0 0-2.78l-.17-.73 1.76-1.01-1-1.74-1.77 1.02-.54-.51a6 6 0 0 0-2.4-1.4l-.72-.2V4h-2v2.04l-.71.2a6 6 0 0 0-2.41 1.4zM12 16a4 4 0 1 1 0-8 4 4 0 0 1 0 8zm0-2a2 2 0 1 0 0-4 2 2 0 0 0 0 4z"></path>';
   innerHTML +=   '</span>';
   innerHTML += '</span>';
@@ -320,4 +320,18 @@ window.pageInjectSettings = function pageInjectSettings() {
   }
 };
 
+document.addEventListener('click', (event) => {
+  const target = event.target;
+
+  if (target.classList.contains('pi-route-settings') || target.closest('.pi-route-settings')) {
+    event.preventDefault();
+    window.pageInjectRouteSettings.call(target);
+  }
+
+  if (target.classList.contains('pi-settings') || target.closest('.pi-settings')) {
+    event.preventDefault();
+    window.pageInjectSettings.call(target)
+  }
+});
+
 })();