Fix error with initilisation

vfontjr · Sep 21, 2014 · 614693a · 614693a
1 parent 0495539
commit 614693a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/README.txt b/README.txt
@@ -4,7 +4,7 @@ Donate link: http://www.formidablepropdfextended.com
 Tags: formidable, pro, pdf, extended, automation, attachment
 Requires at least: 3.9
 Tested up to: 3.9.1
-Stable tag: 1.5.1
+Stable tag: 1.5.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -79,6 +79,9 @@ All FAQs can be [viewed on the Formidable Pro PDF Extended website](http://formi
 
 == Changelog ==
 
+= 1.5.2 =
+* Fix up javascript error on initialisation page
+
 = 1.5.1 =
 * Included fallback for PHP5.3+ function array_replace_recursive()
 * Fix up initialisation which wasn't running correctly for some users

diff --git a/js/admin.js b/js/admin.js
@@ -124,21 +124,20 @@
 				 * Show the content panel
 				 */ 
 				$('.tabs-panel').hide();
-				$('#PDF_settings .frm_uninstall').remove();
 				$('#PDF_settings, .PDF_settings').show(); 
 
 				/*
 				 * Set up the tabs
 				 */
 				 $('.frm-category-tabs .active').removeClass('active');
-				 $(".frm-category-tabs [href='#PDF_settings']").parent().addClass('active');
+				 $(".frm-category-tabs [href='#PDF_settings']").parent().addClass('active');				 
 			 }			 			 
 
 			/*
 			 * Remove submit button FP auto adds
 			 */ 
-			 $('#fppdfextended-setting .submit').remove();
-			 $('#fppdfextended-setting .frm_uninstall').remove();
+			 $('#PDF_settings .submit').remove();
+			 $('#PDF_settings .frm_uninstall').remove();
 
 			/*
 			 * Add AJAX for initialisation
@@ -148,12 +147,11 @@
 				 /*
 				  * If AJAX call already happening exit early
 				  */
-
-				 if($('#PDF_settings .spinner').length > 0)
+				 var $spinner = $('#PDF_settings .spinner');
+				 if($spinner.length > 0)
 				 {
 					return false; 
 				 }
-
 				 $('#fppdfextended-setting form').remove();
 
 				 $('<span class="spinner" style="display: inline-block; margin-top:0; float: none;">').insertAfter($('#font-initialise'));
@@ -182,8 +180,8 @@
 				 /*
 				  * If AJAX call already happening exit early
 				  */
-
-				 if($('#PDF_settings .spinner').length > 0)
+				 var $spinner = $('#PDF_settings .spinner');
+				 if($spinner.length > 0)
 				 {
 					return false; 
 				 }

diff --git a/pdf.php b/pdf.php
@@ -4,7 +4,7 @@
 Plugin Name: Formidable Pro PDF Extended
 Plugin URI: http://www.formidablepropdfextended.com
 Description: Formidable Pro PDF Extended allows you to save/view/download a PDF from the front- and back-end, and automate PDF creation on form submission. Our Business Plus package also allows you to overlay field onto an existing PDF.
-Version: 1.5.1
+Version: 1.5.2
 Author: Blue Liquid Designs
 Author URI: http://www.blueliquiddesigns.com.au
 
@@ -33,7 +33,7 @@
 	/*
 	* Define our constants
 	*/
-	if(!defined('FP_PDF_EXTENDED_VERSION')) { define('FP_PDF_EXTENDED_VERSION', '1.5.1'); }
+	if(!defined('FP_PDF_EXTENDED_VERSION')) { define('FP_PDF_EXTENDED_VERSION', '1.5.2'); }
 	if(!defined('FP_PDF_EXTENDED_SUPPORTED_VERSION')) { define('FP_PDF_EXTENDED_SUPPORTED_VERSION', '1.07.01'); }
 	if(!defined('FP_PDF_EXTENDED_WP_SUPPORTED_VERSION')) { define('FP_PDF_EXTENDED_WP_SUPPORTED_VERSION', '3.6'); }