Merge pull request #89 from funktechno/dev

wiki menu fix
funktechno · Jul 24, 2024 · 9cc54e2 · 9cc54e2
2 parents 1e36157 + 8eb0094
commit 9cc54e2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/Asset/Javascript/main.js b/Asset/Javascript/main.js
@@ -0,0 +1,16 @@
+
+KB.on('dom.ready', function () {
+    function goToLink(selector) {
+        if (!KB.modal.isOpen()) {
+            let element = KB.find(selector);
+
+            if (element !== null) {
+                window.location = element.attr('href');
+            }
+        }
+    }
+
+    KB.onKey('v+w', function () {
+        goToLink('a.view-wiki');
+    });
+});
diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js
@@ -20,7 +20,7 @@ jQuery(document).ready(function () {
             }
 
             // console.log("request", request)
-            
+
 
             $.ajax({
                     cache: false,
@@ -49,20 +49,3 @@ jQuery(document).ready(function () {
         })
     }
 });
-
-KB.on('dom.ready', function () {
-    function goToLink(selector) {
-        if (!KB.modal.isOpen()) {
-            let element = KB.find(selector);
-
-            if (element !== null) {
-                window.location = element.attr('href');
-            }
-        }
-    }
-
-    KB.onKey('v+w', function () {
-        goToLink('a.view-wiki');
-    });
-});
-
diff --git a/Plugin.php b/Plugin.php
@@ -43,14 +43,15 @@ public function initialize()
 
         $this->template->hook->attach('template:header:dropdown', 'wiki:header/dropdown');
         $this->template->hook->attach('template:project-header:view-switcher', 'Wiki:project_header/views');
-        
+
         $this->template->setTemplateOverride('board/view_public', 'wiki:board/view_public');
-        
+
         $this->template->setTemplateOverride('file_viewer/show', 'wiki:file_viewer/show');
 
         $this->hook->on('template:layout:css', array('template' => 'plugins/Wiki/Asset/css/wiki.css'));
         // $this->hook->on('template:layout:js', array('template' => 'plugins/Wiki/Asset/vendor/jquery-sortable/jquery-sortable.js'));
         // $this->hook->on('template:layout:js', array('template' => 'plugins/Wiki/Asset/Javascript/wiki.js'));
+        $this->hook->on('template:layout:js', array('template' => 'plugins/Wiki/Asset/Javascript/main.js'));
 
 
         // $this->template->setTemplateOverride('wiki', 'wiki:wiki/layout');
@@ -59,7 +60,7 @@ public function initialize()
         // $this->helper->register('wiki', '\Kanboard\Plugin\Wiki\Helper\layout');
 
         $this->helper->register('wikiHelper', '\Kanboard\Plugin\Wiki\Helper\WikiHelper');
-        
+
 
     }