Merge pull request #70 from t-hamano/wp6.3

Version 3.3.0 (Release for WP6.3)

Author: t-hamano

.eslintrc.js

@@ -2,9 +2,6 @@ module.exports = {
 	extends: [ 'plugin:@wordpress/eslint-plugin/recommended' ],
 	parser: '@babel/eslint-parser',
 	globals: {
-		chbeObj: true,
-		Blob: true,
-		FileReader: true,
 		jQuery: true,
 	},
 	rules: {

.github/workflows/run-test-and-deploy.yml

@@ -13,14 +13,12 @@ jobs:
     strategy:
       matrix:
         php-versions: [
-          '7.3',
           '7.4',
           '8.0'
         ]
         wp-versions: [
-          'WordPress#5.9.4',
-          'WordPress#6.0.3',
-          'WordPress#6.1',
+          'WordPress#6.1.3',
+          'WordPress#6.2.2',
           'WordPress'
         ]
     name: PHP ${{ matrix.php-versions }}  / ${{ matrix.wp-versions }} Test

.github/workflows/run-test.yml

@@ -16,14 +16,12 @@ jobs:
     strategy:
       matrix:
         php-versions: [
-          '7.3',
           '7.4',
           '8.0'
         ]
         wp-versions: [
-          'WordPress#5.9.4',
-          'WordPress#6.0.3',
-          'WordPress#6.1',
+          'WordPress#6.1.3',
+          'WordPress#6.2.2',
           'WordPress'
         ]
     name: PHP ${{ matrix.php-versions }}  / ${{ matrix.wp-versions }} Test
@@ -57,3 +55,11 @@ jobs:
 
       - name: Running e2e tests
         run: npm run test:e2e
+
+      - name: Archive debug artifacts
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: failures-artifacts
+          path: artifacts
+          if-no-files-found: ignore

.nvmrc

@@ -1 +1 @@
-14
+16

.wp-env.json

@@ -3,8 +3,12 @@
 		".",
 		"https://downloads.wordpress.org/plugin/classic-editor.zip"
 	],
-	"config": {
-		"WP_DEBUG": true,
-		"SCRIPT_DEBUG": true
+	"env": {
+		"tests": {
+			"config": {
+				"WP_DEBUG": true,
+				"SCRIPT_DEBUG": true
+			}
+		}
 	}
 }

README.md

@@ -1,11 +1,11 @@
-#  Custom HTML Block Extension
+# Custom HTML Block Extension
 
 [![Tests](https://github.com/t-hamano/custom-html-block-extension/actions/workflows/run-test.yml/badge.svg)](https://github.com/t-hamano/custom-html-block-extension/actions/workflows/run-test.yml)
 [![Tests and Deploy](https://github.com/t-hamano/custom-html-block-extension/actions/workflows/run-test-and-deploy.yml/badge.svg)](https://github.com/t-hamano/custom-html-block-extension/actions/workflows/run-test-and-deploy.yml)
 
 ![Custom HTML Block Extension](https://raw.githubusercontent.com/t-hamano/custom-html-block-extension/main/assets/images/admin/welcome-guide/slide_1.gif)
 
-Custom HTML Block Extension extends "Custom HTML block" to evolve into an advanced code editor.
+Custom HTML Block Extension extends Custom HTML block to evolve into the advanced code editor.
 
 ## Features
 
@@ -33,7 +33,7 @@ Supports the classic editor, the theme/plugin editor, import/export editor setti
 
 You can use your own favorite fonts in addition to the default fonts.
 
-### STEP1:  Place font files
+### STEP1: Place font files
 
 Place the font files in **the public directory** of the server where WordPress is installed.
 It is recommended to create `fonts` folder directly under the theme and place the fonts there.

assets/images/admin/editor-config/editor-options/scrollbar/scroll-by-page.gif

@@ -44,7 +44,7 @@ public function admin_enqueue_scripts( $hook_suffix ) {
 			$content  = '<h3>' . __( 'Custom HTML Block Extension', 'custom-html-block-extension' ) . '</h3>';
 			$content .= '<p>';
 			$content .= sprintf(
-				/* translators: 1: setting page url */
+				/* translators: %s is replaced with the setting page url. */
 				__(
 					'Custom HTML Block Extension enabled. You can customize the editor in <a href="%s">setting page</a>.',
 					'custom-html-block-extension'
@@ -113,6 +113,7 @@ public function admin_enqueue_scripts( $hook_suffix ) {
 				'editorSettings'      => Settings::get_editor_settings(),
 				'editorOptions'       => Settings::get_editor_options(),
 				'options'             => Settings::get_options(),
+				'userRoles'           => Settings::get_user_roles(),
 				'fontFamily'          => Settings::get_font_families(),
 				'dismissWelcomeGuide' => get_option( Settings::OPTION_NAME['dismiss_welcome_guide'] ),
 			)

classes/class-admin.php

@@ -26,7 +26,7 @@ public function enqueue_editor_scripts() {
 		// Abort the process if permission is disabled.
 		$options = Settings::get_options();
 
-		if ( ! $options['permissionBlockEditor'] ) {
+		if ( ! $options['permissionBlockEditor'] || ! Settings::is_allowed_user() ) {
 			return;
 		}
 

classes/class-block-editor.php

@@ -133,45 +133,43 @@ public function admin_footer() {
 		// phpcs:disable Generic.ControlStructures.InlineControlStructure
 		?>
 		<div id="chbe-replace-indent-dialog" class="chbe-dialog__inner">
-			<p class="chbe-dialog__ttl"><?php echo esc_attr_e( 'Change Indentation', 'custom-html-block-extension' ); ?></p>
+			<h2 class="chbe-dialog__title"><?php echo esc_attr_e( 'Change Indentation', 'custom-html-block-extension' ); ?></h2>
 			<div class="chbe-dialog__row">
-				<div class="chbe-dialog__col chbe-dialog__col--setting">
-					<p class="chbe-dialog__subttl"><?php esc_html_e( 'Current Indent', 'custom-html-block-extension' ); ?></p>
-					<p>
-						<strong><?php esc_html_e( 'Indent type', 'custom-html-block-extension' ); ?></strong>
+				<div class="chbe-dialog__setting">
+					<h3 class="chbe-dialog__subtitle"><?php esc_html_e( 'Current Indent', 'custom-html-block-extension' ); ?></h3>
+					<fieldset>
+						<legend><?php esc_html_e( 'Current indent type', 'custom-html-block-extension' ); ?></legend>
 						<label>
 							<?php esc_html_e( 'Space', 'custom-html-block-extension' ); ?>
-							<input type="radio" name="before_insert_spaces" value="1" <?php if ( $settings['insertSpaces'] ) echo 'checked'; ?>>
+							<input type="radio" name="before_insert_spaces" value="1" <?php checked( $settings['insertSpaces'] ); ?>>
 						</label>
 						<label>
 							<?php esc_html_e( 'Tab', 'custom-html-block-extension' ); ?>
-							<input type="radio" name="before_insert_spaces" value="0" <?php if ( ! $settings['insertSpaces'] ) echo 'checked'; ?>>
+							<input type="radio" name="before_insert_spaces" value="0" <?php checked( ! $settings['insertSpaces'] ); ?>>
 						</label>
-					</p>
+					</fieldset>
 					<p id="chbe-item-before-tab-size" style="<?php if ( ! $settings['insertSpaces'] ) echo 'display:none;'; ?>">
-						<strong><?php esc_html_e( 'Indent width', 'custom-html-block-extension' ); ?></strong>
-						<input type="number" name="before_tab_size" min="1" max="8" value="<?php echo esc_attr( $settings['tabSize'] ); ?>">
+						<label for="chbe_before_tab_size"><strong><?php esc_html_e( 'Current indent width', 'custom-html-block-extension' ); ?></strong></label>
+						<input type="number" id="chbe_before_tab_size" name="before_tab_size" min="1" max="8" value="<?php echo esc_attr( $settings['tabSize'] ); ?>">
 					</p>
 				</div>
-				<div class="chbe-dialog__col chbe-dialog__col--arrow">
-					<span class="dashicons dashicons-arrow-right-alt">
-				</div>
-				<div class="chbe-dialog__col chbe-dialog__col--setting">
-					<p class="chbe-dialog__subttl"><?php esc_html_e( 'New Indent', 'custom-html-block-extension' ); ?></p>
-					<p>
-						<strong><?php esc_html_e( 'Indent type', 'custom-html-block-extension' ); ?></strong>
+				<span class="chbe-dialog__arrow dashicons dashicons-arrow-right-alt"></span>
+				<div class="chbe-dialog__setting">
+					<h3 class="chbe-dialog__subtitle"><?php esc_html_e( 'New Indent', 'custom-html-block-extension' ); ?></h3>
+					<fieldset>
+						<legend><?php esc_html_e( 'New indent type', 'custom-html-block-extension' ); ?></legend>
 						<label>
 							<?php esc_html_e( 'Space', 'custom-html-block-extension' ); ?>
-							<input type="radio" name="after_insert_spaces" value="1" <?php if ( $settings['insertSpaces'] ) echo 'checked'; ?>>
+							<input type="radio" name="after_insert_spaces" value="1" <?php checked( $settings['insertSpaces'] ); ?>>
 						</label>
 						<label>
 							<?php esc_html_e( 'Tab', 'custom-html-block-extension' ); ?>
-							<input type="radio" name="after_insert_spaces" value="0" <?php if ( ! $settings['insertSpaces'] ) echo 'checked'; ?>>
+							<input type="radio" name="after_insert_spaces" value="0" <?php checked( ! $settings['insertSpaces'] ); ?>>
 						</label>
-					</p>
+					</fieldset>
 					<p id="chbe-item-after-tab-size" style="<?php if ( ! $settings['insertSpaces'] ) echo 'display:none;'; ?>">
-						<strong><?php esc_html_e( 'Indent width', 'custom-html-block-extension' ); ?></strong>
-						<input type="number" name="after_tab_size" min="1" max="8" value="<?php echo esc_attr( $settings['tabSize'] ); ?>">
+						<label for="chbe_after_tab_size"><strong><?php esc_html_e( 'New indent width', 'custom-html-block-extension' ); ?></strong></label>
+						<input type="number" id="chbe_after_tab_size" name="after_tab_size" min="1" max="8" value="<?php echo esc_attr( $settings['tabSize'] ); ?>">
 					</p>
 				</div>
 			</div>