Changeset 2628264

Timestamp:

11/11/2021 07:47:43 PM (4 years ago)

Author:

paulswarthout

Message:

Bug fixes, code clean-up, testing with the latest version of WordPress 5.8.2.

Location:

child-themes-helper/trunk

Files:

• child-themes-helper.php (modified) (3 diffs)
• classes/class_childThemesHelper.php (modified) (2 diffs)
• css/style.css (modified) (1 diff)
• js/class-my-spinner.js (modified) (1 diff)
• js/edit_file.js (modified) (4 diffs)
• js/js_common_fn.js (modified) (6 diffs)
• js/menu.js (modified) (8 diffs)
• js/pasChildThemes.js (modified) (5 diffs)
• js/tabs.js (modified) (1 diff)
• readme.txt (modified) (5 diffs)

child-themes-helper/trunk/child-themes-helper.php

@@ -2 +2 @@
 /*
     Plugin Name: Child Themes Helper
-    Plugin URI: http://www.paulswarthout.com/Child-Themes-Helper/
+    Plugin URI: https://www.paulswarthout.com/Child-Themes-Helper/
     Description: Tool to aid the child theme developer. Copies files from the parent theme to the child theme, duplicating the folder structure in the child theme. Directly edit the child theme's files. Create a new child theme from any template theme.
-    Version: 2.2.2
+    Version: 2.2.4
     Author: Paul A. Swarthout
-    Author URI: http://www.PaulSwarthout.com
+    Author URI: https://www.PaulSwarthout.com
     License: GPL2
     License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -158 +158 @@
 if (defined("DEMO_CAPABILITY")) { add_action( 'init',   'pas_cth_no_profile_access' ); }
 
-add_action( 'wp_footer','pas_cth_flushBuffer' );        // Response Buffering
+add_action( 'wp_footer', __NAMESPACE__ . '\pas_cth_flushBuffer' );      // Response Buffering
 
 /* AJAX PHP functions may be found in the 'classes/class_ajax_functions.php' file
@@ -229 +229 @@
 }
 
-register_deactivation_hook( __FILE__, 'pas_cth_deactivate' );//Plugin Deactivation
+register_deactivation_hook( __FILE__, __NAMESPACE__ . '\pas_cth_deactivate' );//Plugin Deactivation
 
 

child-themes-helper/trunk/classes/class_childThemesHelper.php

@@ -288 +288 @@
 The Child Theme Helper plugin was created because I, the developer of {$abbr} would invariably screw it up and my child theme would not work and I would spend hours trying to figure out why.
 <br><br>
-<h3>The Child Themes Helper plugin has 4 areas of primary functionality.</h3> For more information on each of these, review the information at the top of each tab.
+<h3>The Child Themes Helper plugin has 4 areas of primary functionality.</h3> For more information on each of these, review the information at the top of eachBookWriter.tab.
 <ol>
     <li>Create a new child theme from any of the template themes installed on your website. {$abbr} requires the child theme to exist before you can copy files to it.</li>
@@ -304 +304 @@
 This selection <u>does not</u> change which theme is activated. It only specifies to {$abbr} which child/parent theme that it should manipulate.
 <br><br>
-Once selected, the page will reload and you will be on the Copy/Edit Theme Files tab.
+Once selected, the page will reload and you will be on the Copy/Edit Theme FilesBookWriter.tab.
 
 

child-themes-helper/trunk/css/style.css

@@ -49 +49 @@
   padding: 20px;
   text-align: left;
+  margin-bottom:50px;
 }
 .pas-grid-item-child {

child-themes-helper/trunk/js/class-my-spinner.js

@@ -5 +5 @@
     }
     wait_cursor() {
-        debugger
         var spinner;
         var self = this;
         if (this.wait_cursor_count == 0) {
             spinner = this.showSpinner();
-            spinner.onclick = function () { toc_common.default_cursor(); self.wait_cursor_count = 0; }
+            spinner.onclick = function () { self.self.default_cursor(); self.wait_cursor_count = 0; }
         }
         this.wait_cursor_count++;

child-themes-helper/trunk/js/edit_file.js

@@ -72 +72 @@
 }
 function pas_cth_js_editFile(event) {
+    pas_cth_spinner.wait_cursor();
+
     var element = document.getElementById(event.srcElement.dataset.elementid);
     var dataBlock = {};
@@ -86 +88 @@
             "</div>";
         pas_cth_js_createBox("invalidFileTypeMessage", "", document.getElementsByTagName("body")[0], true).innerHTML += msg;
+        pas_cth_spinner.default_cursor();
         return;
     }
@@ -253 +256 @@
     var fileContents = "";
     var dataBlock = {};
+    
+    pas_cth_spinner.wait_cursor();
+
     fileContents = ee.editBox.innerText; // .replace(/&lt;/g, "<").replace(/&gt;/g, ">");
 
@@ -263 +269 @@
     pas_cth_js_closeEditFile(); // Closing only clears the div and hides it. Not destroyed.
     var successCallback = function (response) {
+
         if (response.length) {
             pas_cth_js_processResponse(response);
             pas_cth_js_hideWait();
         }
+        pas_cth_spinner.default_cursor();
     }
     pas_cth_js_AJAXCall('saveFile', dataBlock, successCallback, pas_cth_js_failureCallback);

child-themes-helper/trunk/js/js_common_fn.js

@@ -15 +15 @@
     String.prototype.left = function(n) { return this.substring(0, n); }
 }
-
 function pas_cth_DOMFunctions() {
     var self = this;
@@ -26 +25 @@
             e = element;
         }
-
         if (e.parentNode != null) {
             e.parentNode.removeChild(e);
@@ -46 +44 @@
         box = document.createElement("DIV");
         box.id = id;
-
         parent.appendChild(box);
         return box;
@@ -61 +58 @@
         if (element == null) { return null; }
         var rect = element.getBoundingClientRect();
-
         return {left : rect.left, top: rect.top, width : Math.abs(rect.right - rect.left), height : Math.abs(rect.bottom - rect.top), 'element' : element };
     }
@@ -73 +69 @@
     this.searchTree = function (rootElement, tree, pointElement) {
         var found = false;
-
         if (rootElement == pointElement) {
             return true;
@@ -86 +81 @@
 
 var mousePosition = {x:0, y:0, element:null};
-
 var pas_cth_library = new pas_cth_DOMFunctions();
 
-
 window.addEventListener("mousemove", function (e) {
-
     mousePosition.x = e.clientX;
-
     mousePosition.y = e.clientY;
-
 });
 
 function pas_cth_js_AJAXCall(action, dataBlock = [], callback = null, error_callback = null) {
-
     var xmlhttp = new XMLHttpRequest();
-
     var data    = new FormData();
-
-
-
     data.append("action", action);
-
-
-
     if (dataBlock != null) {
-
         Object.keys(dataBlock).forEach(function(key) {
-
             if (key != "action") {
- data.append(key, dataBlock[key]);
- }
+                data.append(key, dataBlock[key]);
+            }
         });
-
-    }
-
+    }
     xmlhttp.open("POST", ajaxurl, true);
-
     xmlhttp.onreadystatechange = function () {
-
         if (4 == xmlhttp.readyState) {
-
             // The next line strips the admin_ajax.php 1 byte response from the beginning of the response.
-
             // Usually, admin_ajax.php returns a zero. This strips that.
-
             var response = (xmlhttp.responseText.length >= 1 ? xmlhttp.responseText.left(xmlhttp.responseText.length - 1) : "");
-
             if (xmlhttp.status == 200) {
-
                 if (callback != null) {
-
                     callback(response);
-
                 }
-
             } else {
-
                 if (error_callback != null) {
-
                     error_callback(xmlhttp.statusText, response);
-
                 } else {
-
                     alert("AJAX Error:\n\n" + xmlhttp.statusText + "\n\n" + response);
-
                 }
-
             }
-
-        }
-
-    }
-
+        }
+    }
     xmlhttp.send(data);
-
-}
-
+}
 if (document.getElementById("childGrid") != null && document.getElementById("parentGrid") != null) {
-
     window.addEventListener("resize", function (e) {
         var childGrid = document.getElementById("childGrid")
-
         var parentGrid = document.getElementById("parentGrid")
-
-
-
         // Clears inline styles
-
         if (childGrid != null) {
-
             childGrid.style = "";
-
-        }
-
+        }
         if (parentGrid != null) {
-
             parentGrid.style = "";
-
-        }
-
-    }
-);
+        }
+    });
 }
 
 var windowFlag = false;
-
-
 
 if (window.location.href.indexOf("manage_child_themes") >= 0) {
     window.addEventListener("click", function (e) {
-
         if (windowFlag) {
-
             windowFlag = false;
-
             return;
-
-        }
-
+        }
         if (e.clientX == undefined || e.clientY == undefined) {
-
             return;
-
-        }
-
-
-
+        }
         var pointElement    = null;
-
         var actionBox       = document.getElementById("pas_cth_actionBox");
-
         var errorMessageBox = document.getElementsByName("errorMessageBox")[0];
-
-
-
         pointElement = document.elementFromPoint(e.clientX, e.clientY);
-
-
-
         var tree = pas_cth_library.getElementTree(actionBox);
-
         var found = false;
-
         found = pas_cth_library.searchTree(actionBox, tree, pointElement);
-
-
-
         if (! found) {
-
             tree = pas_cth_library.getElementTree(errorMessageBox);
-
             found = pas_cth_library.searchTree(errorMessageBox, tree, pointElement);
-
-        }
-
-
-
+        }
         if (! found) {
-
             pas_cth_library.kill(actionBox);
-
             pas_cth_library.kill(errorMessageBox);
-
-        }
-
+        }
     });
-
-}
-
-
+}
 
 // KillMe kills the error message boxes.
-
 // After the last box has been destroyed, kill the actionBox div too.
-
 function pas_cth_js_killMe(element) {
-
     var elements;
-
     if (element.parentNode != null) {
-
         element.parentNode.removeChild(element);
-
-    }
-
+    }
     element.remove();
-
-
-
     elements = document.getElementsByName("errorMessageBox");
-
     if (0 == elements.length) {
-
         var actionBox = document.getElementById("pas_cth_actionBox");
-
         if (actionBox.parentNode != null) {
-
             actionBox.parentNode.removeChild(actionBox);
-
-        }
-
+        }
         actionBox.remove();
-
-    }
-
+    }
 }
 
 function pas_cth_js_popupMessage(abbr, msg) {
-
     var box = document.getElementById("popupMessageBox")
-
     box.innerHTML = msg;
-
     box.style.position = "fixed";
-
     box.style.left = mousePosition.x + 100 + "px";
-
     box.style.top  = mousePosition.y - 40 + "px";
-
     box.style.display = "inline";
-
     setTimeout(function () {
-
                 var p = document.getElementById("popupMessageBox")
-
                 p.innerHTML = "";
-
                 p.style.display = "none";
-
                }, 2000);
-
 }
 
 // Process the xmlhttp.responseText that was echo'd during the AJAX call
-
 function pas_cth_js_processResponse(response) {
-
     if ("ABBREVIATION:{" == response.left("ABBREVIATION:{".length).toUpperCase()) {
-
         abbr = response.right(response.length - "ABBREVIATION:{".length);
-
         abbr = abbr.left(abbr.length - 1);
-
         pas_cth_js_popupMessage(abbr, "color saved");
-
         document.getElementById("popupMessageBox").style.display = "inline";
-
     } else if ("EDITFILEOUTPUT:{" == response.left("EDITFILEOUTPUT:{".length).toUpperCase()) {
-
         response = response.right(response.length - "EDITFILEOUTPUT:{".length);
-
         response = response.left(response.length - 1);
-
         processEditFile(response);
-
     } else if ("DEBUG:{" == response.left("DEBUG:{".length).toUpperCase()) {
-
         pas_cth_library.kill("pas_cth_actionBox");
-
         debugResponse = response.right(response.length - "debug:{".length);
-
         debugResponse = debugResponse.left(debugResponse.length - 1);
-
         
         box = pas_cth_js_createBox('debugBox', 'debug');
-
         box.innerHTML = debugResponse;
-
     // Nothing special. We've got output from the PHP function, dump it to the screen.
-
     } else {
-
         if (response.length > 0) {
-
             pas_cth_js_createBox("pas_cth_actionBox", "").innerHTML = response;
-
             windowFlag = true;
-
-        }
-
-    }
-
+        }
+    }
 }
 
 function pas_cth_js_showBox() {
-
     return pas_cth_library.createBox("pas_cth_actionBox");
 }
 
 function pas_cth_js_createBox(id, className = "", parent = document.getElementsByTagName("body")[0], clickClose = false) {
-
     var box = pas_cth_library.createBox(id, parent);
-
     if (className.trim.length > 0) {
-
         box.className = className;
-
-    }
-
-
-
+    }
     if (clickClose) {
-
         box.onclick= function () {
- pas_cth_library.kill(this); }
+            pas_cth_library.kill(this);
+        }
     } else {
-
         var dismissBTN = document.createElement("p")
-
         dismissBTN.setAttribute("id", "dismissBox");
-
         box.appendChild(dismissBTN);
-
         dismissBTN.innerHTML = "DISMISS";
-
         dismissBTN.onclick = function () {
-
             pas_cth_library.kill("pas_cth_actionBox");
         }
-
-    }
-
+    }
     return box;
-
 }
 
 function pas_cth_js_addCloseButton(id, parent, text) {
-
     var element = document.createElement("p");
-
     element.setAttribute("id", id);
-
-
     parent.appendChild(element);
-
     element.innerHTML = text;
-
     element.onclick = function () {
-
         var myParent = this.parentNode;
-
         var myGrandParent = myParent.parentNode;
-
-
-
         if (myGrandParent != null) {
-
             myGrandParent.removeChild(myParent);
-
             myParent.remove();
-
-        }
-
-    }
-
+        }
+    }
 }
 
 function getTopLeftPosition(obj = null) {
-
     if (obj != null) {
-
         return pas_cth_library.getPosition(obj);
-
     } else {
-
         return null;
-
-    }
-
-}
+    }
+}

child-themes-helper/trunk/js/menu.js

@@ -77 +77 @@
     var position = { 'x'    :   event.clientX, 'y'  :   event.clientY };
     var jsdata = JSON.parse(element.getAttribute("data-jsdata"));
-    var elementID = Date.now(); // clock ticks since midnight at the epoch. Guarantees a unique ID number.
+    /*
+     * Originally used Date.now() for unique IDs. But too many operations are performed per clock tick to make these unique IDs.
+     * Instead, I'm using Math.floor(Math.random() * 1000000.0 ).
+     * Does not guarantee uniqueness, but picking 2 random numbers between 0 and 999,999 makes it highly unlikely
+     * that they would be identical. For this purpose, it's good enough.
+     */
+    var elementID = Math.floor(Math.random() * 1000000.0);
     var childGrid = document.getElementById("childGrid");
     var parentGrid = document.getElementById("parentGrid");
     var themeType = "";
 
