Issue #31 - update many other blocks for InspectorControls

bobbingwide · Jan 8, 2020 · 56a720e · 56a720e
1 parent 064d735
commit 56a720e
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 26 deletions.
diff --git a/blocks/github/index.js b/blocks/github/index.js
@@ -3,7 +3,7 @@
  * 
  * Uses [github] shortcode from oik-bob-bing-wide plugin
  *
- * @copyright (C) Copyright Bobbing Wide 2018
+ * @copyright (C) Copyright Bobbing Wide 2018-2020
  * @author Herb Miller @bobbingwide
  */
 import './style.scss';

diff --git a/blocks/index.js b/blocks/index.js
@@ -5,7 +5,7 @@
  * The build directory is the target. 
  * See webpack.config.js
  * 
- * @copyright (C) Copyright Bobbing Wide 2018, 2019
+ * @copyright (C) Copyright Bobbing Wide 2018, 2019, 2020
  * @author Herb Miller @bobbingwide
  */
 import './github';	         // From oik-bob-bing-wide

diff --git a/blocks/oik-contact-form/index.js b/blocks/oik-contact-form/index.js
@@ -1,3 +1,11 @@
+/**
+ * Implements the Contact form block
+ *
+ * Equivalent to [bw_contact_form]
+ *
+ * @copyright (C) Copyright Bobbing Wide 2018, 2020
+ * @author Herb Miller @bobbingwide
+ */
 import './style.scss';
 import './editor.scss';
 
@@ -10,8 +18,10 @@ const { __ } = wp.i18n;
 const { 
 	registerBlockType, 
 	Editable,
-  InspectorControls,
  } = wp.blocks;
