Merge pull request #1502 from vektor-inc/develop

[ Change version ] 1.47.0.0
vektor-inc · Dec 2, 2022 · 4e52c5a · 4e52c5a
2 parents 2412cf5 + b9567b9
commit 4e52c5a
Show file tree

Hide file tree

Showing 73 changed files with 161 additions and 252 deletions.
diff --git a/.github/workflows/release-vws.yml b/.github/workflows/release-vws.yml
@@ -64,7 +64,7 @@ jobs:
     # [ End ] pre_ リリース と 本リリースで同じ処理 ##########################################
 
     - name: rsync deployments
-      uses: burnett01/rsync-deployments@4.1
+      uses: burnett01/rsync-deployments@5.2.1
       with:
         switches: -avzr
         path: ${{ env.plugin_name }}.zip
@@ -73,3 +73,4 @@ jobs:
         remote_port: ${{ secrets.DEPLOY_PORT_VWS }}
         remote_user: ${{ secrets.DEPLOY_USER_VWS }}
         remote_key: ${{ secrets.DEPLOY_KEY_VWS }}
+        remote_key_pass: ${{ secrets.DEPLOY_KEYPASS_VWS }}
diff --git a/editor-css/_editor_before.scss b/editor-css/_editor_before.scss
@@ -7,7 +7,6 @@
 }
 .editor-block-list-item-vk-blocks-select-post-list:after,
 .editor-block-list-item-vk-blocks-accordion:after,
-.editor-block-list-item-vk-blocks-slider:after,
 .editor-block-list-item-vk-blocks-animation:after,
 .editor-block-list-item-vk-blocks-breadcrumb:after,
 .editor-block-list-item-vk-blocks-button-outer:after,

diff --git a/gulpfile.js b/gulpfile.js
@@ -37,6 +37,10 @@ gulp.task('helper-js', (done) => {
 		.pipe(uglify())
 		.pipe(rename('vk-faq2.min.js'))
 		.pipe(gulp.dest('./build/'));
+	gulp.src('src/blocks/slider/view.js')
+		.pipe(uglify())
+		.pipe(rename('vk-slider.min.js'))
+		.pipe(gulp.dest('./build/'));
 	done();
 });
 
@@ -49,10 +53,6 @@ gulp.task('helper-js-pro', (done) => {
 		.pipe(uglify())
 		.pipe(rename('vk-animation.min.js'))
 		.pipe(gulp.dest('./build/'));
-	gulp.src('src/blocks/_pro/slider/view.js')
-		.pipe(uglify())
-		.pipe(rename('vk-slider.min.js'))
-		.pipe(gulp.dest('./build/'));
 	done();
 });
 

diff --git a/inc/vk-blocks-config.php b/inc/vk-blocks-config.php
@@ -48,13 +48,7 @@
 	}
 
 	require_once plugin_dir_path( __FILE__ ) . 'admin-notices.php';
-
 	require_once plugin_dir_path( __FILE__ ) . 'vk-blocks/vk-blocks-functions.php';
