Merge branch 'develop'

weDevsOfficial · Oct 10, 2024 · bbbc6e9 · bbbc6e9
2 parents ac7757a + dc27e26
commit bbbc6e9
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 8 deletions.
diff --git a/assets/js/frontend.js b/assets/js/frontend.js
@@ -411,9 +411,10 @@
 
   $( function () {
     // Handle hash router.
-    if ( window.location.hash ) {
-      window.location = window.location.pathname;
-    }
+      // This is commented out because it causes the page to reload when the hash is present.
+    // if ( window.location.hash ) {
+    //   window.location = window.location.pathname;
+    // }
 
     // Handle navigation caret.
     if ( ! anchestorItem?.classList.contains( 'wd-state-open' ) ) {

diff --git a/includes/Admin.php b/includes/Admin.php
@@ -18,8 +18,26 @@ public function __construct() {
         new Admin\Docs_List_Table();
 
         add_action( 'admin_init', array( $this, 'init_admin_actions' ), 5 );
+
+        // Redirect to a new design after trashing a doc
+        add_action('load-edit.php', array($this, 'trashed_docs_redirect'));
     }
 
+    /**
+     * Redirect to a new design after trashing a doc.
+     *
+     * @return void
+     */
+    public function trashed_docs_redirect() {
+    $screen = get_current_screen();
+    if ($screen->id === 'edit-docs') {
+        if (isset($_GET['trashed']) && intval(sanitize_text_field($_GET['trashed'])) > 0) {
+            wp_redirect(admin_url('admin.php?page=wedocs#'));
+            exit();
+        }
+    }
+}
+
     /**
      * Admin initialization hook.
      *

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weDocs",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "A documentation plugin for WordPress",
   "author": "Tareq Hasan",
   "license": "GPL",

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Tags: WordPress documentation plugin, WordPress docs plugin, Documentation, Know
 Requires at least: 5.6
 Tested up to: 6.5.3
 Requires PHP: 7.4
-Stable tag: 2.1.7
+Stable tag: 2.1.8
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Discover weDocs, the ultimate WordPress documentation plugin. Easily create, manage, and organize content with seamless integration and a user-friendly interface.
@@ -237,6 +237,11 @@ Can’t wait to join us?
 
 == Changelog ==
 
+= v2.1.8 (10th Oct, 2024) =
+
+* 🛠️ [FIX] Redirect to a new design after trashing a doc.
+* 🛠️ [FIX] Handle hash router issue for the documentation page.
+
 = v2.1.7 (22th Aug, 2024) =
 
 * **Fix:** Move To Trash option not available for users with the Editor role.

diff --git a/webpack.config.js b/webpack.config.js
@@ -45,7 +45,7 @@ if ( ! isProduction ) {
       writeToDisk: true,
     },
     allowedHosts: 'all',
-    host: 'localhost',
+    host: 'wedocs.test',
     port: 8886,
     proxy: {
       '/assets/build': {

diff --git a/wedocs.php b/wedocs.php
@@ -3,7 +3,7 @@
 Plugin Name: weDocs
 Plugin URI: https://wedocs.co/
 Description: A documentation plugin for WordPress
-Version: 2.1.7
+Version: 2.1.8
 Author: weDevs
 Author URI: https://wedocs.co/?utm_source=wporg&utm_medium=banner&utm_campaign=author-uri
 License: GPL2
@@ -59,7 +59,7 @@ final class WeDocs {
      *
      * @var string
      */
-    const VERSION = '2.1.7';
+    const VERSION = '2.1.8';
 
     /**
      * The plugin url.