Changeset 1927900

Timestamp:

08/21/2018 10:18:04 AM (7 years ago)

Author:

rotativahq

Message:

Update to 1.2.2

Location:

rotativa

Files:

• tags/1.2.2 (copied) (copied from rotativa/trunk)
• tags/1.2.2/README.txt (copied) (copied from rotativa/trunk/README.txt) (2 diffs)
• tags/1.2.2/public/class-rotativa-public.php (modified) (2 diffs)
• tags/1.2.2/public/css/sweetalert2.min.css (added)
• tags/1.2.2/public/js/rotativa-public.js (modified) (1 diff)
• tags/1.2.2/public/js/sweetalert2.min.js (added)
• tags/1.2.2/rotativa.php (copied) (copied from rotativa/trunk/rotativa.php) (2 diffs)
• trunk/README.txt (modified) (2 diffs)
• trunk/public/class-rotativa-public.php (modified) (2 diffs)
• trunk/public/css/sweetalert2.min.css (added)
• trunk/public/js/rotativa-public.js (modified) (1 diff)
• trunk/public/js/sweetalert2.min.js (added)
• trunk/rotativa.php (modified) (2 diffs)

rotativa/tags/1.2.2/README.txt

@@ -5 +5 @@
 Requires at least: 4.7
 Tested up to: 4.9.8
-Stable tag: 1.2.1
+Stable tag: 1.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -59 +59 @@
 == Changelog ==
 
+= 1.2.2 =
+* Fixed a bug where sweetalert2 wasn't loading on frontend.
+
 = 1.2.1 =
 * Fixed a bug where shortcode wouldn't accept the ID attribute.

rotativa/tags/1.2.2/public/class-rotativa-public.php

@@ -102 +102 @@
             'button_label' => esc_html__( 'Download PDF', 'rotativa' )
         ] );
+        $pdf_error = apply_filters( 'rotativa_pdf_error_fe', [
+            'title' => esc_html__( 'Error!', 'rotativa' )
+        ] );
 
         wp_enqueue_script( $this->plugin_name . '-sweetalert2', plugin_dir_url( __FILE__ ) . 'js/sweetalert2.min.js', array( 'jquery' ), '7.26.11', true );
@@ -112 +115 @@
                 'generate_pdf'   => esc_html__( 'Generate PDF', 'rotativa' ),
                 'generating_pdf' => esc_html__( 'Generating...', 'rotativa' ),
-                'pdf_success' => $pdf_success
+                'pdf_success'    => $pdf_success,
+                'pdf_error'      => $pdf_error
             ]
         );

rotativa/tags/1.2.2/public/js/rotativa-public.js

@@ -24 +24 @@
           var data = JSON.parse( response.data );
 
-          swal({
-            title: rotativa.pdf_success.title,
-            type: 'success',
-            html: '<p>' + rotativa.pdf_success.description + '</p><p><a href="' + data.pdfUrl + '" class="button is-primary" download>' + rotativa.pdf_success.button_label + '</a></p>',
-            showConfirmButton: false
-          });
+          if ( data.error ) {
+
+            swal({
+              type: 'error',
+              title: rotativa.pdf_error.title,
+              text: data.error
+            });
+
+          } else {
+
+            swal({
+              title: rotativa.pdf_success.title,
+              type: 'success',
+              html: '<p>' + rotativa.pdf_success.description + '</p><p><a href="' + data.pdfUrl + '" class="button is-primary" download>' + rotativa.pdf_success.button_label + '</a></p>',
+              showConfirmButton: false
+            });
+
+          }
         }
       },

rotativa/tags/1.2.2/rotativa.php

@@ -17 +17 @@
  * Plugin URI:        https://wordpress.org/plugins/search/rotativa/
  * Description:       Convert HTML to PDF in the cloud in a extremely easy and fast way.
- * Version:           1.2.1
+ * Version:           1.2.2
  * Author:            RotativaHQ
  * Author URI:        https://rotativahq.com/
@@ -31 +31 @@
 }
 
-define( 'ROTATIVA_VERSION', '1.2.1' );
+define( 'ROTATIVA_VERSION', '1.2.2' );
 
 /**

rotativa/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 4.7
 Tested up to: 4.9.8
-Stable tag: 1.2.1
+Stable tag: 1.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -59 +59 @@
 == Changelog ==
 
+= 1.2.2 =
+* Fixed a bug where sweetalert2 wasn't loading on frontend.
+
 = 1.2.1 =
 * Fixed a bug where shortcode wouldn't accept the ID attribute.

rotativa/trunk/public/class-rotativa-public.php

@@ -102 +102 @@
             'button_label' => esc_html__( 'Download PDF', 'rotativa' )
         ] );
+        $pdf_error = apply_filters( 'rotativa_pdf_error_fe', [
+            'title' => esc_html__( 'Error!', 'rotativa' )
+        ] );
 
         wp_enqueue_script( $this->plugin_name . '-sweetalert2', plugin_dir_url( __FILE__ ) . 'js/sweetalert2.min.js', array( 'jquery' ), '7.26.11', true );
@@ -112 +115 @@
                 'generate_pdf'   => esc_html__( 'Generate PDF', 'rotativa' ),
                 'generating_pdf' => esc_html__( 'Generating...', 'rotativa' ),
-                'pdf_success' => $pdf_success
+                'pdf_success'    => $pdf_success,
+                'pdf_error'      => $pdf_error
             ]
         );

rotativa/trunk/public/js/rotativa-public.js

@@ -24 +24 @@
           var data = JSON.parse( response.data );
 
-          swal({
-            title: rotativa.pdf_success.title,
-            type: 'success',
-            html: '<p>' + rotativa.pdf_success.description + '</p><p><a href="' + data.pdfUrl + '" class="button is-primary" download>' + rotativa.pdf_success.button_label + '</a></p>',
-            showConfirmButton: false
-          });
+          if ( data.error ) {
+
+            swal({
+              type: 'error',
+              title: rotativa.pdf_error.title,
+              text: data.error
+            });
+
+          } else {
+
+            swal({
+              title: rotativa.pdf_success.title,
+              type: 'success',
+              html: '<p>' + rotativa.pdf_success.description + '</p><p><a href="' + data.pdfUrl + '" class="button is-primary" download>' + rotativa.pdf_success.button_label + '</a></p>',
+              showConfirmButton: false
+            });
+
+          }
         }
       },

rotativa/trunk/rotativa.php

@@ -17 +17 @@
  * Plugin URI:        https://wordpress.org/plugins/search/rotativa/
  * Description:       Convert HTML to PDF in the cloud in a extremely easy and fast way.
- * Version:           1.2.1
+ * Version:           1.2.2
  * Author:            RotativaHQ
  * Author URI:        https://rotativahq.com/
@@ -31 +31 @@
 }
 
-define( 'ROTATIVA_VERSION', '1.2.1' );
+define( 'ROTATIVA_VERSION', '1.2.2' );
 
 /**