Changeset 2869326

Timestamp:

02/22/2023 11:21:29 AM (3 years ago)

Author:

baden03

Message:

fixed issue with safari not printing correctly

Location:

print-o-matic/trunk

Files:

• README.md (modified) (1 diff)
• js/print_elements.js (modified) (1 diff)
• js/printomat.js (modified) (6 diffs)
• print-o-matic.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)

print-o-matic/trunk/README.md

@@ -6 +6 @@
 * Requires at least: 4.9
 * Tested up to: 6.1.1
-* Stable tag: 2.1.9
+* Stable tag: 2.1.10
 * License: GPLv2 or later
 * License URI: https://www.gnu.org/licenses/gpl-2.0.html

print-o-matic/trunk/js/print_elements.js

@@ -60 +60 @@
     };
 
-    var _print = function (elements, pause_time, has_top_html, has_bot_html) {
+    var _print = function (elements, has_top_html, has_bot_html) {
         for (var i = 0; i < elements.length; i++) {
             _walkTree(elements[i], _attachPrintClasses);
         }
-        setTimeout(function () {
-            window.print();
-        }, 500);
+  
+        window.addEventListener('afterprint', e => after_print_clean_up(elements, has_top_html, has_bot_html) );
+        window.print();
+    };
 
-        setTimeout(function () {
-            for (i = 0; i < elements.length; i++) {
-                _walkTree(elements[i], _cleanup);
-            }
-            pom_cleanup(has_top_html, has_bot_html);
-        }, pause_time);
-        
-    };
+    function after_print_clean_up(elements, has_top_html, has_bot_html){
+        //console.log('clean up on isle 5');
+        for (var i = 0; i < elements.length; i++) {
+            _walkTree(elements[i], _cleanup);
+        }
+        pom_cleanup(has_top_html, has_bot_html);
+    }
 
     return {

print-o-matic/trunk/js/printomat.js

@@ -1 +1 @@
 /*!
- * Print-O-Matic JavaScript v2.0.11
+ * Print-O-Matic JavaScript v2.0.13
  * https://pluginoven.com/plugins/print-o-matic/
 */
@@ -10 +10 @@
         var this_print_data;
 
+        // TODO: must be a better way of assigning this dynamic print_data variable
         if(eval('typeof print_data_' + id) !== "undefined"){
             this_print_data = eval('print_data_' + id );
@@ -44 +45 @@
         var trigger = jQuery(this);
         var target = trigger.data('print_target');
-    
+        
         if(!target){
             classes = trigger.attr("class").split(/\s+/);
@@ -77 +78 @@
                 });
             }
-            
         });
 
@@ -86 +86 @@
         
         var pause_time = print_data.pom_pause_time;
-        if(!pause_time){
-            pause_time = 2000;
-        }
         if(this_print_data && 'pom_pause_time' in this_print_data){
             pause_time = this_print_data.pom_pause_time;
@@ -94 +91 @@
 
         if(targets){
+            if(pause_time){
+                console.log('pause_time hase been removed for now');
+            }
             PrintElements.print(targets, pause_time, has_top_html, has_bot_html);
         }       

print-o-matic/trunk/print-o-matic.php

@@ -5 +5 @@
 Plugin URI: https://pluginoven.com/plugins/print-o-matic/
 Description: Shortcode that adds a printer icon, allowing the user to print the post or a specified HTML element in the post.
-Version: 2.1.9
+Version: 2.1.10
 Author: twinpictures
 Author URI: https://twinpictures.de
@@ -18 +18 @@
 class WP_Print_O_Matic {
 
-    var $version = '2.1.9';
+    var $version = '2.1.10';
     var $domain = 'printomat';
     var $options_name = 'WP_Print_O_Matic_options';
@@ -68 +68 @@
         wp_register_script('printomatic-js', plugins_url('js/printomat.js', __FILE__), array('jquery'), '2.0.11', true);
         wp_register_script('pe-js', plugins_url('js/print_elements.js', __FILE__), array('printomatic-js'), '1.1', true);
-
+        
         //prep options for injection
         $print_data = [
@@ -76 +76 @@
             'pom_pause_time' => $this->options['pause_time'],
         ];
-        wp_add_inline_script( 'printomatic-js', 'const print_data = ' . json_encode( $print_data ), 'before' );
+        wp_add_inline_script( 'printomatic-js', 'var print_data = ' . json_encode( $print_data ), 'before' );
 
         //css
@@ -199 +199 @@
             $print_data['pom_pause_time'] = $pause_before_print;
         }
-        wp_add_inline_script( 'printomatic-js', 'const print_data_'.$id.' = ' . json_encode( $print_data ) );
+        wp_add_inline_script( 'printomatic-js', 'var print_data_'.$id.' = ' . json_encode( $print_data ) );
 
         //return nothing if usign an external button

print-o-matic/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.9
 Tested up to: 6.1.1
-Stable tag: 2.1.9
+Stable tag: 2.1.10
 Requires PHP: 7.2
 License: GPLv2 or later
@@ -50 +50 @@
 
 == Changelog ==
+
+= 2.1.10 =
+* removed pause before print
+* fixed issue of not printing correctly in safari
 
 = 2.1.9 =