enqueue the CSS for new admin client #2789 #2445

CalderaWP · Oct 24, 2018 · 9bf3657 · 9bf3657
1 parent f1adb08
commit 9bf3657
Show file tree

Hide file tree

Showing 22 changed files with 20,335 additions and 20,973 deletions.
diff --git a/assets/build/css/caldera-forms-front.min.css b/assets/build/css/caldera-forms-front.min.css
diff --git a/assets/css/caldera-forms-front.css b/assets/css/caldera-forms-front.css
diff --git a/assets/js/caldera-forms-front.js b/assets/js/caldera-forms-front.js
@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-17 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-24 *//**
  * Simple event bindings for form state
  *
  * In general, access through CFState.events() not directly.

diff --git a/assets/js/entry-viewer-2.js b/assets/js/entry-viewer-2.js
@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-17 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-24 *//**
  * API Client for Caldera Forms API for a single form
  *
  * @since 1.5.0

diff --git a/assets/js/parsley.min.js b/assets/js/parsley.min.js
@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-17 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-24 *//*!
 * Parsley.js
 * Version 2.8.1 - built Sat, Feb 3rd 2018, 2:27 pm
 * http://parsleyjs.org

diff --git a/assets/js/vue.js b/assets/js/vue.js
@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-17 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.8.0-a.1 - 2018-10-24 *//*!
  * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.

diff --git a/caldera-core.php b/caldera-core.php
@@ -193,10 +193,10 @@ function caldera_forms_freemius_icon_path()
 
     add_action('caldera_forms_admin_assets_styles_registered', function(){
     	if( Caldera_Forms_Admin::is_main_page() ){
+    		$x= Caldera_Forms_Admin_Assets::main_admin_asset_slug();
             Caldera_Forms_Admin_Assets::set_cf_admin( Caldera_Forms_Admin_Assets::main_admin_asset_slug() );
-            wp_enqueue_style( 'caldera-forms-admin-scripts',
-                plugins_url('/assets/build/css/admin.min.css', __FILE__ )
-
+            wp_enqueue_style( Caldera_Forms_Admin_Assets::main_admin_asset_slug(),
+                plugins_url('/clients/admin/build/style.min.css', __FILE__ )
 			);
         }
 	});

diff --git a/classes/render/assets.php b/classes/render/assets.php
@@ -557,20 +557,20 @@ public static function make_url( $name, $script = true ){
      */
     public static function is_client_entry_point( $slug ){
 
-        $clients=  [
+        $clients =  [
             'blocks',
             'pro',
             'privacy',
-
         ];
+
         /**
          * Determine if we should use the new CF2 admin page client or not.
          *
          * @since 1.8.0
          *
          * @param boolean $use_cf2 If new cf2 admin client should be used or not
          */
-        if( ( apply_filters( 'caldera_forms_use_cf2_admin', Caldera_Forms_Admin::is_main_page() ) ) ){
+        if( apply_filters( 'caldera_forms_use_cf2_admin', Caldera_Forms_Admin::is_main_page() ) ){
             $clients = array_merge( $clients, [
                 'admin',
                 Caldera_Forms_Admin_Assets::main_admin_asset_slug()
@@ -579,6 +579,7 @@ public static function is_client_entry_point( $slug ){
         return in_array( $slug, $clients );
     }
 
+
     /**
      * Should we mbe minifying script/styles?
      *