Including the p5js file as a local dependency.

mapk · Feb 7, 2019 · 65a04ba · 65a04ba
1 parent 432cf0f
commit 65a04ba
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 151 deletions.
diff --git a/assets/iframe-sizer.js → assets/js/iframe-sizer.js b/assets/iframe-sizer.js → assets/js/iframe-sizer.js
diff --git a/assets/js/p5.min.js b/assets/js/p5.min.js
diff --git a/dist/blocks.build.js b/dist/blocks.build.js
diff --git a/dist/blocks.editor.build.css b/dist/blocks.editor.build.css
diff --git a/dist/blocks.style.build.css b/dist/blocks.style.build.css
@@ -1,16 +1 @@
-/**
- * #.# Common SCSS
- *
- * Can include things like variables and mixins
- * that are used across the project.
-*/
-/**
- * #.# Styles
- *
- * CSS for both Frontend+Backend.
- */
-.wp-block-cgb-block-p5js iframe {
-  padding: 0;
-  margin: 0;
-  width: 100%;
-  border: none; }
+.wp-block-cgb-block-p5js iframe{padding:0;margin:0;width:100%;border:none}
diff --git a/src/block/block.js b/src/block/block.js
@@ -75,7 +75,7 @@ registerBlockType( 'cgb/block-p5js', {
 				{ ( isDisabled ) => (
 					( isPreview || isDisabled ) ? (
 						<SandBox html={
-							'<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.7.2/p5.min.js"></script>' +
+							'<script src="' + window._p5ScriptUrl + '"></script>' +
 							'<script>' + attributes.content + '</script>'
 						} />
 					) : (

diff --git a/src/init.php b/src/init.php
@@ -31,7 +31,7 @@ function p5js_cgb_block_assets() { // phpcs:ignore
     if ( ! is_admin() ) {
         wp_enqueue_script(
             'p5-js-iframe-sizer-script', // Handle.
-            plugins_url( '/assets/iframe-sizer.js', dirname( __FILE__ ) ),
+            plugins_url( '/assets/js/iframe-sizer.js', dirname( __FILE__ ) ),
             array( 'jquery', 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-editor' ), // Dependencies, defined above.
             // filemtime( plugin_dir_path( __DIR__ ) . 'assets/js/p5.min.js' ), // Version: File modification time.
             true // Enqueue the script in the footer.
@@ -61,6 +61,8 @@ function p5js_cgb_editor_assets() { // phpcs:ignore
         true // Enqueue the script in the footer.
     );
 
+    wp_add_inline_script( 'p5js-cgb-block-js', 'window._p5ScriptUrl = "' . plugins_url( '/assets/js/p5.min.js', dirname( __FILE__ ) ) . '";' );
+
     // Styles.
     wp_enqueue_style(
         'p5js-cgb-block-editor-css', // Handle.
@@ -75,7 +77,7 @@ function p5js_cgb_editor_assets() { // phpcs:ignore
 
 function p5js_cgb__render_block( $attributes, $content ) {
     $scriptsAndStyles = [
-        '<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.7.2/p5.js"></script>',
+        '<script src="' . plugins_url( '/assets/js/p5.min.js', dirname( __FILE__ ) ) . '"></script>',
         '<script>' . $attributes['content'] . '</script>',
         '<style>body{margin: 0; padding: 0;}</style>'
     ];