Version revert

NoorDigitalAgency · Nov 2, 2020 · a47aee9 · a47aee9
1 parent 182d6cf
commit a47aee9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 52 deletions.
diff --git a/blocks.php b/blocks.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name:     Noor Blocks
  * Description:     Collection of custom blocks.
- * Version: 				1.1.2
+ * Version: 				1.1.3
  * Author:          Noor Digital Agency
  * Author URI:      https://noordigital.com
  * Text Domain:     blocks

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors:
 Tags:              block
 Requires at least: 5.3.2
 Tested up to:      5.4.1
-Stable tag:        1.1.2
+Stable tag:        1.1.3
 Requires PHP:      7.0.0
 License:           GPL-2.0-or-later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
@@ -52,7 +52,7 @@ directory take precedence. For example, `/assets/screenshot-1.png` would win ove
 
 1. Added location icon to core/button
 
-* Patch 1.1.2
+* Patch 1.1.3
 
 1. Added global block control for media query display
 

diff --git a/src/components/controls.js b/src/components/controls.js
@@ -2,7 +2,6 @@ import { __ } from '@wordpress/i18n'
 import { PanelBody, ToggleControl } from '@wordpress/components'
 import { PanelColorSettings } from '@wordpress/block-editor'
 import { RadioGroup } from '../components/radio-group'
-import { Fragment } from '@wordpress/element'
 
 export const SmallScreenControl = ({ setAttributes, attributes: { mediaControl }}) => (
   <PanelBody
@@ -111,35 +110,3 @@ export const ButtonIconControl = ({ attributes: {useIcon, alignIcon, icon}, setA
     </PanelBody>
   );
 }
-
-export const ButtonAllControls = (props) => {
-
-  const { color, setColor, backgroundColor, setBackgroundColor, setAttributes } = props;
-
-  setAttributes({ className: color.class != undefined ? color.class + ' has-color' : '' });
-
-  setAttributes({ className: backgroundColor.class != undefined ? backgroundColor.class + ' has-background' : '' });
-
-  return (
-    <Fragment>
-      <PanelColorSettings
-        title={__('Color settings')}
-        initialOpen={false}
-        colorSettings={[
-          {
-            value: backgroundColor.color,
-            onChange: setBackgroundColor,
-            label: __( 'Button background color' )
-          }, 
-          {
-            value: color.color,
-            onChange: setColor,
-            label: __( 'Button text color' )
-          }
-        ]}
-      />
-
-      <ButtonIconControl {...props} />
-    </Fragment>
-  )
-}
diff --git a/src/filters/attributes.js b/src/filters/attributes.js
@@ -32,20 +32,6 @@ export const attributes = (settings, name) => {
     });
   }
 
-  // wp-bootstrap-blocks plugin
-  if ( 'wp-bootstrap-blocks/button' === name ) {
-
-    Object.assign(settings.attributes, {
-      ...inlineIconAttributes,
-      backgroundColor: {
-        type: 'string'
-      },
-      color: {
-        type: 'string'
-      }
-    })
-  }
-
   if ( 'core/column' === name ) {
 
     Object.assign(settings.attributes, {

diff --git a/src/filters/blockEdit.js b/src/filters/blockEdit.js
@@ -12,7 +12,7 @@ import {
 } from '../components/controls'
 
 export const blockEdit = compose(
-  withColors({ backgroundColor: 'background-color', color: 'color' }),
+  withColors({ backgroundColor: 'background-color' }),
   createHigherOrderComponent( BlockEdit => props => {
 
   if ( ! props.name.includes( 'noor' ) ) {
@@ -24,7 +24,6 @@ export const blockEdit = compose(
           <SmallScreenControl {...props} />
           {props.name === 'core/column' && <ColumnBackgrounControl {...props} />}
           {props.name === 'core/button' && <ButtonIconControl {...props} />}
-          {props.name === 'wp-bootstrap-blocks/button' && <ButtonAllControls {...props} />}
         </InspectorControls>
       </Fragment>
     )