Updated to re-use CodeMirror as bundled with Wordpress core library

Author: Giulio

classes/EssentialScript/Admin/Scripts/CodemirrorModeJS.php

@@ -21,7 +21,7 @@
 
 /**
  * Concrete decorator: wraps the Essential Script concrete component with
- * necessary code to add JavaScript mode to CodeMirror.
+ * necessary code to add JavaScript Lint to CodeMirror.
  *
  * @author docwho
  */
@@ -50,19 +50,11 @@ public function enqueueScript( $hook ) {
 		if ( $this->slug->getSlug() !== $hook ) {
 			return;
 		}
-		
-		// Codemirror mode script for javascript language.
-		wp_register_script(
-				'dist-codemirror-mode-js',
-				plugins_url( ESSENTIAL_SCRIPT1_DIST_CODEMIRROR .
-					'lib/mode/javascript/javascript.js',
-					ESSENTIAL_SCRIPT1_PLUGIN_FILE ),
-				array( 'dist-codemirror-script' ),
-				self::CODEMIRROR_VER,
-				false
-		);
-		wp_enqueue_script( 'dist-codemirror-mode-js' );		
 
+		// Codemirror mode script for javascript language.
+		if ( !wp_script_is( 'jshint', 'enqueued' ) ) {
+			wp_enqueue_script( 'jshint' );
+		}
 	}
 
 	/**

classes/EssentialScript/Admin/Scripts/CodemirrorModeXml.php

@@ -21,7 +21,7 @@
 
 /**
  * Concrete decorator: wraps the Essential Script concrete component with
- * necessary code to add XML mode to CodeMirror.
+ * necessary code to add HTML/XML lint to CodeMirror.
  *
  * @author docwho
  */
@@ -52,16 +52,9 @@ public function enqueueScript( $hook ) {
 		}
 
 		// Codemirror mode script for XML/HTML language.
-		wp_register_script(
-				'dist-codemirror-mode-xml',
-				plugins_url( ESSENTIAL_SCRIPT1_DIST_CODEMIRROR . 
-					'lib/mode/xml/xml.js',
-					ESSENTIAL_SCRIPT1_PLUGIN_FILE ),
-				array( 'dist-codemirror-script' ),
-				self::CODEMIRROR_VER,
-				false
-		);
-		wp_enqueue_script( 'dist-codemirror-mode-xml' );
+		if ( !wp_script_is( 'htmlhint', 'enqueued' ) ) {		
+			wp_enqueue_script( 'htmlhint' );
+		}
 	}
 
 	/**

classes/EssentialScript/Admin/Scripts/CodemirrorScript.php

@@ -51,18 +51,11 @@ public function enqueueScript( $hook ) {
 		}
 
 		// Codemirror main javascript file
-		wp_register_script( 
-			'dist-codemirror-script',
-			plugins_url( ESSENTIAL_SCRIPT1_DIST_CODEMIRROR . 
-				'lib/codemirror.js', 
-				ESSENTIAL_SCRIPT1_PLUGIN_FILE ),
-			array (),
-			self::CODEMIRROR_VER,
-			false
-		);
-		wp_enqueue_script( 'dist-codemirror-script' );
+		if ( !wp_script_is( 'wp-codemirror', 'enqueued' ) ) {
+			wp_enqueue_script( 'wp-codemirror' );
+		}
 	}
-
+	
 	/**
 	 * Getter
 	 * 

classes/EssentialScript/Admin/Scripts/CodemirrorStyle.php

@@ -21,7 +21,7 @@
 
 /**
  * Concrete decorator: wraps the Essential Script concrete component with
- * necessary code to add CSS file supplied by CodeMirror.
+ * necessary code to add CSS file for Codemirror supplied by WordPress.
  *
  * @author docwho
  */
@@ -52,18 +52,8 @@ public function enqueueScript( $hook ) {
 			return;
 		}
 
-		// CodeMirror style
-		wp_register_style(
-				'dist-codemirror-style',
-				plugins_url( ESSENTIAL_SCRIPT1_DIST_CODEMIRROR .
-					'lib/codemirror.css', 
-					ESSENTIAL_SCRIPT1_PLUGIN_FILE ),
-				array(),
-				self::CODEMIRROR_VER,
-				false 
-		);
-		wp_enqueue_style( 'dist-codemirror-style' );
-
+		// CodeMirror main style
+		wp_enqueue_style( 'wp-codemirror' );
 	}
 
 	/**

classes/EssentialScript/Admin/Scripts/CodemirrorStyleOverride.php

@@ -56,7 +56,7 @@ public function enqueueScript( $hook ) {
 			'codemirror-style-override',
 			plugins_url( 'css/codemirror-override.css', ESSENTIAL_SCRIPT1_PLUGIN_FILE ),
 			array(),
-			self::CODEMIRROR_VER,
+			self::ESSENTIALSCRIPT_VER,
 			false
 		);
 		wp_enqueue_style( 'codemirror-style-override' );

classes/EssentialScript/Admin/Scripts/Component.php

@@ -25,12 +25,6 @@
  * @author docwho
  */
 abstract class Component {
-	/**
-	 * CodeMirror Version for upgrade purposes. 
-	 * 
-	 * @since 0.2
-	 */
-	const CODEMIRROR_VER = '5.32.0';
 	/**
 	 * Essential Script Version for upgrade purposes.
 	 * 

classes/EssentialScript/Core/Codemirror.php

@@ -59,7 +59,7 @@ static public function fromTextarea( $highlighter ) {
 <script>
 (function($,settings) {
 	var textarea_node=document.getElementById("textarea-script");
-	var editor = CodeMirror.fromTextArea(textarea_node,settings);
+	var editor = wp.CodeMirror.fromTextArea(textarea_node,settings);
 })(window.jQuery, %s); 
 </script> 
 JS

essential-script.php

@@ -45,7 +45,6 @@
 define ( 'ESSENTIAL_SCRIPT1_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define ( 'ESSENTIAL_SCRIPT1_PLUGIN_FILE', __FILE__ );
 define ( 'ESSENTIAL_SCRIPT1_PLUGIN_PACKAGE', 'EssentialScript' );
-define ( 'ESSENTIAL_SCRIPT1_DIST_CODEMIRROR', 'lib/codemirror/' );
 
 // Include or require any necessary files here.
 require_once ( ESSENTIAL_SCRIPT1_PLUGIN_DIR . 'classes/EssentialScript/Tools/Autoloader.php' );