Skip to content

Commit

Permalink
Update from vk-blocks-pro
Browse files Browse the repository at this point in the history
  • Loading branch information
@vektorinc
vektorinc committed Oct 21, 2024
1 parent 4a08ddd commit b575559
Show file tree
Hide file tree
Showing 13 changed files with 170 additions and 95 deletions.
1 change: 1 addition & 0 deletions inc/vk-components/package/_scss/_vk-post-type-card.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ https://github.com/vektor-inc/vektor-wp-libraries
.card-body {
height: 100%;
padding-bottom: 1.5em;
box-sizing:border-box;
}
}

Expand Down
24 changes: 13 additions & 11 deletions inc/vk-components/package/class-vk-component-posts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* VK Components Posts
*
* @package VK Component
* @version 1.6.0
* @version 1.6.1
*
* *********************** CAUTION ***********************
* The original of this file is located at:
Expand Down Expand Up @@ -136,14 +136,12 @@ public static function get_loop( $wp_query, $options, $loop_options = array() )
$loop_outer_class_post_types = array();
if ( ! isset( $wp_query->query['post_type'] ) ) {
$loop_outer_class_post_types[] = 'vk_posts-postType-post';
} else {
if ( is_array( $wp_query->query['post_type'] ) ) {
foreach ( $wp_query->query['post_type'] as $key => $value ) {
$loop_outer_class_post_types[] = 'vk_posts-postType-' . $value;
}
} else {
$loop_outer_class_post_types[] = 'vk_posts-postType-' . $wp_query->query['post_type'];
} elseif ( is_array( $wp_query->query['post_type'] ) ) {
foreach ( $wp_query->query['post_type'] as $key => $value ) {
$loop_outer_class_post_types[] = 'vk_posts-postType-' . $value;
}
} else {
$loop_outer_class_post_types[] = 'vk_posts-postType-' . $wp_query->query['post_type'];
}

$loop_outer_class_post_types[] = 'vk_posts-layout-' . $options['layout'];
Expand Down Expand Up @@ -207,7 +205,7 @@ public static function get_loop( $wp_query, $options, $loop_options = array() )
$vk_posts_loop_item_count = 0;

while ( $wp_query->have_posts() ) {
$vk_posts_loop_item_count++;
++$vk_posts_loop_item_count;

$wp_query->the_post();
global $post;
Expand Down Expand Up @@ -716,12 +714,16 @@ public static function get_view_body( $post, $options ) {
}
if ( $taxonomies ) {
$html .= '<div class="vk_post_taxonomies">';

// 各タクソノミーの処理
$taxonomies_html = '';
foreach ( $taxonomies as $key => $value ) {
$html .= '<dl class="vk_post_taxonomy vk_post_taxonomy-' . $key . '">' . $value . '</dl>';
$taxonomies_html .= '<dl class="vk_post_taxonomy vk_post_taxonomy-' . $key . '">' . $value . '</dl>';
} // foreach

$html .= apply_filters( 'vk_post_taxonomies_html', $taxonomies_html );
$html .= '</div>';
}

}

$html .= apply_filters( 'vk_post_taxonomies_after', '' );
Expand Down
2 changes: 1 addition & 1 deletion inc/vk-components/package/css/vk-components.css
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions languages/vk-blocks-pro-js.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1247,13 +1247,13 @@ msgid "Setting up a link"
msgstr ""

#: src/blocks/_pro/dynamic-text/edit.js:389
#: src/blocks/_pro/gridcolcard-item/edit.js:346
#: src/blocks/_pro/gridcolcard-item/edit.js:353
#: src/blocks/_pro/icon-card-item/edit.js:128
#: src/blocks/button/edit.js:283
#: src/blocks/icon/edit.js:306
#: src/blocks/pr-blocks/edit.js:262
#: src/blocks/pr-content/edit.js:131
#: src/components/link-toolbar/index.js:288
#: src/components/link-toolbar/index.js:293
msgid "Open link new tab."
msgstr ""

Expand Down Expand Up @@ -1456,63 +1456,63 @@ msgstr ""
msgid "You can create a variety of layouts with grid column card blocks."
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:242
#: src/blocks/_pro/gridcolcard-item/edit.js:249
#: src/blocks/_pro/select-post-list-item/edit.js:66
#: src/blocks/button/edit.js:249
#: src/components/link-toolbar/index.js:247
#: src/components/link-toolbar/index.js:252
msgid "Unlink"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:243
#: src/blocks/_pro/gridcolcard-item/edit.js:250
#: src/blocks/button/edit.js:250
#: src/components/link-toolbar/index.js:248
#: src/components/link-toolbar/index.js:253
msgid "Input Link URL"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:273
#: src/blocks/_pro/gridcolcard-item/edit.js:280
#: src/blocks/_pro/select-post-list-item/edit.js:102
#: src/blocks/button/edit.js:278
#: src/components/link-toolbar/index.js:282
#: src/components/link-toolbar/index.js:287
msgid "Submit"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:297
#: src/blocks/_pro/gridcolcard-item/edit.js:304
msgid "Edit mode"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:307
#: src/blocks/_pro/gridcolcard-item/edit.js:314
msgid "All columns"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:315
#: src/blocks/_pro/gridcolcard-item/edit.js:322
msgid "This column only"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:320
#: src/blocks/_pro/gridcolcard-item/edit.js:327
msgid "Edit Lock"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:323
#: src/blocks/_pro/gridcolcard-item/edit.js:330
msgid "Lock edits this block from the parent and other Grid Column Item block"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:334
#: src/blocks/_pro/gridcolcard-item/edit.js:341
msgid "Column Setting"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:338
#: src/blocks/_pro/gridcolcard-item/edit.js:345
#: src/blocks/_pro/icon-card-item/edit.js:120
#: src/blocks/pr-blocks/edit.js:254
msgid "Link URL:"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:353
#: src/blocks/_pro/gridcolcard-item/edit.js:360
msgid ""
"If you set a link URL, do not place the link element (text or button) in "
"the Grid Column Card Item. It may not be displayed correctly."
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:357
#: src/blocks/_pro/gridcolcard-item/edit.js:364
msgid "Make sure that no link is specified for the image block, etc."
msgstr ""

Expand Down Expand Up @@ -3322,23 +3322,23 @@ msgstr ""
msgid "Link target"
msgstr ""

#: src/components/link-toolbar/index.js:28
#: src/components/link-toolbar/index.js:31
msgid "Currently selected"
msgstr ""

#: src/components/link-toolbar/index.js:317
#: src/components/link-toolbar/index.js:322
msgid "Link copied to clipboard."
msgstr ""

#: src/components/link-toolbar/index.js:66
#: src/components/link-toolbar/index.js:69
msgid "Deleting Link"
msgstr ""

#: src/components/link-toolbar/index.js:76
#: src/components/link-toolbar/index.js:79
msgid "Copy link: %s"
msgstr ""

#: src/components/link-toolbar/index.js:83
#: src/components/link-toolbar/index.js:86
msgid "Copy link"
msgstr ""

Expand Down
50 changes: 25 additions & 25 deletions languages/vk-blocks-pro.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# This file is distributed under the same license as the VK Blocks Pro plugin.
msgid ""
msgstr ""
"Project-Id-Version: VK Blocks Pro 1.86.0.0\n"
"Project-Id-Version: VK Blocks Pro 1.87.0.0\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/vk-blocks-pro\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2024-10-08T14:42:00+00:00\n"
"POT-Creation-Date: 2024-10-21T14:55:12+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.10.0\n"
"X-Domain: vk-blocks-pro\n"
Expand Down Expand Up @@ -1252,13 +1252,13 @@ msgid "Setting up a link"
msgstr ""

#: src/blocks/_pro/dynamic-text/edit.js:389
#: src/blocks/_pro/gridcolcard-item/edit.js:346
#: src/blocks/_pro/gridcolcard-item/edit.js:353
#: src/blocks/_pro/icon-card-item/edit.js:128
#: src/blocks/button/edit.js:283
#: src/blocks/icon/edit.js:306
#: src/blocks/pr-blocks/edit.js:262
#: src/blocks/pr-content/edit.js:131
#: src/components/link-toolbar/index.js:288
#: src/components/link-toolbar/index.js:293
msgid "Open link new tab."
msgstr ""

Expand Down Expand Up @@ -1459,61 +1459,61 @@ msgstr ""
msgid "You can create a variety of layouts with grid column card blocks."
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:242
#: src/blocks/_pro/gridcolcard-item/edit.js:249
#: src/blocks/_pro/select-post-list-item/edit.js:66
#: src/blocks/button/edit.js:249
#: src/components/link-toolbar/index.js:247
#: src/components/link-toolbar/index.js:252
msgid "Unlink"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:243
#: src/blocks/_pro/gridcolcard-item/edit.js:250
#: src/blocks/button/edit.js:250
#: src/components/link-toolbar/index.js:248
#: src/components/link-toolbar/index.js:253
msgid "Input Link URL"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:273
#: src/blocks/_pro/gridcolcard-item/edit.js:280
#: src/blocks/_pro/select-post-list-item/edit.js:102
#: src/blocks/button/edit.js:278
#: src/components/link-toolbar/index.js:282
#: src/components/link-toolbar/index.js:287
msgid "Submit"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:297
#: src/blocks/_pro/gridcolcard-item/edit.js:304
msgid "Edit mode"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:307
#: src/blocks/_pro/gridcolcard-item/edit.js:314
msgid "All columns"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:315
#: src/blocks/_pro/gridcolcard-item/edit.js:322
msgid "This column only"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:320
#: src/blocks/_pro/gridcolcard-item/edit.js:327
msgid "Edit Lock"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:323
#: src/blocks/_pro/gridcolcard-item/edit.js:330
msgid "Lock edits this block from the parent and other Grid Column Item block"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:334
#: src/blocks/_pro/gridcolcard-item/edit.js:341
msgid "Column Setting"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:338
#: src/blocks/_pro/gridcolcard-item/edit.js:345
#: src/blocks/_pro/icon-card-item/edit.js:120
#: src/blocks/pr-blocks/edit.js:254
msgid "Link URL:"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:353
#: src/blocks/_pro/gridcolcard-item/edit.js:360
msgid "If you set a link URL, do not place the link element (text or button) in the Grid Column Card Item. It may not be displayed correctly."
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:357
#: src/blocks/_pro/gridcolcard-item/edit.js:364
msgid "Make sure that no link is specified for the image block, etc."
msgstr ""

Expand Down Expand Up @@ -3315,23 +3315,23 @@ msgstr ""
msgid "Link target"
msgstr ""

#: src/components/link-toolbar/index.js:28
#: src/components/link-toolbar/index.js:31
msgid "Currently selected"
msgstr ""

#: src/components/link-toolbar/index.js:317
#: src/components/link-toolbar/index.js:322
msgid "Link copied to clipboard."
msgstr ""

#: src/components/link-toolbar/index.js:66
#: src/components/link-toolbar/index.js:69
msgid "Deleting Link"
msgstr ""

#: src/components/link-toolbar/index.js:76
#: src/components/link-toolbar/index.js:79
msgid "Copy link: %s"
msgstr ""

#: src/components/link-toolbar/index.js:83
#: src/components/link-toolbar/index.js:86
msgid "Copy link"
msgstr ""

Expand Down Expand Up @@ -3680,6 +3680,7 @@ msgid "PC size"
msgstr ""

#: src/extensions/core/table/style.js:41
#: dist/vk-blocks-pro/inc/vk-blocks/view/class-vk-blocks-scrollhintrenderer.php:72
#: inc/vk-blocks/view/class-vk-blocks-scrollhintrenderer.php:72
msgid "You can scroll"
msgstr ""
Expand Down Expand Up @@ -3857,7 +3858,6 @@ msgstr ""
msgid "Installing Plugin: %s"
msgstr ""

#. translators: %s = plugin name.
#: dist/vk-blocks-pro/inc/tgm-plugin-activation/tgm-config.php:76
#: inc/tgm-plugin-activation/tgm-config.php:76
msgid "Something went wrong with the plugin API."
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"dist": "composer install --no-dev && npm run build && npm run clean:dist && npm run create:dist-dir && npm run copy:files && composer install",
"prebuild": "rimraf ./inc/vk-blocks/build/*",
"build:dev": "composer install && gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --mode=development && gulp build:dev:pro",
"build": "gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress && gulp build:pro && npm run build:js && npm run translate",
"build:dev:cache": "composer install && gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --mode=development --env enableCache=true && gulp build:dev:pro",
"build:cache": "composer install && gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --env enableCache=true && gulp build:pro && npm run translate",
"build": "gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --mode=production && gulp build:pro && npm run build:js && npm run translate",
"build:cache": "composer install && gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --mode=development --env enableCache=true && gulp build:dev:pro",
"build:dev:cache": "npm run build:cache",
"build:free": "gulp text-domain-free && wp-scripts build --webpack-copy-php --config webpack.config.js && gulp build:free && npm run build:js",
"build:pot": "wp i18n make-pot --merge=languages/vk-blocks-pro-js.pot --skip-js . languages/vk-blocks-pro.pot",
"translate": "npm run build:pot && npm run translate:block && npm run translate:admin && cd languages && wp i18n make-php . && cd ../",
Expand Down
10 changes: 8 additions & 2 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link:
Tags: Gutenberg,FAQ,alert
Requires at least: 6.3
Tested up to: 6.6
Stable tag: 1.86.1.0
Stable tag: 1.87.0.1
Requires PHP: 7.4
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -106,6 +106,12 @@ e.g.

== Changelog ==

= 1.88.0 =
[ Specification change ][ Grid Column Card (Pro) ] Changed the default settings of headerDisplay and footerDisplay from "Delete" to "Display".
[ Specification change ] Add filter vk_post_taxonomies_html ( Update VK Components 1.6.1 )
[ Bug fix ][ Link Component ] Fix adding "http://" with "tel:" and "mailto:" link.
[ Bug fix ][ Slider ] Fix an issue where full width alignment does not work in tt4 and tt5.

= 1.87.0 =
[ Add function ][ Link Toolbar ] Added to skip retrieving metadata (title and favicon) for external links in link toolbar to prevent CORS errors.
[ Add function ][ icon ] Add toolbar link for components.
Expand Down Expand Up @@ -1793,4 +1799,4 @@ First release

== Upgrade Notice ==

Nothing.
Nothing.
1 change: 0 additions & 1 deletion src/blocks/slider/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/*-------------------------------------------*/
.vk_slider {
//共通ではないためvk_sliderの中に格納
width: 100%;
height: auto; //100%だとサイトエディター画面でおかしくなるのでautoに
position: relative;
&_item {
Expand Down
Loading

0 comments on commit b575559

Please sign in to comment.