0.9.6 - fix lists and p tags

mapet68 · Jun 12, 2017 · b11d3a8 · b11d3a8
1 parent 1677b49
commit b11d3a8
Show file tree

Hide file tree

Showing 28 changed files with 1,713 additions and 68 deletions.
diff --git a/addons/breakout/blockade-breakout.php b/addons/breakout/blockade-breakout.php
@@ -4,11 +4,9 @@
  * Slug: blockade_breakout
  * Author: Burlington Bytes, LLC
  * Description: break out of the container to full width
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeBreakout') ) {
 	class BlockadeBreakout {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -32,11 +30,11 @@ private function __construct() {
 		// PUBLIC FUNCTIONS
 		public function enqueue_styles_and_scripts() {
 			wp_enqueue_script( 'jquery' );
-			wp_enqueue_script( 'blockade-breakout', $this->addon_dir_url . 'blockade-breakout.js', array('jquery'), $this->version );
+			wp_enqueue_script( 'blockade-breakout', $this->addon_dir_url . 'blockade-breakout.js', array('jquery'), WP_Blockade::$version );
 		}
 
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['blockade_breakout'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['blockade_breakout'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 	}

diff --git a/addons/breakout/plugin.js b/addons/breakout/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('blockade_breakout', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/button/blockade-button.php b/addons/button/blockade-button.php
@@ -4,11 +4,9 @@
  * Slug: button_block
  * Author: Burlington Bytes, LLC
  * Description: Insert Bootstrap buttons as block-level elements
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeButtonBlock') ) {
 	class BlockadeButtonBlock {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -28,7 +26,7 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['button_block'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['button_block'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 	}

diff --git a/addons/button/plugin.js b/addons/button/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('button_block', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/glyphicon/blockade-glyphicon.php b/addons/glyphicon/blockade-glyphicon.php
@@ -4,11 +4,9 @@
  * Slug: glyphicon_block
  * Author: Burlington Bytes, LLC
  * Description: Insert glyphicons directly as block-level elements
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeGlyphiconBlock') ) {
 	class BlockadeGlyphiconBlock {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -30,12 +28,12 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['glyphicon_block'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['glyphicon_block'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 		public function enqueue_styles() {
-			wp_enqueue_style( 'glyphicon-halflings', $this->addon_dir_url . 'font/glyphicons-halflings.css', array(), $this->version );
-			wp_enqueue_style( 'wp-blockade-glyphicon-styles', $this->addon_dir_url . 'styles.css', array(), $this->version );
+			wp_enqueue_style( 'glyphicon-halflings', $this->addon_dir_url . 'font/glyphicons-halflings.css', array(), WP_Blockade::$version );
+			wp_enqueue_style( 'wp-blockade-glyphicon-styles', $this->addon_dir_url . 'styles.css', array(), WP_Blockade::$version );
 		}
 		/*
 		// this should rarely be used

diff --git a/addons/glyphicon/plugin.js b/addons/glyphicon/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('glyphicon_block', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/image/blockade-image.php b/addons/image/blockade-image.php
@@ -4,11 +4,9 @@
  * Slug: image_block
  * Author: Burlington Bytes, LLC
  * Description: Insert images directly as block-level elements
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeImageBlock') ) {
 	class BlockadeImageBlock {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -29,7 +27,7 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['image_block'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['image_block'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 

diff --git a/addons/image/plugin.js b/addons/image/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('image_block', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/map/blockade-map.php b/addons/map/blockade-map.php
@@ -4,11 +4,9 @@
  * Slug: map_block
  * Author: Burlington Bytes, LLC
  * Description: Insert a Google map as a block-level element
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeMapBlock') ) {
 	class BlockadeMapBlock {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -29,11 +27,11 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['map_block'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['map_block'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 		public function enqueue_styles() {
-			wp_enqueue_style( 'wp-blockade-map-styles', $this->addon_dir_url . 'styles.css', array(), $this->version );
+			wp_enqueue_style( 'wp-blockade-map-styles', $this->addon_dir_url . 'styles.css', array(), WP_Blockade::$version );
 		}
 	}
 	BlockadeMapBlock::Instance();

diff --git a/addons/map/plugin.js b/addons/map/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('map_block', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/raw-html/blockade-raw-html.php b/addons/raw-html/blockade-raw-html.php
@@ -4,11 +4,9 @@
  * Slug: blockade_raw_html
  * Author: Burlington Bytes, LLC
  * Description: Create Raw HTML elements, and incorporate container and editable areas directly
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeRawHTML') ) {
 	class BlockadeRawHTML {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -29,7 +27,7 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['blockade_raw_html'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['blockade_raw_html'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 

diff --git a/addons/raw-html/editorstyles.css b/addons/raw-html/editorstyles.css
diff --git a/addons/raw-html/plugin.js b/addons/raw-html/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('blockade_raw_html', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/shortcode/blockade-shortcode.php b/addons/shortcode/blockade-shortcode.php
@@ -4,11 +4,9 @@
  * Slug: blockade_shortcode
  * Author: Burlington Bytes, LLC
  * Description: add shortcode blocks with live preview
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeShortcode') ) {
 	class BlockadeShortcode {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -29,7 +27,7 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['blockade_shortcode'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['blockade_shortcode'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 	}

diff --git a/addons/shortcode/plugin.js b/addons/shortcode/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('blockade_shortcode', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/sidebar/blockade-sidebar.php b/addons/sidebar/blockade-sidebar.php
@@ -4,11 +4,9 @@
  * Slug: blockade_sidebar
  * Author: Burlington Bytes, LLC
  * Description: create and embed widget areas
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeSidebar') ) {
 	class BlockadeSidebar {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -31,7 +29,7 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['blockade_sidebar'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['blockade_sidebar'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 		public function list_sidebars() {

diff --git a/addons/sidebar/plugin.js b/addons/sidebar/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('blockade_sidebar', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/simple-columns/blockade-simple-columns.php b/addons/simple-columns/blockade-simple-columns.php
@@ -4,11 +4,9 @@
  * Slug: simple_columns
  * Author: Burlington Bytes, LLC
  * Description: Create Raw HTML elements, and incorporate container and editable areas directly
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeSimpleColumns') ) {
 	class BlockadeSimpleColumns {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -29,7 +27,7 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['simple_columns'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['simple_columns'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 

diff --git a/addons/simple-columns/editorstyles.js b/addons/simple-columns/editorstyles.js
diff --git a/addons/simple-columns/plugin.js b/addons/simple-columns/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('simple_columns', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/sized-preview/blockade-sized-preview.php b/addons/sized-preview/blockade-sized-preview.php
@@ -4,11 +4,9 @@
  * Slug: blockade_sized_preview
  * Author: Burlington Bytes, LLC
  * Description: Preview the editor at different widths
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeSizedPreview') ) {
 	class BlockadeSizedPreview {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -31,7 +29,7 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['blockade_sized_preview'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['blockade_sized_preview'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 		public function wp_blockade_top_level_buttons( $buttons ) {

diff --git a/addons/sized-preview/plugin.js b/addons/sized-preview/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('blockade_sidebar', function(editor, url) {
 	// kill if older than IE8

diff --git a/addons/video/blockade-video.php b/addons/video/blockade-video.php
@@ -4,11 +4,9 @@
  * Slug: video_block
  * Author: Burlington Bytes, LLC
  * Description: Insert YouTube and Vimeo videos directly as block-level elements
- * Version: 0.9.5
  */
  if( !class_exists('BlockadeVideoBlock') ) {
 	class BlockadeVideoBlock {
-		private $version = 'v0.9.5';
 		private static $_this;
 		private $addon_dir;
 		private $addon_dir_url;
@@ -30,11 +28,11 @@ private function __construct() {
 		}
 		// PUBLIC FUNCTIONS
 		public function register_tinymce_plugin( $plugins ) {
-			$plugins['video_block'] = $this->addon_dir_url . 'plugin.js?v=' . $this->version;
+			$plugins['video_block'] = $this->addon_dir_url . 'plugin.js?v=' . WP_Blockade::$version;
 			return $plugins;
 		}
 		public function enqueue_styles() {
-			wp_enqueue_style( 'wp-blockade-video-styles', $this->addon_dir_url . 'styles.css', array(), $this->version );
+			wp_enqueue_style( 'wp-blockade-video-styles', $this->addon_dir_url . 'styles.css', array(), WP_Blockade::$version );
 		}
 
 		/*

diff --git a/addons/video/plugin.js b/addons/video/plugin.js
@@ -3,7 +3,6 @@
 	Plugin URI: http://www.burlingtonbytes.com
 	Author: Burlington Bytes
 	Author URI: http://www.burlingtonbytes.com
-	Version: 0.9.5
 */
 tinymce.PluginManager.add('video_block', function(editor, url) {
 	// kill if older than IE8