enqueue method iproved

Author: Codestar

assets/js/csf.js

@@ -565,6 +565,21 @@
           data_editor = $textarea.data('editor'),
           code_editor = CodeMirror.fromTextArea( $textarea[0], data_editor );
 
+      // load code-mirror theme css.
+      if( data_editor.theme !== 'default' ) {
+
+        var $cssLink = $('<link>');
+
+        $('#csf-codemirror-css').append( $cssLink );
+
+        $cssLink.attr({
+          rel: 'stylesheet',
+          type: 'text/css',
+          href: data_editor.cdnURL +'/theme/'+ data_editor.theme +'.min.css'
+        });
+
+      }
+
       CodeMirror.modeURL = data_editor.cdnURL +'/mode/%N/%N.min.js';
       CodeMirror.autoLoadMode(code_editor, data_editor.mode);
 

assets/js/csf.min.js

@@ -23,7 +23,6 @@ class CSF {
       'metaboxes'          => array(),
       'shortcoders'        => array(),
       'taxonomy_options'   => array(),
-      'once_enqueue'       => array(),
     );
 
     // shortcode instances
@@ -345,15 +344,11 @@ public static function add_admin_enqueue_scripts() {
           if( ! empty( $field['type'] ) ) {
             $classname = 'CSF_Field_' . $field['type'];
             self::maybe_include_field( $field['type'] );
-            if( class_exists( $classname ) && method_exists( $classname, 'enqueue' ) || method_exists( $classname, 'once_enqueue' ) ) {
+            if( class_exists( $classname ) && method_exists( $classname, 'enqueue' ) ) {
               $instance = new $classname( $field );
               if( method_exists( $classname, 'enqueue' ) ) {
                 $instance->enqueue();
               }
-              if( method_exists( $classname, 'once_enqueue' ) && ! in_array( $classname, $enqueued ) ) {
-                $instance->once_enqueue();
-                $enqueued[] = $classname;
-              }
               unset( $instance );
             }
           }
@@ -446,18 +441,13 @@ public static function createField( $field = array(), $is_ajax = false ) {
 
       self::maybe_include_field( $field['type'] );
 
-      if( class_exists( $classname ) && method_exists( $classname, 'enqueue' ) || method_exists( $classname, 'once_enqueue' ) ) {
+      if( class_exists( $classname ) && method_exists( $classname, 'enqueue' ) ) {
 
         $instance = new $classname( $field );
         if( method_exists( $classname, 'enqueue' ) ) {
           $instance->enqueue();
         }
 
-        if( method_exists( $classname, 'once_enqueue' ) && ! in_array( $classname, $loaded ) ) {
-          $instance->once_enqueue();
-          $loaded[] = $classname;
-        }
-
         unset( $instance );
 
       }

classes/setup.class.php

@@ -22,6 +22,7 @@ public function render() {
       $default_settings = array(
         'tabSize'       => 2,
         'lineNumbers'   => true,
+        'theme'         => 'default',
         'mode'          => 'htmlmixed',
         'cdnURL'        => $this->cdn_url . $this->version,
       );
@@ -47,12 +48,6 @@ public function enqueue() {
         wp_enqueue_style( 'csf-codemirror', $this->cdn_url . $this->version .'/lib/codemirror.min.css', array(), $this->version );
       }
 
-      $theme = ( ! empty( $this->field['settings']['theme'] ) ) ? $this->field['settings']['theme'] : '';
-
-      if( ! empty( $theme ) && ! wp_style_is( 'csf-codemirror-theme-'. $theme ) ) {
-        wp_enqueue_style( 'csf-codemirror-theme-'. $theme, $this->cdn_url . $this->version .'/theme/'. $theme .'.min.css', array( 'csf-codemirror' ), $this->version );
-      }
-
     }
 
   }

fields/code_editor/code_editor.php

@@ -329,7 +329,7 @@ public function create_select( $options, $name, $placeholder = '', $is_multiple
 
     }
 
-    public function once_enqueue() {
+    public function enqueue() {
 
       if( ! wp_style_is( 'csf-webfont-loader' ) ) {
 

fields/typography/typography.php

@@ -51,7 +51,7 @@ public function render() {
 
     }
 
-    public function once_enqueue() {
+    public function enqueue() {
 
       if( csf_wp_editor_api() && function_exists( 'wp_enqueue_editor' ) ) {
 

fields/wp_editor/wp_editor.php

@@ -71,15 +71,15 @@ msgstr ""
 msgid "Reset All"
 msgstr ""
 
-#: classes/setup.class.php:377
+#: classes/setup.class.php:372
 msgid "Ooops! This field type (%s) can not be used here, yet."
 msgstr ""
 
-#: classes/setup.class.php:420
+#: classes/setup.class.php:415
 msgid "This field class is not available!"
 msgstr ""
 
-#: classes/setup.class.php:424
+#: classes/setup.class.php:419
 msgid "This type is not found!"
 msgstr ""
 

languages/csf.pot

@@ -1393,9 +1393,9 @@
       'id'       => 'code_editor_2',
       'type'     => 'code_editor',
       'title'    => 'Code Editor',
-      'subtitle' => '<strong>HTML Editor</strong> Using: theme: mdn-like and mode: htmlmixed',
+      'subtitle' => '<strong>HTML Editor</strong> Using: theme: shadowfox and mode: htmlmixed',
       'settings' => array(
-        'theme'  => 'mdn-like',
+        'theme'  => 'shadowfox',
         'mode'   => 'htmlmixed',
       ),
       'default'  =>'<div class="wrapper">

samples/options.samples.php

@@ -8,7 +8,7 @@
   <li>Added: Validate URL function callback. <a href="http://codestarframework.com/documentation/#/faq?id=how-to-use-validate-" target="_blank"><small>(doc)</small></a></li>
   <li>Fixed: Group field save issue.</li>
   <li>Fixed: Multiple given post formats metabox hide/show issue.</li>
-  <li>Fixed: Minor Bugs.</li>
+  <li>Fixed: Minor bugs.</li>
 </ul>
 
 <h3>v2.0</h3>