Skip to content

Commit

Permalink
Merge pull request #296 from publishpress/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
htmgarcia authored Feb 23, 2021
2 parents ece7346 + 2bcd34a commit e762b64
Show file tree
Hide file tree
Showing 6 changed files with 213 additions and 45 deletions.
6 changes: 3 additions & 3 deletions src/advanced-gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Plugin Name: PublishPress Blocks
* Plugin URI: https://publishpress.com/blocks/
* Description: Enhanced tools for Gutenberg editor
* Version: 2.5.5
* Tested up to: 5.6.1
* Version: 2.5.6
* Tested up to: 5.6.2
* Author: PublishPress
* Author URI: https://publishpress.com/
* License: GPL2
Expand Down Expand Up @@ -76,7 +76,7 @@ function advgb_show_error()
}

if (! defined('ADVANCED_GUTENBERG_VERSION')) {
define('ADVANCED_GUTENBERG_VERSION', '2.5.5');
define('ADVANCED_GUTENBERG_VERSION', '2.5.6');
}

if (! defined('ADVANCED_GUTENBERG_PLUGIN')) {
Expand Down
17 changes: 16 additions & 1 deletion src/assets/blocks/accordion/block.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,19 @@
},
save: function ( { attributes } ) {
const {
header,
headerBgColor,
headerTextColor,
headerIcon,
headerIconColor,
bodyBgColor,
bodyTextColor,
borderStyle,
borderWidth,
borderColor,
borderRadius,
marginBottom,
collapsedAll,
} = attributes;

return (
Expand Down Expand Up @@ -440,7 +452,10 @@
</div>
</div>
);
}
},
supports: {
inserter: false,
},
}
],
transforms: {
Expand Down
67 changes: 67 additions & 0 deletions src/assets/blocks/advaccordion/accordion.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -520,17 +520,84 @@
</div>
);
},
supports: {
anchor: true,
},
},
{
attributes: {
header: {
type: 'string',
default: 'Header text',
},
headerBgColor: {
type: 'string',
default: '#000',
},
headerTextColor: {
type: 'string',
default: '#eee',
},
headerIcon: {
type: 'string',
default: 'unfold',
},
headerIconColor: {
type: 'string',
default: '#fff',
},
bodyBgColor: {
type: 'string',
},
bodyTextColor: {
type: 'string',
},
borderStyle: {
type: 'string',
default: 'solid',
},
borderWidth: {
type: 'number',
default: 0,
},
borderColor: {
type: 'string',
},
borderRadius: {
type: 'number',
default: 2,
},
marginBottom: {
type: 'number',
default: 15,
},
collapsedAll: {
type: 'boolean',
default: false,
},
changed: {
type: 'boolean',
default: false,
},
rootBlockId: {
type: 'string',
default: ''
}
},
save: function ( { attributes } ) {
const {
header,
headerBgColor,
headerTextColor,
headerIcon,
headerIconColor,
bodyBgColor,
bodyTextColor,
borderStyle,
borderWidth,
borderColor,
borderRadius,
marginBottom,
} = attributes;

return (
Expand Down
154 changes: 118 additions & 36 deletions src/assets/blocks/blocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -5819,7 +5819,19 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
}),
save: function save(_ref2) {
var attributes = _ref2.attributes;
var borderWidth = attributes.borderWidth;
var header = attributes.header,
headerBgColor = attributes.headerBgColor,
headerTextColor = attributes.headerTextColor,
headerIcon = attributes.headerIcon,
headerIconColor = attributes.headerIconColor,
bodyBgColor = attributes.bodyBgColor,
bodyTextColor = attributes.bodyTextColor,
borderStyle = attributes.borderStyle,
borderWidth = attributes.borderWidth,
borderColor = attributes.borderColor,
borderRadius = attributes.borderRadius,
marginBottom = attributes.marginBottom,
collapsedAll = attributes.collapsedAll;


return React.createElement(
Expand Down Expand Up @@ -5867,6 +5879,9 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
React.createElement(InnerBlocks.Content, null)
)
);
},
supports: {
inserter: false
}
}],
transforms: {
Expand Down Expand Up @@ -6522,17 +6537,84 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
React.createElement(InnerBlocks.Content, null)
)
);
},
supports: {
anchor: true
}
}, {
attributes: {
header: {
type: 'string',
default: 'Header text'
},
headerBgColor: {
type: 'string',
default: '#000'
},
headerTextColor: {
type: 'string',
default: '#eee'
},
headerIcon: {
type: 'string',
default: 'unfold'
},
headerIconColor: {
type: 'string',
default: '#fff'
},
bodyBgColor: {
type: 'string'
},
bodyTextColor: {
type: 'string'
},
borderStyle: {
type: 'string',
default: 'solid'
},
borderWidth: {
type: 'number',
default: 0
},
borderColor: {
type: 'string'
},
borderRadius: {
type: 'number',
default: 2
},
marginBottom: {
type: 'number',
default: 15
},
collapsedAll: {
type: 'boolean',
default: false
},
changed: {
type: 'boolean',
default: false
},
rootBlockId: {
type: 'string',
default: ''
}
},
save: function save(_ref6) {
var attributes = _ref6.attributes;
var borderWidth = attributes.borderWidth;
var header = attributes.header,
headerBgColor = attributes.headerBgColor,
headerTextColor = attributes.headerTextColor,
headerIcon = attributes.headerIcon,
headerIconColor = attributes.headerIconColor,
bodyBgColor = attributes.bodyBgColor,
bodyTextColor = attributes.bodyTextColor,
borderStyle = attributes.borderStyle,
borderWidth = attributes.borderWidth,
borderColor = attributes.borderColor,
borderRadius = attributes.borderRadius,
marginBottom = attributes.marginBottom;


return React.createElement(
Expand Down Expand Up @@ -28220,40 +28302,40 @@ if (typeof wp !== 'undefined' && typeof wp.domReady !== 'undefined') {
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {

__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/0-adv-components/components.jsx */"./src/assets/blocks/0-adv-components/components.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/0-adv-components/icon-class.jsx */"./src/assets/blocks/0-adv-components/icon-class.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/accordion/block.jsx */"./src/assets/blocks/accordion/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advaccordion/accordion.jsx */"./src/assets/blocks/advaccordion/accordion.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advaccordion/block.jsx */"./src/assets/blocks/advaccordion/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advbutton/block.jsx */"./src/assets/blocks/advbutton/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advicon/block.jsx */"./src/assets/blocks/advicon/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advimage/block.jsx */"./src/assets/blocks/advimage/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advlist/block.jsx */"./src/assets/blocks/advlist/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advtable/block.jsx */"./src/assets/blocks/advtable/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advtabs/block.jsx */"./src/assets/blocks/advtabs/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advtabs/tab.jsx */"./src/assets/blocks/advtabs/tab.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/advvideo/block.jsx */"./src/assets/blocks/advvideo/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/columns/block.jsx */"./src/assets/blocks/columns/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/columns/column.jsx */"./src/assets/blocks/columns/column.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/contact-form/block.jsx */"./src/assets/blocks/contact-form/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/container/block.jsx */"./src/assets/blocks/container/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/count-up/block.jsx */"./src/assets/blocks/count-up/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/customstyles/custom-styles.jsx */"./src/assets/blocks/customstyles/custom-styles.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/editor-sidebar/sidebar.jsx */"./src/assets/blocks/editor-sidebar/sidebar.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/images-slider/block.jsx */"./src/assets/blocks/images-slider/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/infobox/block.jsx */"./src/assets/blocks/infobox/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/login-form/block.jsx */"./src/assets/blocks/login-form/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/map/block.jsx */"./src/assets/blocks/map/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/newsletter/block.jsx */"./src/assets/blocks/newsletter/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/recent-posts/block.jsx */"./src/assets/blocks/recent-posts/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/recent-posts/query-controls.jsx */"./src/assets/blocks/recent-posts/query-controls.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/search-bar/block.jsx */"./src/assets/blocks/search-bar/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/social-links/block.jsx */"./src/assets/blocks/social-links/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/summary/block.jsx */"./src/assets/blocks/summary/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/tabs/block.jsx */"./src/assets/blocks/tabs/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/testimonial/block.jsx */"./src/assets/blocks/testimonial/block.jsx");
__webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/blocks/woo-products/block.jsx */"./src/assets/blocks/woo-products/block.jsx");
module.exports = __webpack_require__(/*! /Users/valentingarcia/Github/Advanced-Gutenberg-Plugin/src/assets/js/editor.jsx */"./src/assets/js/editor.jsx");
__webpack_require__(/*! ./src/assets/blocks/0-adv-components/components.jsx */"./src/assets/blocks/0-adv-components/components.jsx");
__webpack_require__(/*! ./src/assets/blocks/0-adv-components/icon-class.jsx */"./src/assets/blocks/0-adv-components/icon-class.jsx");
__webpack_require__(/*! ./src/assets/blocks/accordion/block.jsx */"./src/assets/blocks/accordion/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/advaccordion/accordion.jsx */"./src/assets/blocks/advaccordion/accordion.jsx");
__webpack_require__(/*! ./src/assets/blocks/advaccordion/block.jsx */"./src/assets/blocks/advaccordion/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/advbutton/block.jsx */"./src/assets/blocks/advbutton/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/advicon/block.jsx */"./src/assets/blocks/advicon/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/advimage/block.jsx */"./src/assets/blocks/advimage/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/advlist/block.jsx */"./src/assets/blocks/advlist/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/advtable/block.jsx */"./src/assets/blocks/advtable/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/advtabs/block.jsx */"./src/assets/blocks/advtabs/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/advtabs/tab.jsx */"./src/assets/blocks/advtabs/tab.jsx");
__webpack_require__(/*! ./src/assets/blocks/advvideo/block.jsx */"./src/assets/blocks/advvideo/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/columns/block.jsx */"./src/assets/blocks/columns/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/columns/column.jsx */"./src/assets/blocks/columns/column.jsx");
__webpack_require__(/*! ./src/assets/blocks/contact-form/block.jsx */"./src/assets/blocks/contact-form/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/container/block.jsx */"./src/assets/blocks/container/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/count-up/block.jsx */"./src/assets/blocks/count-up/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/customstyles/custom-styles.jsx */"./src/assets/blocks/customstyles/custom-styles.jsx");
__webpack_require__(/*! ./src/assets/blocks/editor-sidebar/sidebar.jsx */"./src/assets/blocks/editor-sidebar/sidebar.jsx");
__webpack_require__(/*! ./src/assets/blocks/images-slider/block.jsx */"./src/assets/blocks/images-slider/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/infobox/block.jsx */"./src/assets/blocks/infobox/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/login-form/block.jsx */"./src/assets/blocks/login-form/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/map/block.jsx */"./src/assets/blocks/map/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/newsletter/block.jsx */"./src/assets/blocks/newsletter/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/recent-posts/block.jsx */"./src/assets/blocks/recent-posts/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/recent-posts/query-controls.jsx */"./src/assets/blocks/recent-posts/query-controls.jsx");
__webpack_require__(/*! ./src/assets/blocks/search-bar/block.jsx */"./src/assets/blocks/search-bar/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/social-links/block.jsx */"./src/assets/blocks/social-links/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/summary/block.jsx */"./src/assets/blocks/summary/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/tabs/block.jsx */"./src/assets/blocks/tabs/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/testimonial/block.jsx */"./src/assets/blocks/testimonial/block.jsx");
__webpack_require__(/*! ./src/assets/blocks/woo-products/block.jsx */"./src/assets/blocks/woo-products/block.jsx");
module.exports = __webpack_require__(/*! ./src/assets/js/editor.jsx */"./src/assets/js/editor.jsx");


/***/ })
Expand Down
10 changes: 7 additions & 3 deletions src/readme.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
=== PublishPress Blocks – Advanced Gutenberg Blocks, Permissions, Layouts, Forms ===
Contributors: publishpress, advancedgutenberg, JoomUnited
Contributors: publishpress, stevejburge, htmgarcia, advancedgutenberg, JoomUnited
Tags: gutenberg, gutenberg blocks, advanced gutenberg, editor, blocks
Requires at least: 5.0
Tested up to: 5.6.1
Stable tag: 2.5.5
Tested up to: 5.6.2
Stable tag: 2.5.6
Requires PHP: 5.6
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -125,6 +125,10 @@ The PublishPress Blocks Custom CSS can be created from the plugin configuration

== Changelog ==

= 2.5.6 =
* Fix: Bug in deprecation for Advanced Accordion block from v2.5.5
* Remove: Full path in compiled JavaScript

= 2.5.5 =
* Add: Bigger font-size for custom styles in new plugin installations
* Add: Newest version of Material Icons
Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ var path = require("path");
module.exports = [
{
entry: glob.sync(
path.join(__dirname, "src/assets/**/*.jsx"),
{ignore: [path.join(__dirname, "src/assets/blocks/**/*.frontend.jsx")]}
"./src/assets/**/*.jsx",
{ignore: ["./src/assets/blocks/**/*.frontend.jsx"]}
),
devtool: 'source-map',
output: {
Expand Down

0 comments on commit e762b64

Please sign in to comment.