Merge branch 'release/1.5.10'

artistudioxyz · Feb 20, 2022 · 488a3b2 · 488a3b2
2 parents 31adba9 + fb0c95d
commit 488a3b2
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 26 deletions.
diff --git a/assets/build/components/metabox-design/bundle.js b/assets/build/components/metabox-design/bundle.js
diff --git a/config.json b/config.json
@@ -1 +1 @@
-{"name":"Floating Awesome Button","version":"1.5.9","production":true,"premium":false,"url":{"wordpress":"https:\/\/wordpress.org\/plugins\/floating-awesome-button","contact":"https:\/\/artistudio.xyz\/contact"},"enableHooks":["action","filter","shortcode"],"description":"Floating Awesome Button (FAB) is customizable action button that can help you display custom content (modal, shortcodes, widgets, links, etc).","default":{"fab_animation":{"enable":1,"elements":{"logo":"bounceIn","tab":"heartBeat","content":"fadeIn","fab":"ripple","fab_active":"fadeIn","fab_inactive":"fadeOut"}},"fab_design":{"layout":{"position":"right"},"size":{"type":"medium","custom":""},"tooltip":{"enable":1},"template":{"name":"classic","shape":"","color":"#5b59ec","icon":{"class":"fas fa-ellipsis-h","color":"#fff"}}},"fab_order":[],"fab_assets":{"backend":{"fab-fontawesome-css":{"status":true,"type":"css","src":"vendor\/fontawesome\/css\/all.min.css"},"fab-jconfirm-css":{"status":true,"type":"css","src":"vendor\/jquery-confirm\/jquery-confirm.min.css"},"fab-jconfirm-js":{"status":true,"type":"js","src":"vendor\/jquery-confirm\/jquery-confirm.min.js"},"fab-select2-css":{"status":true,"type":"css","src":"vendor\/jquery-select2\/select2.min.css"},"fab-select2-js":{"status":true,"type":"js","src":"vendor\/jquery-select2\/select2.min.js"}},"frontend":{"fab-fontawesome-css":{"status":true,"type":"css","src":"vendor\/fontawesome\/css\/all.min.css"},"fab-jconfirm-css":{"status":true,"type":"css","src":"vendor\/jquery-confirm\/jquery-confirm.min.css"},"fab-jconfirm-js":{"status":true,"type":"js","src":"vendor\/jquery-confirm\/jquery-confirm.min.js"},"fab-jquery-hotkey-js":{"status":true,"type":"js","src":"vendor\/jquery-hotkey\/jquery.hotkeys.min.js"}}},"fab_hooks":[]}}
+{"name":"Floating Awesome Button","version":"1.5.10","production":true,"premium":false,"url":{"wordpress":"https:\/\/wordpress.org\/plugins\/floating-awesome-button","contact":"https:\/\/artistudio.xyz\/contact"},"enableHooks":["action","filter","shortcode"],"description":"Floating Awesome Button (FAB) is customizable action button that can help you display custom content (modal, shortcodes, widgets, links, etc).","default":{"fab_animation":{"enable":1,"elements":{"logo":"bounceIn","tab":"heartBeat","content":"fadeIn","fab":"ripple","fab_active":"fadeIn","fab_inactive":"fadeOut"}},"fab_design":{"layout":{"position":"right"},"size":{"type":"medium","custom":""},"tooltip":{"enable":1},"template":{"name":"classic","shape":"","color":"#5b59ec","icon":{"class":"fas fa-ellipsis-h","color":"#fff"}}},"fab_order":[],"fab_assets":{"backend":{"fab-fontawesome-css":{"status":true,"type":"css","src":"vendor\/fontawesome\/css\/all.min.css"},"fab-jconfirm-css":{"status":true,"type":"css","src":"vendor\/jquery-confirm\/jquery-confirm.min.css"},"fab-jconfirm-js":{"status":true,"type":"js","src":"vendor\/jquery-confirm\/jquery-confirm.min.js"},"fab-select2-css":{"status":true,"type":"css","src":"vendor\/jquery-select2\/select2.min.css"},"fab-select2-js":{"status":true,"type":"js","src":"vendor\/jquery-select2\/select2.min.js"}},"frontend":{"fab-fontawesome-css":{"status":true,"type":"css","src":"vendor\/fontawesome\/css\/all.min.css"},"fab-jconfirm-css":{"status":true,"type":"css","src":"vendor\/jquery-confirm\/jquery-confirm.min.css"},"fab-jconfirm-js":{"status":true,"type":"js","src":"vendor\/jquery-confirm\/jquery-confirm.min.js"},"fab-jquery-hotkey-js":{"status":true,"type":"js","src":"vendor\/jquery-hotkey\/jquery.hotkeys.min.js"}}},"fab_hooks":[]}}
diff --git a/floating-awesome-button.php b/floating-awesome-button.php
@@ -3,7 +3,7 @@
  * Plugin Name:       Floating Awesome Button
  * Plugin URI:        https://artistudio.xyz
  * Description:       Floating Awesome Button (FAB) is customizable action button that can help you display custom content (modal, shortcodes, widgets, links, etc).
