Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit bba435a

Browse files
technote-spacetechnote-space
authored
Merge pull request #98 from technote-space/release/v1.6.11
Release/v1.6.11
2 parents cde8801 + 7496740 commit bba435a

File tree

26 files changed

+126
-75
lines changed

26 files changed

+126
-75
lines changed

‎composer.lock‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎marker-animation.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Plugin URI: https://wordpress.org/plugins/marker-animation
55
Description: This plugin will add "Marker animation" function
66
Author: Technote
7-
Version: 1.6.10
7+
Version: 1.6.11
88
Author URI: https://technote.space
99
Text Domain: marker-animation
1010
Domain Path: /languages/

‎readme.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: marker, marker animation, highlighter, 蛍光ペン, マーカー, アン
44
Requires at least: 4.6
55
Tested up to: 5.1.0
66
Requires PHP: 5.6
7-
Stable tag: 1.6.10
7+
Stable tag: 1.6.11
88
License: GPLv2 or later
99
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1010

@@ -55,8 +55,15 @@ This plugin needs PHP5.6 or higher.
5555
= 1.6.9 =
5656
* 設定のエクスポート及びインポートが可能になります(WP v4.7以上)
5757

58+
= 1.6.10 =
59+
* Classic editor でのボタンの動作が改善されます。
60+
5861
== Changelog ==
5962

63+
= 1.6.11 (2019/3/4) =
64+
65+
* Improved: Hide `block editor setting` if block editor is invalid
66+
6067
= 1.6.10 (2019/3/4) =
6168

6269
* Improved: Behavior of classic editor's button

‎src/classes/models/custom_post/setting.php‎

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?php
22
/**
3-
* @version 1.6.6
3+
* @version 1.6.11
44
* @author Technote
55
* @since 1.4.0
66
* @since 1.5.0 Changed: ライブラリの変更 (#37)
77
* @since 1.6.0 Changed: Gutenbergへの対応 (#3)
88
* @since 1.6.6 Changed: フレームワークの更新 (#76)
9+
* @since 1.6.11 #85
910
* @copyright Technote All Rights Reserved
1011
* @license http://www.opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2
1112
* @link https://technote.space/
@@ -86,6 +87,9 @@ protected function filter_edit_form_params(
8687
$params['columns']['function']['form_type'] = 'select';
8788
$params['columns']['function']['options'] = $assets->get_animation_functions();
8889
$params['name_prefix'] = $assets->get_name_prefix();
90+
if ( ! $this->app->utility->can_use_block_editor() ) {
91+
unset( $params['columns']['is_valid_button_block_editor'] );
92+
}
8993

9094
return $params;
9195
}
@@ -184,14 +188,19 @@ protected function get_manage_posts_columns() {
184188
/** @noinspection PhpUnusedParameterInspection */
185189
$value, $data, $post
186190
) {
191+
$details = [
192+
'repeat' => empty( $data['repeat'] ) ? $this->translate( 'No' ) : $this->translate( 'Yes' ),
193+
'is valid button' => empty( $data['is_valid_button'] ) ? $this->translate( 'No' ) : $this->translate( 'Yes' ),
194+
'is valid style' => empty( $data['is_valid_style'] ) ? $this->translate( 'No' ) : $this->translate( 'Yes' ),
195+
'is valid block editor button' => empty( $data['is_valid_button_block_editor'] ) ? $this->translate( 'No' ) : $this->translate( 'Yes' ),
196+
'selector' => $this->get_default_class( $post->ID ) . ( empty( $data['selector'] ) ? '' : ', ' . $data['selector'] ),
197+
];
198+
if ( ! $this->app->utility->can_use_block_editor() ) {
199+
unset( $details['is valid block editor button'] );
200+
}
201+
187202
return $this->get_view( 'admin/custom_post/setting/others', [
188-
'details' => [
189-
'repeat' => empty( $data['repeat'] ) ? $this->translate( 'No' ) : $this->translate( 'Yes' ),
190-
'is valid button' => empty( $data['is_valid_button'] ) ? $this->translate( 'No' ) : $this->translate( 'Yes' ),
191-
'is valid style' => empty( $data['is_valid_style'] ) ? $this->translate( 'No' ) : $this->translate( 'Yes' ),
192-
'is valid block editor button' => empty( $data['is_valid_button_block_editor'] ) ? $this->translate( 'No' ) : $this->translate( 'Yes' ),
193-
'selector' => $this->get_default_class( $post->ID ) . ( empty( $data['selector'] ) ? '' : ', ' . $data['selector'] ),
194-
],
203+
'details' => $details,
195204
] );
196205
},
197206
'unescape' => true,
@@ -276,6 +285,27 @@ private function clear_options_cache() {
276285
$assets->clear_options_cache();
277286
}
278287

