[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 8de6c3bef0611abf1d0785297f0a77d4baf70834

Evergreen Git git at git.evergreen-ils.org
Thu Sep 29 13:03:20 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_0 has been updated
       via  8de6c3bef0611abf1d0785297f0a77d4baf70834 (commit)
      from  77c5ecb8d22355451c2f3756ea9a3cf7919e0e12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8de6c3bef0611abf1d0785297f0a77d4baf70834
Author: Liam Whalen <lwhalen at evergreen-dev.catalogue.nrcan.gc.ca>
Date:   Fri Sep 16 08:52:08 2011 -0400

    Modified spine_labels.js to retain UTF-8 encoding
    
    Dan Wells posted a fix to the DEV list for receipt printing that allowed the
    receipt printer to print UTF-8 characters.  I used the ideas in that fix to
    modify spine_labels.js.  In spine_labels.js, the url passed to the preview in
    preview_xul_192 was encoding the url with the javascript encode() function.
    This function does not preserve UTF-8 encodings.  I changed the function to
    encodeURIComponent, and UTF-8 characters are now displayed properly by the
    spine label printer code.
    
    Signed-off-by: Liam Whalen <lwhalen at evergreen-dev.catalogue.nrcan.gc.ca>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.js b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
index fb2eccf..96b81cd 100644
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.js
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
@@ -613,7 +613,7 @@
                     'tab_name' : $("catStrings").getString('staff.cat.spine_labels.preview.title')
                 },
                 { 
-                    'url' : 'data:text/html;charset=utf-8,'+window.escape(html),
+                    'url' : 'data:text/html;charset=utf-8,' + encodeURIComponent(html),
                     'html_source' : html,
                     'show_print_button' : 1,
                     'printer_context' : 'label',

-----------------------------------------------------------------------

Summary of changes:
 .../xul/staff_client/server/cat/spine_labels.js    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list