Merge pull request #1434 from vektor-inc/env/vk_blocks_options/refactor

【マージ待ち】オプション値の処理を無料版に移動

bin/deploy-free.sh

@@ -24,7 +24,7 @@ mv vk-blocks/ vk-blocks-copy-target/
 # Cloneした無料版のディレクトリに移動
 cd ./vk-blocks-copy-target/
 # コピー先の トップディレクトリ を一旦削除
-rm -rf editor-css/* inc/* lib/* options-css/* src/*
+rm -rf editor-css/* inc/* lib/* options-css/* src/* test/*
 
 # プロ版のディレクトリに移動
 cd ../

inc/vk-blocks-pro/vk-blocks-pro-functions.php

@@ -8,9 +8,6 @@
 // Pro 用の管理画面を読み込み.
 require_once dirname( __FILE__ ) . '/admin-pro/admin-pro.php';
 
-require_once dirname( __FILE__ ) . '/class-vk-blocks-pro-options.php';
-VK_Blocks_Pro_Options::init();
-
 /**
  * Pro 専用のスクリプトの読み込み
  */

inc/vk-blocks/class-vk-blocks-options.php

@@ -35,15 +35,15 @@ private function __construct() {
 	 */
 	public static function options_scheme() {
 		$default_options_schema = array(
-			'balloon_border_width' => array(
+			'balloon_border_width'      => array(
 				'type'    => 'number',
 				'default' => 1,
 			),
-			'margin_unit'          => array(
+			'margin_unit'               => array(
 				'type'    => 'string',
 				'default' => 'rem',
 			),
-			'margin_size'          => array(
+			'margin_size'               => array(
 				'type'  => 'object',
 				'items' => array(
 					'xl' => array(
@@ -133,13 +133,24 @@ public static function options_scheme() {
 					),
 				),
 			),
-			'load_separate_option' => array(
+			'load_separate_option'      => array(
 				'type'    => 'boolean',
 				'default' => false,
 			),
+			'vk_blocks_pro_license_key' => array(
+				'type'    => 'string',
+				'default' => null,
+			),
+			'display_vk_block_template' => array(
+				'type'    => 'string',
+				'default' => 'display',
+			),
+			'new_faq_accordion'         => array(
+				'type'    => 'string',
+				'default' => 'disable',
+			),
 		);
-		$array                  = array_merge( $default_options_schema, apply_filters( 'vk_blocks_default_options_scheme', array() ) );
-		return $array;
+		return $default_options_schema;
 	}
 
 	/**