- * Version:           1.5.9
+ * Version:           1.5.10
  * Author:            Agung Sundoro
  * Author URI:        https://wiki.artistudio.xyz/
  * License:           GPL-3.0

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: float menu, sticky button, popup, optin, scroll to top, social sharing
 Requires at least: 4.5
 Tested up to: 5.9.0
 Requires PHP: 5.6
-Stable tag: 1.5.9
+Stable tag: 1.5.10
 License: GPL-3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.txt
 
@@ -77,6 +77,8 @@ More Tutorial on YouTube :
 Thanks for using our plugin, your rating and feedback help us grow!
 If you enjoy it please feel free to spread the words 👊 😚 👍
 
+* 👋 👊 [Join Our Slack Community](https://wpfab.slack.com) 🦸‍ 👨‍🚀 🥷
+
 = Credits =
 
 This plugin is heavily using these free & open-source libraries
@@ -102,12 +104,13 @@ who had helped provide and develop these libraries
 == Installation ==
 * You can install the plugin from the WordPress Plugin Repositories or
 * Download the plugin and extract the zip file and just drop the contents in the wp-content/plugins/ directory of your WordPress installation
-
-To see a complete release versions of the plugins you can go to :
-* 📟 [Github/Floating Awesome Button](https://github.com/artistudioxyz/floating-awesome-button)
+* To see a complete release versions of the plugins you can go to : 📟 [Github/Floating Awesome Button](https://github.com/artistudioxyz/floating-awesome-button)
 
 == Changelog ==
 
+= 1.5.10 =
+* HOTFIX: FAB type link metabox design option not working
+
 = 1.5.9 =
 * Restructure CSS styles to use less space
 * Optimize gutenberg support (Autoembed & Render)

diff --git a/src/Controller/Metabox/MetaboxDesign.php b/src/Controller/Metabox/MetaboxDesign.php
@@ -69,10 +69,6 @@ public function backend_enequeue_metabox_design( $hook_suffix ) {
         /** Grab Data */
         $fab = new FABItem( $post->ID );
         $fab = $fab->getVars();
-//
-//        echo '<pre>';
-//        var_dump($fab);
-//        exit;
 
         /** Add Inline Script */
         $this->WP->wp_localize_script( 'fab-local', 'FAB_METABOX_DESIGN', array(

diff --git a/src/Helper/FAB/FABItem.php b/src/Helper/FAB/FABItem.php
@@ -160,6 +160,7 @@ public function __construct( int $ID ) {
 		/** Get Plugin Instance */
 		$plugin   = \Fab\Plugin::getInstance();
 		$this->WP = $plugin->getWP();
+        $this->Helper = $plugin->getHelper();
 		$options  = $plugin->getConfig()->options;
 
 		/** Construct Class */
@@ -182,8 +183,9 @@ public function __construct( int $ID ) {
 		$this->hotkey          = ($this->hotkey==='none') ? '' : $this->hotkey;
 
         /** Animation */
+        $default = FABMetaboxDesign::$input['fab_design_animation']['default'];
         $this->animation = $this->WP->get_post_meta( $this->ID, FABMetaboxDesign::$post_metas['animation']['meta_key'], true );
-        $this->animation = ( $this->animation ) ? $this->animation : FABMetaboxDesign::$input['fab_design_animation']['default'];
+        $this->animation = ( $this->animation ) ? $this->Helper->ArrayMergeRecursive( (array) $default, (array) $this->animation ) : $default;
 
         /** Module */
         if( 'anchor_link' === $this->type ){ $this->module = new FABModuleAnchorLink(); }
@@ -194,25 +196,29 @@ public function __construct( int $ID ) {
         elseif ( 'search' === $this->type ){ $this->module = new FABModuleSearch(); }
 
 		/** Responsive */
+        $default = FABMetaboxDesign::$input['fab_design_responsive']['default'];
 		$this->responsive = $this->WP->get_post_meta( $this->ID, FABMetaboxDesign::$post_metas['responsive']['meta_key'], true );
-		$this->responsive = ( $this->responsive ) ? $this->responsive : FABMetaboxDesign::$input['fab_design_responsive']['default'];
+		$this->responsive = ( $this->responsive ) ? $this->Helper->ArrayMergeRecursive( (array) $default, (array) $this->responsive ) : $default;
 
         /** Standalone */
         $standalone = ['readingbar', 'scrolltotop'];
         $this->standalone = (in_array($this->type, $standalone)) ? true : false;
         $this->standalone = ($this->standalone===false) ? $this->WP->get_post_meta( $this->ID, FABMetaboxDesign::$post_metas['standalone']['meta_key'], true ) : $this->standalone;
 
 		/** Trigger */
+        $default = FABMetaboxTrigger::$input['fab_trigger']['default'];
 		$this->trigger = $this->WP->get_post_meta( $this->ID, FABMetaboxTrigger::$post_metas['trigger']['meta_key'], true );
-		$this->trigger = ( $this->trigger ) ? $this->trigger : FABMetaboxTrigger::$input['fab_trigger']['default'];
+		$this->trigger = ( $this->trigger ) ? $this->Helper->ArrayMergeRecursive( (array) $default, (array) $this->trigger ) : $default;
 
         /** Template */
+        $default = FABMetaboxDesign::$input['fab_design_template']['default'];
         $this->template = $this->WP->get_post_meta( $this->ID, FABMetaboxDesign::$post_metas['template']['meta_key'], true );
-        $this->template = ( $this->template ) ? $this->template : FABMetaboxDesign::$input['fab_design_template']['default'];
+        $this->template = ( $this->template ) ? $this->Helper->ArrayMergeRecursive( (array) $default, (array) $this->template ) : $default;
 
         /** Tooltip */
+        $default = FABMetaboxDesign::$input['fab_design_tooltip']['default'];
         $this->tooltip = $this->WP->get_post_meta( $this->ID, FABMetaboxDesign::$post_metas['tooltip']['meta_key'], true );
-        $this->tooltip = ( $this->tooltip ) ? $this->tooltip : FABMetaboxDesign::$input['fab_design_tooltip']['default'];
+        $this->tooltip = ( $this->tooltip ) ? $this->Helper->ArrayMergeRecursive( (array) $default, (array) $this->tooltip ) : $default;
 
 		/** Location */
 		$this->locations = $this->WP->get_post_meta( $this->ID, FABMetaboxLocation::$post_metas['locations']['meta_key'], true );

diff --git a/src/Helper/FAB/FABModal.php b/src/Helper/FAB/FABModal.php
@@ -54,6 +54,7 @@ public function __construct(int $ID)
         /** Get Plugin Instance */
         $plugin   = \Fab\Plugin::getInstance();
         $this->WP = $plugin->getWP();
+        $this->Helper = $plugin->getHelper();
 
         /** Construct Class */
         $this->ID = $ID;
@@ -62,16 +63,19 @@ public function __construct(int $ID)
         $type = $this->WP->get_post_meta( $this->ID, FABMetaboxSetting::$post_metas['type']['meta_key'], true );
         if($type != 'link'){
             /** Layout */
+            $default = FABMetaboxDesign::$input['fab_modal_layout']['default'];
             $this->layout = $this->WP->get_post_meta( $this->ID, FABMetaboxDesign::$post_metas['modal_layout']['meta_key'], true );
-            $this->layout = ( $this->layout ) ? $this->layout : FABMetaboxDesign::$input['fab_modal_layout']['default'];
+            $this->layout = ( $this->layout ) ? $this->Helper->ArrayMergeRecursive( (array) $default, (array) $this->layout ) : $default;
 
             /** Navigation */
+            $default = FABMetaboxDesign::$input['fab_modal_navigation']['default'];
             $this->navigation = $this->WP->get_post_meta( $this->ID, FABMetaboxDesign::$post_metas['modal_navigation']['meta_key'], true );
-            $this->navigation = ( $this->navigation ) ? $this->navigation : FABMetaboxDesign::$input['fab_modal_navigation']['default'];
+            $this->navigation = ( $this->navigation ) ? $this->Helper->ArrayMergeRecursive( (array) $default, (array) $this->navigation ) : $default;
 
             /** Theme */
+            $default = FABMetaboxDesign::$input['fab_modal_theme']['default'];
             $this->theme = $this->WP->get_post_meta( $this->ID, FABMetaboxDesign::$post_metas['modal_theme']['meta_key'], true );
-            $this->theme = ( $this->theme ) ? $this->theme : FABMetaboxDesign::$input['fab_modal_theme']['default'];
+            $this->theme = ( $this->theme ) ? $this->Helper->ArrayMergeRecursive( (array) $default, (array) $this->theme ) : $default;
         }
 
     }

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInite4e568d13db37aed56413dfbd585d1ba::getLoader();
+return ComposerAutoloaderInit554decf5efe21e95ee0f99b30e7cea15::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInite4e568d13db37aed56413dfbd585d1ba
+class ComposerAutoloaderInit554decf5efe21e95ee0f99b30e7cea15
 {
     private static $loader;
 
@@ -24,15 +24,15 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInite4e568d13db37aed56413dfbd585d1ba', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit554decf5efe21e95ee0f99b30e7cea15', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInite4e568d13db37aed56413dfbd585d1ba', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit554decf5efe21e95ee0f99b30e7cea15', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInite4e568d13db37aed56413dfbd585d1ba::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit554decf5efe21e95ee0f99b30e7cea15::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInite4e568d13db37aed56413dfbd585d1ba
+class ComposerStaticInit554decf5efe21e95ee0f99b30e7cea15
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -89,7 +89,7 @@ class ComposerStaticInite4e568d13db37aed56413dfbd585d1ba
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInite4e568d13db37aed56413dfbd585d1ba::$classMap;
+            $loader->classMap = ComposerStaticInit554decf5efe21e95ee0f99b30e7cea15::$classMap;
 
         }, null, ClassLoader::class);
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"name":"Floating Awesome Button","version":"1.5.9","production":true,"premium":false,"url":{"wordpress":"https:\/\/wordpress.org\/plugins\/floating-awesome-button","contact":"https:\/\/artistudio.xyz\/contact"},"enableHooks":["action","filter","shortcode"],"description":"Floating Awesome Button (FAB) is customizable action button that can help you display custom content (modal, shortcodes, widgets, links, etc).","default":{"fab_animation":{"enable":1,"elements":{"logo":"bounceIn","tab":"heartBeat","content":"fadeIn","fab":"ripple","fab_active":"fadeIn","fab_inactive":"fadeOut"}},"fab_design":{"layout":{"position":"right"},"size":{"type":"medium","custom":""},"tooltip":{"enable":1},"template":{"name":"classic","shape":"","color":"#5b59ec","icon":{"class":"fas fa-ellipsis-h","color":"#fff"}}},"fab_order":[],"fab_assets":{"backend":{"fab-fontawesome-css":{"status":true,"type":"css","src":"vendor\/fontawesome\/css\/all.min.css"},"fab-jconfirm-css":{"status":true,"type":"css","src":"vendor\/jquery-confirm\/jquery-confirm.min.css"},"fab-jconfirm-js":{"status":true,"type":"js","src":"vendor\/jquery-confirm\/jquery-confirm.min.js"},"fab-select2-css":{"status":true,"type":"css","src":"vendor\/jquery-select2\/select2.min.css"},"fab-select2-js":{"status":true,"type":"js","src":"vendor\/jquery-select2\/select2.min.js"}},"frontend":{"fab-fontawesome-css":{"status":true,"type":"css","src":"vendor\/fontawesome\/css\/all.min.css"},"fab-jconfirm-css":{"status":true,"type":"css","src":"vendor\/jquery-confirm\/jquery-confirm.min.css"},"fab-jconfirm-js":{"status":true,"type":"js","src":"vendor\/jquery-confirm\/jquery-confirm.min.js"},"fab-jquery-hotkey-js":{"status":true,"type":"js","src":"vendor\/jquery-hotkey\/jquery.hotkeys.min.js"}}},"fab_hooks":[]}}
		{"name":"Floating Awesome Button","version":"1.5.10","production":true,"premium":false,"url":{"wordpress":"https:\/\/wordpress.org\/plugins\/floating-awesome-button","contact":"https:\/\/artistudio.xyz\/contact"},"enableHooks":["action","filter","shortcode"],"description":"Floating Awesome Button (FAB) is customizable action button that can help you display custom content (modal, shortcodes, widgets, links, etc).","default":{"fab_animation":{"enable":1,"elements":{"logo":"bounceIn","tab":"heartBeat","content":"fadeIn","fab":"ripple","fab_active":"fadeIn","fab_inactive":"fadeOut"}},"fab_design":{"layout":{"position":"right"},"size":{"type":"medium","custom":""},"tooltip":{"enable":1},"template":{"name":"classic","shape":"","color":"#5b59ec","icon":{"class":"fas fa-ellipsis-h","color":"#fff"}}},"fab_order":[],"fab_assets":{"backend":{"fab-fontawesome-css":{"status":true,"type":"css","src":"vendor\/fontawesome\/css\/all.min.css"},"fab-jconfirm-css":{"status":true,"type":"css","src":"vendor\/jquery-confirm\/jquery-confirm.min.css"},"fab-jconfirm-js":{"status":true,"type":"js","src":"vendor\/jquery-confirm\/jquery-confirm.min.js"},"fab-select2-css":{"status":true,"type":"css","src":"vendor\/jquery-select2\/select2.min.css"},"fab-select2-js":{"status":true,"type":"js","src":"vendor\/jquery-select2\/select2.min.js"}},"frontend":{"fab-fontawesome-css":{"status":true,"type":"css","src":"vendor\/fontawesome\/css\/all.min.css"},"fab-jconfirm-css":{"status":true,"type":"css","src":"vendor\/jquery-confirm\/jquery-confirm.min.css"},"fab-jconfirm-js":{"status":true,"type":"js","src":"vendor\/jquery-confirm\/jquery-confirm.min.js"},"fab-jquery-hotkey-js":{"status":true,"type":"js","src":"vendor\/jquery-hotkey\/jquery.hotkeys.min.js"}}},"fab_hooks":[]}}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		require_once __DIR__ . '/composer/autoload_real.php';

		return ComposerAutoloaderInite4e568d13db37aed56413dfbd585d1ba::getLoader();
		return ComposerAutoloaderInit554decf5efe21e95ee0f99b30e7cea15::getLoader();