+    /*
+     * Are we over a child file, a parent file, or no file?
+     */
     var obj = new elementInfo(childGrid);
     if (obj.isMouseOver(position)) {
@@ -94 +103 @@
         return;
     }
+
+    /*
+     * Grab menu items with the appropriate themeType
+     */ 
     var menuElements = [];
     pas_cth_menu.forEach(function (cell) {
@@ -102 +115 @@
     element.setAttribute("id", "file_" + elementID);
 
+    /*
+     * Look for an existing popup menu. If found, close it.
+     */
     var box = document.getElementById("popupMenu");
     if (box != null) {
@@ -107 +123 @@
         box.remove();
     }
+
+    /*
+     * Create new popup menu.
+     */
     box = document.createElement("DIV");
     var p = document.createElement("P");
@@ -114 +134 @@
 
     
-    
-    var rect = p.getBoundingClientRect();
-    var pHeight = rect.height;
-    rect = p.getBoundingClientRect();
+    /*
+     * Position info the new popup menu.
+     */
+//  var rect = p.getBoundingClientRect();
+//  var pHeight = rect.height;
+//  rect = p.getBoundingClientRect();
 
     box.appendChild(p);
 
+    /*
+     * Display selected menu items (Edit/Remove for child theme, Copy/View for parent theme)
+     */
     var anchor = [];
-
     for (var ndx = 0; ndx < menuElements.length; ndx++) {
         p = document.createElement("P");
@@ -138 +162 @@
     box.id = "popupMenu";
 
+    /*
+     * Position new popup menu
+     */
     var lft = position.x + 25;
     var tp = position.y;
@@ -144 +171 @@
     document.getElementsByTagName("body")[0].appendChild(box);
 
+    /*
+     * Expand or contract the menu width depending upon its contents
+     */
     box.style.width = box.scrollWidth;
 
-    var pRect = p.getBoundingClientRect();
-    var boxRect = box.getBoundingClientRect();
+//  var pRect = p.getBoundingClientRect();
+//  var boxRect = box.getBoundingClientRect();
 
     event.preventDefault();
 }
+/*
 function findCorners(objPos) {
     this.adjustCorners = function (adjSize) {
@@ -166 +197 @@
     }
 }
+*/

child-themes-helper/trunk/js/pasChildThemes.js

@@ -17 +17 @@
     var jsInput;
     var box;
+
+    pas_cth_spinner.wait_cursor();
 
 
@@ -40 +42 @@
         document.getElementById("pas_cth_actionBox").style.display = "inline";
         windowFlag = true; // Prevents the window.onclick event from closing this prompt.
+
+        pas_cth_spinner.default_cursor();
+
         return;
     }
@@ -59 +64 @@
             break;
     }