+const {
+    InspectorControls,
+} = wp.blockEditor;
 
 const {
   Toolbar,

diff --git a/blocks/oik-countdown/index.js b/blocks/oik-countdown/index.js
@@ -1,3 +1,12 @@
+/**
+ * Implements the Countdown block
+ *
+ * Equivalent to [bw_countdown]
+ *
+ *
+ * @copyright (C) Copyright Bobbing Wide 2019, 2020
+ * @author Herb Miller @bobbingwide
+ */
 import './style.scss';
 import './editor.scss';
 
@@ -12,7 +21,7 @@ const {
 
 const { 
   InspectorControls,
-} = wp.editor;
+} = wp.blockEditor;
 
 const {
   Toolbar,

diff --git a/blocks/oik-css/index.js b/blocks/oik-css/index.js
@@ -5,7 +5,7 @@
  *
  * Uses [bw_css] shortcode from oik-css plugin
  *
- * @copyright (C) Copyright Bobbing Wide 2018, 2019
+ * @copyright (C) Copyright Bobbing Wide 2018, 2019, 2020
  * @author Herb Miller @bobbingwide
  */
 import './style.scss';
@@ -20,10 +20,12 @@ const {
 
 const {
 	Editable,
-  InspectorControls,
 	PlainText,
 	ServerSideRender,
  } = wp.editor;
+const {
+	InspectorControls,
+} = wp.blockEditor;
 
 const {
   Toolbar,

diff --git a/blocks/oik-csv/index.js b/blocks/oik-csv/index.js
@@ -3,7 +3,7 @@
  *
  * Uses [bw_csv] shortcode from oik- plugin
  *
- * @copyright (C) Copyright Bobbing Wide 2018, 2019
+ * @copyright (C) Copyright Bobbing Wide 2018, 2019, 2020
  * @author Herb Miller @bobbingwide
  */
 import './style.scss';
@@ -22,9 +22,12 @@ const {
 	PlainText,
   AlignmentToolbar,
   BlockControls,
-  InspectorControls,
+
 	ServerSideRender,
  } = wp.editor;
+const {
+	InspectorControls,
+} = wp.blockEditor;
 
 const {
   Toolbar,

diff --git a/blocks/oik-dashicon/index.js b/blocks/oik-dashicon/index.js
@@ -3,7 +3,7 @@
  *
  * tries to use Dashicon component
  *
- * @copyright (C) Copyright Bobbing Wide 2019
+ * @copyright (C) Copyright Bobbing Wide 2019, 2020
  * @author Herb Miller @bobbingwide
  */
 //import './style.scss';
@@ -16,9 +16,11 @@ const {
     registerBlockType,
 } = wp.blocks;
 const {
-    InspectorControls,
     ServerSideRender,
 } = wp.editor;
+const {
+    InspectorControls,
+} = wp.blockEditor;
 
 const {
     Toolbar,

diff --git a/blocks/oik-fields/index.js b/blocks/oik-fields/index.js
@@ -8,7 +8,7 @@
  * - Not yet aware of the Fields associated with a CPT
  * - Does not require fields to be exposed in the REST API
  *
- * @copyright (C) Copyright Bobbing Wide 2018
+ * @copyright (C) Copyright Bobbing Wide 2018-2020
  * @author Herb Miller @bobbingwide
  */
 //import './style.scss';
@@ -21,9 +21,12 @@ const {
     registerBlockType,
 } = wp.blocks;
 const {
-    InspectorControls,
     ServerSideRender,
 } = wp.editor;
+const {
+    InspectorControls,
+} = wp.blockEditor;
+
 
 const {
     Toolbar,
@@ -91,6 +94,8 @@ export default registerBlockType(
             },
 
 
+        },
+        example: {
         },
         supports: {
             customClassName: false,

diff --git a/blocks/oik-follow-me/index.js b/blocks/oik-follow-me/index.js
@@ -3,7 +3,7 @@
  *
  *
  *
- * @copyright (C) Copyright Bobbing Wide 2018, 2019
+ * @copyright (C) Copyright Bobbing Wide 2018, 2019, 2020
  * @author Herb Miller @bobbingwide
  */
 import './style.scss';
@@ -23,8 +23,10 @@ const {
     PlainText,
     AlignmentToolbar,
     BlockControls,
-    InspectorControls,
 } = wp.editor;
+const {
+	InspectorControls,
+} = wp.blockEditor;
 
 const {
   Toolbar,

diff --git a/blocks/oik-geshi/index.js b/blocks/oik-geshi/index.js
@@ -3,7 +3,7 @@
  *
  * Uses [bw_geshi] shortcode from oik-css plugin
  *
- * @copyright (C) Copyright Bobbing Wide 2018
+ * @copyright (C) Copyright Bobbing Wide 2018-2020
  * @author Herb Miller @bobbingwide
  */
 //import './style.scss';
@@ -16,10 +16,12 @@ const {
     registerBlockType,
 } = wp.blocks;
 const {
-    InspectorControls,
     PlainText,
     ServerSideRender,
 } = wp.editor;
+const {
+    InspectorControls,
+} = wp.blockEditor;
 
 const {
     Toolbar,

diff --git a/blocks/oik-googlemap/index.js b/blocks/oik-googlemap/index.js
@@ -3,7 +3,7 @@
  * 
  * Uses [bw_show_googlemap] shortcode.
  *
- * @copyright (C) Copyright Bobbing Wide 2018
+ * @copyright (C) Copyright Bobbing Wide 2018-2020
  * @author Herb Miller @bobbingwide
  */
 

diff --git a/blocks/oik-nivo/index.js b/blocks/oik-nivo/index.js
@@ -3,7 +3,7 @@
  * 
  * Uses [nivo] shortcode.
  *
- * @copyright (C) Copyright Bobbing Wide 2018
+ * @copyright (C) Copyright Bobbing Wide 2018-2020
  * @author Herb Miller @bobbingwide
  */
 
@@ -22,8 +22,10 @@ const {
 
 const { 
 	Editable,
-  InspectorControls,
  } = wp.editor;
+const {
+	InspectorControls,
+} = wp.blockEditor;
 
 const {
   Toolbar,

diff --git a/blocks/oik-person/index.js b/blocks/oik-person/index.js
@@ -3,7 +3,7 @@
  *
  * - Depends on oik-user
  *
- * @copyright (C) Copyright Bobbing Wide 2018,2019
+ * @copyright (C) Copyright Bobbing Wide 2018,2019, 2020
  * @author Herb Miller @bobbingwide
  */
 
@@ -21,10 +21,13 @@ const {
 } = wp.blocks;
 const { 
 	Editable,
-  InspectorControls,
+
     InnerBlocks,
     ServerSideRender,
 } = wp.editor;
+const {
+    InspectorControls,
+} = wp.blockEditor;
 
 const {
   Toolbar,

diff --git a/blocks/oik-search/index.js b/blocks/oik-search/index.js
@@ -4,7 +4,7 @@
  * Originally intended to uses [bw_search] shortcode from oik-bob-bing-wide plugin
  * but it's much easier to use get_search_form... that's all that [bw_search] does.
  *
- * @copyright (C) Copyright Bobbing Wide 2018
+ * @copyright (C) Copyright Bobbing Wide 2018-2020
  * @author Herb Miller @bobbingwide
  */
 //import './style.scss';
@@ -17,9 +17,11 @@ const {
     registerBlockType,
 } = wp.blocks;
 const {
-    InspectorControls,
     ServerSideRender
 } = wp.editor;
+const {
+    InspectorControls,
+} = wp.blockEditor;
 
 const {
     Toolbar,
@@ -60,6 +62,8 @@ export default registerBlockType(
         attributes: {
 
 
+        },
+        example: {
         },
         supports: {
             customClassName: false,

diff --git a/blocks/oik-shortcode/index.js b/blocks/oik-shortcode/index.js
@@ -13,8 +13,10 @@ const {
 	PlainText,
   AlignmentToolbar,
   BlockControls,
-  InspectorControls,
  } = wp.editor;
+const {
+	InspectorControls,
+} = wp.blockEditor;
 
 const {
   Toolbar,

diff --git a/blocks/oik-uk-tides/index.js b/blocks/oik-uk-tides/index.js
@@ -6,7 +6,7 @@
  * - Supports easier to use parameter for specifying the location ( Port )
  * - Server side rendering when the block is not selected.
  *
- * @copyright (C) Copyright Bobbing Wide 2018
+ * @copyright (C) Copyright Bobbing Wide 2018-2020
  * @author Herb Miller @bobbingwide
  */
 //import './style.scss';
@@ -19,9 +19,11 @@ const {
     registerBlockType,
 } = wp.blocks;
 const {
-    InspectorControls,
     ServerSideRender,
 } = wp.editor;
+const {
+    InspectorControls,
+} = wp.blockEditor;
 
 const {
     Toolbar,