288+
/**
289+
* @param string $key
290+
* @param mixed $value
291+
* @param mixed $default
292+
* @param array|null $post_array
293+
*
294+
* @return mixed
295+
*/
296+
protected function filter_post_field(
297+
/** @noinspection PhpUnusedParameterInspection */
298+
$key, $value, $default, $post_array
299+
) {
300+
if ( 'is_valid_button_block_editor' === $key ) {
301+
if ( ! $this->app->utility->can_use_block_editor() ) {
302+
return $this->app->input->post( $this->get_post_field_name( 'is_valid_button' ) );
303+
}
304+
}
305+
306+
return $value;
307+
}
308+
279309
/**
280310
* @since 1.6.0 #3
281311
*

‎vendor/composer/installed.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,17 +195,17 @@
195195
},
196196
{
197197
"name": "wp-content-framework/common",
198-
"version": "v0.0.23",
199-
"version_normalized": "0.0.23.0",
198+
"version": "v0.0.24",
199+
"version_normalized": "0.0.24.0",
200200
"source": {
201201
"type": "git",
202202
"url": "https://github.com/wp-content-framework/common.git",
203-
"reference": "394cc3026f618ae6174b330c1732bb0f58bddd1b"
203+
"reference": "4ee6528029f46b0522034dac6e20c62e791fd557"
204204
},
205205
"dist": {
206206
"type": "zip",
207-
"url": "https://api.github.com/repos/wp-content-framework/common/zipball/394cc3026f618ae6174b330c1732bb0f58bddd1b",
208-
"reference": "394cc3026f618ae6174b330c1732bb0f58bddd1b",
207+
"url": "https://api.github.com/repos/wp-content-framework/common/zipball/4ee6528029f46b0522034dac6e20c62e791fd557",
208+
"reference": "4ee6528029f46b0522034dac6e20c62e791fd557",
209209
"shasum": ""
210210
},
211211
"require": {
@@ -215,7 +215,7 @@
215215
"phake/phake": "~2.0",
216216
"phpunit/phpunit": "~5.7"
217217
},
218-
"time": "2019-02-24T16:01:22+00:00",
218+
"time": "2019-03-04T14:09:06+00:00",
219219
"type": "library",
220220
"installation-source": "dist",
221221
"notification-url": "https://packagist.org/downloads/",
@@ -327,17 +327,17 @@
327327
},
328328
{
329329
"name": "wp-content-framework/custom_post",
330-
"version": "v0.0.22",
331-
"version_normalized": "0.0.22.0",
330+
"version": "v0.0.23",
331+
"version_normalized": "0.0.23.0",
332332
"source": {
333333
"type": "git",
334334
"url": "https://github.com/wp-content-framework/custom_post.git",
335-
"reference": "b47172ed256d80afd6bc48f0c439310c443b1c3e"
335+
"reference": "e8ec6aa17ce1e0f54be93532299f444409a60c48"
336336
},
337337
"dist": {
338338
"type": "zip",
339-
"url": "https://api.github.com/repos/wp-content-framework/custom_post/zipball/b47172ed256d80afd6bc48f0c439310c443b1c3e",
340-
"reference": "b47172ed256d80afd6bc48f0c439310c443b1c3e",
339+
"url": "https://api.github.com/repos/wp-content-framework/custom_post/zipball/e8ec6aa17ce1e0f54be93532299f444409a60c48",
340+
"reference": "e8ec6aa17ce1e0f54be93532299f444409a60c48",
341341
"shasum": ""
342342
},
343343
"require": {
@@ -347,7 +347,7 @@
347347
"wp-content-framework/db": "~0.0.1",
348348
"wp-content-framework/session": "~0.0.1"
349349
},
350-
"time": "2019-03-03T19:25:02+00:00",
350+
"time": "2019-03-04T13:27:37+00:00",
351351
"type": "library",
352352
"installation-source": "dist",
353353
"notification-url": "https://packagist.org/downloads/",

‎vendor/wp-content-framework/common/LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634634
WP Content Framework
635-
Copyright (C) 2019 technote
635+
Copyright (C) 2019 Technote
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
WP Content Framework Copyright (C) 2019 technote
655+
WP Content Framework Copyright (C) 2019 Technote
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

‎vendor/wp-content-framework/common/configs/capability.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* WP_Framework_Common Configs Capability
44
*
55
* @version 0.0.1
6-
* @author technote-space
7-
* @copyright technote-space All Rights Reserved
6+
* @author Technote
7+
* @copyright Technote All Rights Reserved
88
* @license http://www.opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2
99
* @link https://technote.space
1010
*/

‎vendor/wp-content-framework/common/configs/config.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* WP_Framework_Common Configs Config
44
*
55
* @version 0.0.1
6-
* @author technote-space
7-
* @copyright technote-space All Rights Reserved
6+
* @author Technote
7+
* @copyright Technote All Rights Reserved
88
* @license http://www.opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2
99
* @link https://technote.space
1010
*/

‎vendor/wp-content-framework/common/configs/filter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* WP_Framework_Common Configs Filter
44
*
55
* @version 0.0.21
6-
* @author technote-space
7-
* @copyright technote-space All Rights Reserved
6+
* @author Technote
7+
* @copyright Technote All Rights Reserved
88
* @license http://www.opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2
99
* @link https://technote.space
1010
*/

‎vendor/wp-content-framework/common/configs/map.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* WP_Framework_Common Configs Map
44
*
55
* @version 0.0.1
6-
* @author technote-space
7-
* @copyright technote-space All Rights Reserved
6+
* @author Technote
7+
* @copyright Technote All Rights Reserved
88
* @license http://www.opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2
99
* @link https://technote.space
1010
*/

0 commit comments

Comments
 (0)