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

Commit 8f3bed1

Browse files
technote-spacetechnote-space
authored
Merge pull request #154 from technote-space/release/v2.0.4
Release/v2.0.4
2 parents 4e9cac2 + 8b3c173 commit 8f3bed1

File tree

13 files changed

+64
-156
lines changed

13 files changed

+64
-156
lines changed

‎assets/js/marker-animation-gutenberg.min.js‎

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

‎assets/js/marker-animation.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/package-lock.json‎

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

‎assets/js/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "marker-animation",
3-
"version": "2.0.3",
3+
"version": "2.0.4",
44
"description": "marker animation for wordpress",
55
"main": "marker-animation.min.js",
66
"scripts": {
@@ -17,7 +17,6 @@
1717
"author": "Technote <technote.space@gmail.com> (https://technote.space)",
1818
"license": "GPL-3.0",
1919
"dependencies": {
20-
"classnames": "^2.2.6",
2120
"jquery.marker-animation": "^1.3.5"
2221
},
2322
"devDependencies": {

‎assets/js/src/gutenberg/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const getPanelComponent = ( setting, control, args, stripe ) => {
8080
case 'checkbox':
8181
return <CheckboxControl
8282
label={ setting.label }
83-
checked={ 'true' === value }
83+
checked={ value }
8484
onChange={ setData( setting, control, args ) }
8585
/>;
8686
case 'listbox':
@@ -99,17 +99,17 @@ const getData = ( setting, control, args ) => {
9999
const activeFormat = getActiveFormat( args.value, control.setting.name );
100100
const name = getDataName( setting.name, true );
101101
if ( ! activeFormat || ! activeFormat.attributes || ! ( name in activeFormat.attributes ) ) {
102-
return setting.type === 'checkbox' ? setting.checked + '' : setting.value;
102+
return setting.type === 'checkbox' ? setting.checked : setting.value;
103103
}
104104
if ( setting.type === 'checkbox' ) {
105105
if ( activeFormat.attributes[ name ] === 'true' ) {
106-
return 'true';
106+
return true;
107107
}
108108
const result = parseInputValue( true, setting.name );
109109
if ( ! result ) {
110110
return false;
111111
}
112-
return ( result.value === activeFormat.attributes[ name ] ) + '';
112+
return result.value === activeFormat.attributes[ name ];
113113
}
114114
return activeFormat.attributes[ name ];
115115
};

‎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.

‎configs/preset.php‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* @version 1.7.1
3+
* @version 2.0.4
44
* @author Technote
55
* @since 1.7.1
66
* @copyright Technote All Rights Reserved
@@ -15,21 +15,27 @@
1515
return [
1616

1717
[
18-
'name' => 'Red',
19-
'color' => '#f69',
20-
'priority' => 50,
18+
'name' => 'Red',
19+
'color' => '#f69',
20+
'is_valid' => 1,
21+
'is_valid_button_block_editor' => 1,
22+
'priority' => 50,
2123
],
2224

2325
[
24-
'name' => 'Green',
25-
'color' => '#6f6',
26-
'priority' => 50,
26+
'name' => 'Green',
27+
'color' => '#6f6',
28+
'is_valid' => 1,
29+
'is_valid_button_block_editor' => 1,
30+
'priority' => 50,
2731
],
2832

2933
[
30-
'name' => 'Blue',
31-
'color' => '#6cf',
32-
'priority' => 50,
34+
'name' => 'Blue',
35+
'color' => '#6cf',
36+
'is_valid' => 1,
37+
'is_valid_button_block_editor' => 1,
38+
'priority' => 50,
3339
],
3440

3541
];

‎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: 2.0.3
7+
Version: 2.0.4
88
Author URI: https://technote.space
99
Text Domain: marker-animation
1010
Domain Path: /languages/

‎readme.txt‎

Lines changed: 10 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
Requires PHP: 5.6
66
Tested up to: 5.2
7-
Stable tag: 2.0.3
7+
Stable tag: 2.0.4
88
License: GPLv2 or later
99
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1010

@@ -41,6 +41,10 @@ This plugin needs PHP5.6 or higher.
4141

4242
== Upgrade Notice ==
4343

44+
= 2.0.4 =
45+
* ストライプデザイン設定時の設定の制御を修正しました。 [詳細](https://github.com/technote-space/marker-animation/issues/151)
46+
* [すべての差分](https://github.com/technote-space/marker-animation/pull/154)
47+
4448
= 2.0.3 =
4549
* [すべての差分](https://github.com/technote-space/marker-animation/pull/148)
4650

@@ -81,8 +85,13 @@ This plugin needs PHP5.6 or higher.
8185

8286
== Changelog ==
8387

88+
= 2.0.4 (2019/6/3) =
89+
* Fixed: [Preset validity](https://github.com/technote-space/marker-animation/issues/150)
90+
* Fixed: [Sidebar behavior of stripe design](https://github.com/technote-space/marker-animation/issues/151)
91+
8492
= 2.0.3 (2019/6/2) =
8593
* Improved: [Refactoring](https://github.com/technote-space/marker-animation/issues/145)
94+
* Fixed: [Uninstall behavior](https://github.com/wp-content-framework/common/issues/107)
8695

8796
= 2.0.2 (2019/6/1) =
8897
* Changed: [Required WordPress version](https://github.com/technote-space/marker-animation/issues/141)

‎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/cache",
198-
"version": "v0.0.13",
199-
"version_normalized": "0.0.13.0",
198+
"version": "v0.0.14",
199+
"version_normalized": "0.0.14.0",
200200
"source": {
201201
"type": "git",
202202
"url": "https://github.com/wp-content-framework/cache.git",
203-
"reference": "5b030c44f058a2d974184ec3b0a74446ab5957cd"
203+
"reference": "4be84fde18ed0e9cbb755f75240f537c5755cc4b"
204204
},
205205
"dist": {
206206
"type": "zip",
207-
"url": "https://api.github.com/repos/wp-content-framework/cache/zipball/5b030c44f058a2d974184ec3b0a74446ab5957cd",
208-
"reference": "5b030c44f058a2d974184ec3b0a74446ab5957cd",
207+
"url": "https://api.github.com/repos/wp-content-framework/cache/zipball/4be84fde18ed0e9cbb755f75240f537c5755cc4b",
208+
"reference": "4be84fde18ed0e9cbb755f75240f537c5755cc4b",
209209
"shasum": ""
210210
},
211211
"require": {
@@ -215,7 +215,7 @@
215215
"phake/phake": "~2.0",
216216
"phpunit/phpunit": "~5.7"
217217
},
218-
"time": "2019-05-19T15:07:48+00:00",
218+
"time": "2019-06-02T18:27:50+00:00",
219219
"type": "library",
220220
"installation-source": "dist",
221221
"notification-url": "https://packagist.org/downloads/",
@@ -371,17 +371,17 @@
371371
},
372372
{
373373
"name": "wp-content-framework/custom_post",
374-
"version": "v0.0.36",
375-
"version_normalized": "0.0.36.0",
374+
"version": "v0.0.37",
375+
"version_normalized": "0.0.37.0",
376376
"source": {
377377
"type": "git",
378378
"url": "https://github.com/wp-content-framework/custom_post.git",
379-
"reference": "b6a852cab7810bdffb965cb5e59d71515d634992"
379+
"reference": "3f755799c75fdbdcc1f8eaf2b5dad8cdff67778d"
380380
},
381381
"dist": {
382382
"type": "zip",
383-
"url": "https://api.github.com/repos/wp-content-framework/custom_post/zipball/b6a852cab7810bdffb965cb5e59d71515d634992",
384-
"reference": "b6a852cab7810bdffb965cb5e59d71515d634992",
383+
"url": "https://api.github.com/repos/wp-content-framework/custom_post/zipball/3f755799c75fdbdcc1f8eaf2b5dad8cdff67778d",
384+
"reference": "3f755799c75fdbdcc1f8eaf2b5dad8cdff67778d",
385385
"shasum": ""
386386
},
387387
"require": {
@@ -395,7 +395,7 @@
395395
"phake/phake": "~2.0",
396396
"phpunit/phpunit": "~5.7"
397397
},
398-
"time": "2019-05-26T12:38:53+00:00",
398+
"time": "2019-06-02T13:37:17+00:00",
399399
"type": "library",
400400
"installation-source": "dist",
401401
"notification-url": "https://packagist.org/downloads/",

0 commit comments

Comments
 (0)