+    pas_cth_spinner.default_cursor();
+
 }
 function pas_cth_js_showWait() {
@@ -134 +141 @@
         pas_cth_js_processResponse(response);
         pas_cth_js_hideWait();
+        pas_cth_spinner.default_cursor();
     } else {
         location.reload();
@@ -142 +150 @@
     pas_cth_js_showBox().innerHTML = msg;
     pas_cth_js_hideWait();
+    pas_cth_spinner.default_cursor();
 }
 /*

child-themes-helper/trunk/js/tabs.js

@@ -53 +53 @@
 
     body.style.overflow = "hidden";
-    html.style.overflow = "hidden";
 }
 function pas_cth_js_expertMode(element) {

child-themes-helper/trunk/readme.txt

@@ -4 +4 @@
 Donate link: https://paypal.me/PaulSwarthout
 Tags: child themes helper, child themes, child theme, child, theme, template theme, parent theme, developers, IIS, Linux, copy files to child theme, create a child theme
-Requires at least: 4.7.0
-Tested up to: 5.7.2
-Stable tag: 2.2.2
+Requires at least: 5.0
+Tested up to: 5.8.2
+Stable tag: 2.2.4
 Requires PHP: 5.6.31
 License: GPLv2 or later
@@ -60 +60 @@
 
     - *Development versions*
-        Versions 2\.1, 1\.2 are available for download and install.
+        Versions 2\.2\.1, 2\.1, 1\.2 are available for download and install.
 
     - *Screenshot*
@@ -93 +93 @@
 
 == Frequently Asked Questions ==
+
+= Sometimes the wait spinner gets stuck and doesn't end. What can I do?
+
+Yep. I've noticed that. I don't know why that happens. When I stumble on that, and I walk the code, it never happens. In the meantime, there's a really simple solution. Just click on the spinner with your primary mouse button (usually the left) and the wait spinner will disappear.
 
 = Do I have to keep the Child Themes Helper installed and/or activated? =
@@ -124 +128 @@
 == Changelog ==
 
+= 2.2.4 =
+ - Tested the plugin with PHP 8.0.0 and WordPress 5.8.2.
+
+ - Cleaned up code.
+
+ - Fixed a problem with the spinning wait cursors. The code was originally copied from another plugin that I'm developing, but I inadvertantly got some code that doesn't work with this plugin.
+
+ - Introduced namespaces to my code. Slowly removing prefixes from all 'global' functions as they are now localized in the child-themes-helper namespace.
+
+= 2.2.3 =
+ - Bug fix: Format at the very bottom of the list of files didn't leave room for the popup menu. Extended the page with a bottom margin of 50px.
+
 = 2.2.2 =
  - Oops. Forgot to include the new files before I committed the changes. Everything is included with this one.
@@ -219 +235 @@
 == Upgrade Notice ==
 
+= 2.2.4 =
+ - Fixed several bugs that were preventing the plugin from loading correctly.
+ - Please submit a trouble ticket when you encounter problems. I was embarrassed that this plugin was broken in the latest version on the WordPress Plugins repository.
+
 = 1.1.3 =
 - Fixed a bug: The path to the child theme's stylesheet in the functions.php was incorrect.