From 2eca22795709629e195b7d442e13bf78289ffa39 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 15 Jul 2015 11:37:41 +0530 Subject: [PATCH 1/2] [fix] freeze btn during upload --- frappe/public/js/frappe/upload.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js index 481ffda426..1031937326 100644 --- a/frappe/public/js/frappe/upload.js +++ b/frappe/public/js/frappe/upload.js @@ -92,7 +92,8 @@ frappe.upload = { var attachment = r.message; opts.callback(attachment, r); $(document).trigger("upload_complete", attachment); - } + }, + btn: opts.btn }); } } From ed29c8b25e0861b64f9c24cf19dee47bbfb1e4fb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 15 Jul 2015 12:28:55 +0530 Subject: [PATCH 2/2] [fix] Mozilla hack for images in table for print --- frappe/templates/styles/standard.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/templates/styles/standard.css b/frappe/templates/styles/standard.css index a2b9e0fb1a..2e5e4b5469 100644 --- a/frappe/templates/styles/standard.css +++ b/frappe/templates/styles/standard.css @@ -24,6 +24,11 @@ .page-break:last-child { border-bottom: 0px; } + + /* mozilla hack for images in table */ + body:last-child .print-format td img { + width: 100% !important; + } } @media print {