projects / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 418b76b)
printing from modal windows... might should do modal and non-modal windows this way...
authorphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 16 Jun 2006 21:09:34 +0000 (21:09 +0000)
committerphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 16 Jun 2006 21:09:34 +0000 (21:09 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@4665 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/xul/staff_client/chrome/content/util/print.js patch | blob | history
Open-ILS/xul/staff_client/server/patron/bill_history.xul patch | blob | history

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/print.js b/Open-ILS/xul/staff_client/chrome/content/util/print.js
index 9a6025b..2f9dcdb 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/util/print.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js
@@ -53,8 +53,8 @@ util.print.prototype = {
                        var w;
                        switch(content_type) {
                                case 'text/html' :
-                                       var jsrc = 'data:text/javascript,' + window.escape('var params = { "data" : ' + js2JSON(params.data) + ', "list" : ' + js2JSON(params.list) + '};');
-                                       w = obj.win.open('data:text/html,<html><head><script src="' + window.escape(jsrc) + '"></script></head><body>' + window.escape(msg) + '</body></html>','receipt_temp','chrome,resizable');
+                                       var jsrc = 'data:text/javascript,' + window.escape('var params = { "data" : ' + js2JSON(params.data) + ', "list" : ' + js2JSON(params.list) + '}; function my_init() { if (' + (typeof params.modal != 'undefined' ? 'true' : 'false') + ') window.print(); }');
+                                       w = obj.win.open('data:text/html,<html><head><script src="' + window.escape(jsrc) + '"></script></head><body onload="my_init();">' + window.escape(msg) + '</body></html>','receipt_temp','chrome,resizable');
                                break;
                                default:
                                        w = obj.win.open('data:' + content_type + ',' + window.escape(msg),'receipt_temp','chrome,resizable');
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.xul b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
index bb0b81d..374c490 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
@@ -289,6 +289,7 @@
                                        'footer' : g.data.print_list_templates[template].footer,
                                        'type' : g.data.print_list_templates[template].type,
                                        'list' : g.bill_list.dump_with_keys(),
+                                       'modal' : true,
                                };
                                JSAN.use('util.print'); var print = new util.print();
                                print.tree_list( params );
Evergreen ILS