-
-	require_once plugin_dir_path( __FILE__ ) . 'vk-blocks/App/RestAPI/BlockMeta/class-vk-blocks-entrypoint.php';
-	// BlockMeta用のAPIルートを設定.
-	new Vk_Blocks_EntryPoint();
-
 	// プロ版の設定ファイルを読み込み.
 	if ( file_exists( plugin_dir_path( __FILE__ ) . 'vk-blocks-pro-config.php' ) ) {
 		require_once plugin_dir_path( __FILE__ ) . 'vk-blocks-pro-config.php';

diff --git a/inc/vk-blocks-pro/vk-blocks-pro-functions.php b/inc/vk-blocks-pro/vk-blocks-pro-functions.php
@@ -29,11 +29,5 @@ function vk_blocks_pro_load_scripts() {
 
 	// Animation Block
 	wp_enqueue_script( 'vk-blocks-animation', VK_BLOCKS_DIR_URL . 'build/vk-animation.min.js', array(), VK_BLOCKS_VERSION, true );
-
-	// Slider Block
-	global $vk_swiper_url;
-	wp_enqueue_style( 'vk-swiper-style', $vk_swiper_url . 'assets/css/swiper.min.css', array(), SWIPER_VERSION );
-
-	wp_enqueue_script( 'vk-blocks-slider', VK_BLOCKS_DIR_URL . 'build/vk-slider.min.js', array( 'vk-swiper-script' ), VK_BLOCKS_VERSION, true );
 }
 add_action( 'wp_enqueue_scripts', 'vk_blocks_pro_load_scripts' );
diff --git a/inc/vk-blocks/class-vk-blocks-global-settings.php b/inc/vk-blocks/class-vk-blocks-global-settings.php
@@ -93,6 +93,14 @@ public static function blocks() {
 				'name'   => 'pr-content',
 				'is_pro' => false,
 			),
+			array(
+				'name'   => 'slider',
+				'is_pro' => false,
+			),
+			array(
+				'name'   => 'slider-item',
+				'is_pro' => false,
+			),
 			array(
 				'name'   => 'spacer',
 				'is_pro' => false,
@@ -189,14 +197,6 @@ public static function blocks() {
 				'name'   => 'select-post-list-item',
 				'is_pro' => true,
 			),
-			array(
-				'name'   => 'slider',
-				'is_pro' => true,
-			),
-			array(
-				'name'   => 'slider-item',
-				'is_pro' => true,
-			),
 			array(
 				'name'   => 'step',
 				'is_pro' => true,

diff --git a/inc/vk-blocks/class-vk-blocks-print-css-variables.php b/inc/vk-blocks/class-vk-blocks-print-css-variables.php
@@ -38,13 +38,19 @@ public static function print_css() {
 	/**
 	 * 出力するCSSを生成
 	 *
+	 * --vk-color-primaryは非推奨css変数
+	 * cssカスタマイズしているユーザーのために残している
+	 *
+	 * @see https://github.com/vektor-inc/vk-color-palette-manager/pull/19
+	 *
 	 * @return string $dynamic_css 最小化したCSS
 	 */
 	public static function get_print_css() {
 		$dynamic_css = '
             :root {
                 --vk-size-text: 16px;
-				--vk-color-primary:#337ab7;
+                /* --vk-color-primary is deprecated. */
+                --vk-color-primary:#337ab7;
             }';
 
 		/*

diff --git a/inc/vk-blocks/languages/vk-blocks-js.pot b/inc/vk-blocks/languages/vk-blocks-js.pot
@@ -125,23 +125,20 @@ msgstr ""
 
 #: src/admin/margin.js:41
 #: src/blocks/_pro/outer/edit.js:638
-#: src/blocks/_pro/slider/edit.js:224
 #: src/blocks/button/edit.js:526
 #: src/components/advanced-viewport-control/index.js:25
 msgid "PC"
 msgstr ""
 
 #: src/admin/margin.js:45
 #: src/blocks/_pro/outer/edit.js:623
-#: src/blocks/_pro/slider/edit.js:235
 #: src/blocks/button/edit.js:461
 #: src/components/advanced-viewport-control/index.js:31
 msgid "Tablet"
 msgstr ""
 
 #: src/admin/margin.js:49
 #: src/blocks/_pro/outer/edit.js:608
-#: src/blocks/_pro/slider/edit.js:246
 #: src/blocks/button/edit.js:396
 #: src/components/advanced-viewport-control/index.js:39
 msgid "Mobile"
@@ -262,7 +259,6 @@ msgid "Short"
 msgstr ""
 
 #: src/blocks/_pro/animation/edit.js:130
-#: src/blocks/_pro/slider/edit.js:201
 #: src/blocks/balloon/edit.js:489
 #: src/blocks/button/edit.js:319
 #: src/blocks/faq/index.js:26
@@ -459,7 +455,6 @@ msgid "Image Height"
 msgstr ""
 
 #: src/blocks/_pro/card/edit.js:88
-#: src/blocks/_pro/slider/edit.js:220
 msgid "Slide Height for each device."
 msgstr ""
 
@@ -510,7 +505,6 @@ msgstr ""
 
 #: src/blocks/_pro/grid-column-item/edit.js:140
 #: src/blocks/_pro/outer/edit.js:370
-#: src/blocks/_pro/slider-item/edit.js:120
 msgid "Padding (Left and Right)"
 msgstr ""
 
@@ -623,7 +617,6 @@ msgid "Display"
 msgstr ""
 
 #: src/blocks/_pro/gridcolcard/edit-common.js:147
-#: src/blocks/_pro/slider/edit.js:374
 #: src/blocks/heading/edit.js:374
 msgid "Hide"
 msgstr ""
@@ -764,40 +757,33 @@ msgid "Text"
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:262
-#: src/blocks/_pro/slider-item/edit.js:167
 msgid "Background Setting"
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:267
-#: src/blocks/_pro/slider-item/edit.js:171
 #: src/blocks/pr-content/edit.js:67
 msgid "Color Setting"
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:268
-#: src/blocks/_pro/slider-item/edit.js:173
 msgid ""
 "Color will overcome background image. If you want to display image, set "
 "opacity 0."
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:276
-#: src/blocks/_pro/slider-item/edit.js:181
 msgid "Opacity Setting"
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:290
-#: src/blocks/_pro/slider-item/edit.js:216
 msgid "Background Image PC"
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:306
-#: src/blocks/_pro/slider-item/edit.js:232
 msgid "Background Image Tablet"
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:316
-#: src/blocks/_pro/slider-item/edit.js:242
 msgid "Background Image Mobile"
 msgstr ""
 
@@ -822,13 +808,11 @@ msgid "Parallax (Non-guaranteed)"
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:364
-#: src/blocks/_pro/slider-item/edit.js:115
 #: src/blocks/pr-content/edit.js:229
 msgid "Layout Setting"
 msgstr ""
 
 #: src/blocks/_pro/outer/edit.js:367
-#: src/blocks/_pro/slider/edit.js:192
 #: src/blocks/balloon/edit.js:515
 msgid "Width"
 msgstr ""
@@ -1072,127 +1056,6 @@ msgstr ""
 msgid "Input Internal Post URL"
 msgstr ""
 
-#: src/blocks/_pro/slider-item/edit.js:124
-msgid "Fit to the Container area"
-msgstr ""
-
-#: src/blocks/_pro/slider-item/edit.js:131
-msgid "Add padding to the Slider area"
-msgstr ""
-
-#: src/blocks/_pro/slider-item/edit.js:138
-msgid "Remove padding from the Slider area"
-msgstr ""
-
-#: src/blocks/_pro/slider-item/edit.js:153
-msgid "Vertical align"
-msgstr ""
-
-#: src/blocks/_pro/slider-item/edit.js:195
-msgid "Background Image Size"
-msgstr ""
-
-#: src/blocks/_pro/slider-item/edit.js:202
-msgid "cover"
-msgstr ""
-
-#: src/blocks/_pro/slider-item/edit.js:206
-msgid "repeat"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:114
-msgid "Multi-image Display Setting"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:118
-msgid "Display Multi Images per View"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:122
-msgid "Images per View"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:133
-msgid "Move Images per Slide"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:209
-msgid "Full Wide"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:215
-msgid "Height"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:259
-msgid "Slider Settings"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:263
-msgid "Effect "
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:273
-msgid "Slide"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:277
-msgid "Fade"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:284
-msgid "Loop "
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:294
-msgid "AutoPlay"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:304
-msgid "Stop AutoPlay when swipe"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:314
-msgid "Display Time"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:328
-msgid "Change Speed"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:342
-msgid "Pagination Type"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:353
-#: src/blocks/_pro/step-item/edit.js:134
-#: src/blocks/_pro/table-of-contents-new/edit.js:145
-#: src/blocks/_pro/timeline-item/edit.js:103
-#: src/blocks/heading/edit.js:264
-#: src/blocks/staff/edit.js:173
-#: src/extensions/core/heading/style.js:11
-#: src/extensions/core/list/style.js:152
-msgid "Default"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:357
-msgid "Number of slides"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:367
-msgid "Navigation Position"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:378
-#: src/blocks/button/edit.js:354
-#: src/components/display-items-control/index.js:127
-msgid "Center"
-msgstr ""
-
-#: src/blocks/_pro/slider/edit.js:382
-msgid "Bottom on Mobile device"
-msgstr ""
-
 #: src/blocks/_pro/step-item/edit.js:102
 #: src/blocks/_pro/timeline-item/edit.js:71
 #: src/blocks/border-box/edit.js:204
@@ -1215,6 +1078,16 @@ msgstr ""
 msgid "Outlined"
 msgstr ""
 
+#: src/blocks/_pro/step-item/edit.js:134
+#: src/blocks/_pro/table-of-contents-new/edit.js:145
+#: src/blocks/_pro/timeline-item/edit.js:103
+#: src/blocks/heading/edit.js:264
+#: src/blocks/staff/edit.js:173
+#: src/extensions/core/heading/style.js:11
+#: src/extensions/core/list/style.js:152
+msgid "Default"
+msgstr ""
+
 #: src/blocks/_pro/step-item/edit.js:78
 msgid "Step Mark"
 msgstr ""
@@ -1545,6 +1418,11 @@ msgstr ""
 msgid "Button Position:"
 msgstr ""
 
+#: src/blocks/button/edit.js:354
+#: src/components/display-items-control/index.js:127
+msgid "Center"
+msgstr ""
+
 #: src/blocks/button/edit.js:374
 msgid "Wide"
 msgstr ""

diff --git a/inc/vk-blocks/utils/array-merge.php b/inc/vk-blocks/utils/array-merge.php
@@ -24,7 +24,7 @@
 function vk_blocks_array_merge( $args, $defaults ) {
 	$merged = $defaults;
 	foreach ( $args as $key => $value ) {
-		if ( is_array( $value ) && isset( $defaults[ $key ] ) && is_array( $defaults[ $key ] ) ) {
+		if ( is_array( $value ) && isset( $defaults[ $key ] ) && is_array( $defaults[ $key ] ) && ! empty( $value ) ) {
 			$merged[ $key ] = vk_blocks_array_merge( $value, $defaults[ $key ] );
 		} else {
 			$merged[ $key ] = $value;