release: release 2.7.3 (#144)

* release: release 2.7.2

* fix: urgent 2.7.3 release to fix fatal error

* chore: remove un-needed setup script

* ci: remove steps from pre-push command

* chore: remove un-needed PHP-Commitizen config

* chore: put image files in correct folders

* chore: move GitHub image into `.github/` dir

.php-commitizen.php

@@ -1,30 +0,0 @@
-<?php
-
-return [
-    'type' => [
-        'lengthMin' => 1, // Min length of the type
-        'lengthMax' => 8, // Max length of the type
-        'acceptExtra' => false, // Allow adding types not listed in 'values' key
-        'values' => ['feat', 'fix', 'refactor', 'style', 'docs', 'chore', 'test', 'perf', 'build', 'ci'], // All the values usable as type
-    ],
-    'scope' => [
-        'lengthMin' => 0, // Min length of the scope
-        'lengthMax' => 10, // Max length of the scope
-        'acceptExtra' => true, // Allow adding scopes not listed in 'values' key
-        'values' => [], // All the values usable as scope
-    ],
-    'description' => [
-        'lengthMin' => 1, // Min length of the description
-        'lengthMax' => 65, // Max length of the description
-    ],
-    'subject' => [
-        'lengthMin' => 1, // Min length of the subject
-        'lengthMax' => 80, // Max length of the subject
-    ],
-    'body' => [
-        'wrap' => 72, // Wrap the body at 72 characters
-    ],
-    'footer' => [
-        'wrap' => 72, // Wrap the footer at 72 characters
-    ],
-];

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+= 2.7.3 =
+
+- Bugfix: fix WYSIWYG editor error message, thanks to @ogbcashdown bug report.
+
+= 2.7.2 =
+
+- Reissue of 2.7.1.
+
 = 2.7.1 =
 
 - Bugfix: Stylesheets: namespace collapsed CSS class, thanks to @cybermrmotte

README.md

@@ -10,7 +10,7 @@
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 <!-- markdownlint-enable MD013 -->
 
-![footnotes](https://raw.githubusercontent.com/markcheret/footnotes/main/img/footnotes.png)
+![footnotes](https://raw.githubusercontent.com/markcheret/footnotes/main/.github/img/footnotes.png)
 
 **footnotes** aims to be the all-in-one solution for displaying an
 automatically-generated list of references on your Page or Post. The Plugin

_tools/build.sh

@@ -6,11 +6,7 @@ echo "Building Plugin..."
 echo "Copying directories..."
 rm -rf dist/
 mkdir dist
-cp -r -t dist src/{class,languages,templates}/
+cp -r -t dist src/{class,languages,templates,img}/
-# Among the images, only 2 out of 3 are distributed.
-echo "Copying the needed images..."
-mkdir -p dist/img
-cp -t dist/img src/img/fn-wysiwyg.png
 echo "Copying files..."
 cp -t dist ./{SECURITY.md,CHANGELOG.md,wpml-config.xml} src/{license.txt,readme.txt,includes.php}
 echo "Setting production flag..."

_tools/release.sh

@@ -200,6 +200,7 @@ read -p "Are you ready to continue? (Y/N): " CONFIRM && [[ $CONFIRM == [yY] || $
 echo "Creating local copy of SVN repo..."
 svn checkout https://plugins.svn.wordpress.org/footnotes svn-tmp --depth immediates
 svn update --quiet svn-tmp/trunk --set-depth infinity
+svn update --quiet svn-tmp/assets --set-depth infinity
 svn update --quiet svn-tmp/tags/$PRERELEASE_VERSION --set-depth infinity
 echo -e "Local copy created.\n"
 

_tools/setup.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cp contrib/pre-commit .git/hooks/pre-commit
-chmod +x .git/hooks/pre-commit

contrib/pre-commit

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# Modified from: https://github.com/bjornjohansen/wp-pre-commit-hook
-# Also: https://softdiscover.com/wordpress/perfect-setup-for-a-wordpress-project-development/
-
-PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
-STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php`
-
-# Determine if a file list is passed
-if [ "$#" -eq 1 ]
-then
-    oIFS=$IFS
-    IFS='
-    '
-    SFILES="$1"
-    IFS=$oIFS
-fi
-SFILES=${SFILES:-$STAGED_FILES_CMD}
-
-echo "Checking PHP Lint..."
-for FILE in $SFILES
-do
-    php -l -d display_errors=0 $PROJECT/$FILE
-    if [ $? != 0 ]
-    then
-        echo "Fix the error before commit."
-        exit 1
-    fi
-    FILES="$FILES $PROJECT/$FILE"
-done
-
-#if [ -f "$PROJECT/phpcs.ruleset.xml" ]
-#then
-#    RULESET="$PROJECT/phpcs.ruleset.xml"
-#elif [ -f "$PROJECT/phpcs.xml.dist" ]
-#then
-#    RULESET="$PROJECT/phpcs.xml.dist"
-#else
-#
-#fi
-
-if [ "$FILES" != "" ]
-then
-    for RULESET in WordPress PHPCompatibilityWP; do
-				echo "Checking Code Standard Compliance, using $RULESET as ruleset standard..."
-				./vendor/bin/phpcs --standard="$RULESET" --runtime-set testVersion 7.0- --colors --encoding=utf-8 -n -p $FILES
-				if [ $? != 0 ]
-				then
-						echo "Coding standards errors have been detected. Running phpcbf..."
-						./vendor/bin/phpcbf --standard="$RULESET" --runtime-set testVersion 7.0- --encoding=utf-8 -n -p $FILES
-						git add $FILES
-						echo "Running Code Sniffer again..."
-						./vendor/bin/phpcs --standard="$RULESET" --runtime-set testVersion 7.0- --colors --encoding=utf-8 -n -p $FILES
-						if [ $? != 0 ]
-						then
-								echo "Errors found not fixable automatically. You need to manually fix them."
-								exit 1
-						fi
-				fi
-				echo "$RULESET passed."
-		done
-fi
-
-exit $?

package.json

@@ -22,7 +22,7 @@
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged",
-      "pre-push": "composer run docs && git add docs && git commit -m \"docs: update documentation\" --no-verify"
+      "pre-push": "composer run docs"
     }
   },
   "lint-staged": {

src/class/wysiwyg.php

@@ -74,7 +74,7 @@ class Footnotes_WYSIWYG {
 	 * @return array
 	 */
 	public static function include_scripts( $p_arr_plugins ) {
-		$p_arr_plugins[ Footnotes_Config::C_STR_PLUGIN_NAME ] = plugins_url( '/../js/wysiwyg-editor ' . ( ( Footnotes::PRODUCTION_ENV ) ? '.min' : '' ) . '.js', __FILE__ );
+		$p_arr_plugins[ Footnotes_Config::C_STR_PLUGIN_NAME ] = plugins_url( '/../js/wysiwyg-editor' . ( ( PRODUCTION_ENV ) ? '.min' : '' ) . '.js', __FILE__ );
 		return $p_arr_plugins;
 	}
 

src/footnotes.php

@@ -5,7 +5,7 @@
  * Description: footnotes lets you easily add highly-customisable footnotes on your WordPress Pages and Posts.
  * Author: Mark Cheret
  * Author URI: https://cheret.org/footnotes
- * Version: 2.7.1
+ * Version: 2.7.3
  * Text Domain: footnotes
  * Domain Path: /languages
  * Requires at least: 3.9
@@ -25,7 +25,7 @@
  * @since 2.5.3 (Hungarian)
  * @var str
  */
-define( 'C_STR_FOOTNOTES_VERSION', '2.7.2' );
+define( 'C_STR_FOOTNOTES_VERSION', '2.7.3' );
 
 /**
  * Defines the current environment ('development' or 'production').

src/js/wysiwyg-editor.js

@@ -54,24 +54,24 @@
       return null;
     },
 
-		/**
+    /**
-		 * Returns information about the plugin as a name/value array.
+     * Returns information about the plugin as a name/value array.
-		 * The current keys are longname, author, authorurl, infourl and version.
+     * The current keys are longname, author, authorurl, infourl and version.
-		 *
+     *
-		 * @return {Object} Name/value array containing information about the plugin.
+     * @return {Object} Name/value array containing information about the plugin.
-		 *
+     *
-		 * Edit: needs updating the version number manually   
+     * Edit: needs updating the version number manually
-		 */
+     */
-		getInfo : function() {
+    getInfo: function () {
-			return {
+      return {
-				longname : 'Inserts the Footnotes short code.',
+        longname: 'Inserts the Footnotes short code.',
-				author : 'Mark Cheret',
+        author: 'Mark Cheret',
-				authorurl : 'https://cheret.org/footnotes/',
+        authorurl: 'https://cheret.org/footnotes/',
-				infourl : 'https://wordpress.org/plugins/footnotes/',
+        infourl: 'https://wordpress.org/plugins/footnotes/',
-				version : '2.7.2d'
+        version: '2.7.4d',
-			};
+      };
-		}
+    },
-	});
+  });
 
   // Register plugin
   tinymce.PluginManager.add('footnotes', tinymce.plugins.Footnotes);

src/readme.txt

@@ -5,7 +5,7 @@ Tags: footnote, footnotes, bibliography, formatting, notes, Post, posts, referen
 Requires at least: 3.9
 Tested up to: 5.7.1
 Requires PHP: 7.0
-Stable Tag: 2.7.0
+Stable Tag: 2.7.3
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -60,7 +60,16 @@ No, this Plugin has been written from scratch. Of course some inspirations on ho
 
 == Changelog ==
 
+= 2.7.3 =
+
+- Bugfix: fix WYSIWYG editor error message, thanks to @ogbcashdown bug report.
+
+= 2.7.2 =
+
+- Reissue of 2.7.1.
+
 = 2.7.1 =
+
 - Bugfix: Stylesheets: namespace collapsed CSS class, thanks to @cybermrmotte @markyz89 bug reports.
 - Dashboard: move Plugin settings under default WP Settings menu.
 - Bugfix: Footnotes: fix bug when using multiple paragraphs in footnotes.
@@ -68,20 +77,15 @@ No, this Plugin has been written from scratch. Of course some inspirations on ho
 - Documentation: split changelog into seperate file.  
 
 = 2.7.0 =
+
 - Adding: Reference container: optionally per section by shortcode, thanks to @grflukas issue report.
 - Bugfix: Excerpts: make excerpt handling backward compatible, thanks to @mfessler bug report.
 - Bugfix: Dashboard: debug the 'Quick start guide' tab, thanks to @rumperuu bug report.
 
-= 2.6.6 =
-- Bugfix: Process: fix issue that caused some footnotes to not be processed, thanks to @docteurfitness @rkupadhya @offpeakdesign bug reports.
-
-= 2.6.5 =
-- Bugfix: Editor buttons: debug button by reverting name change in PHP file while JS file and HTML template remained unsynced, thanks to @gova bug report.
-- Bugfix: Hooks: default-disable the_excerpt hook with respect to theme-specific excerpt handling, thanks to @mmallett bug reports.
-
 == Upgrade Notice ==
  
-= 2.7.1 =
+= 2.7.3 =
+
 This release resolves a CSS class conflict with the commonly-used `.collapsed` class.
 
 == Usage ==