@@ -23,14 +23,23 @@ (string-join (hash-map scheme-hash (lambda (k v) (format "~A:~A" (js-quote k) v))) ", ") "}")) - + (define (js-quote thing) (cond ((number? thing) (number->string thing)) - ((or (string? thing) (symbol? thing)) (format "'~A'" thing)) + ((or (string? thing) (symbol? thing)) + (format "\"~A\"" (careful-string-quote (if (string? thing) + thing + (symbol->string thing))))) ((eq? thing #t) "true") ((eq? thing #f) "false") (else (e "Don't know how to js-quote ~A." thing)))) +(define (careful-string-quote scm-str) + (pregexp-replace-many scm-str + ("\n" => " ") + ("\r" => " ") + ("\"" => "'"))) + (define (js-call-on-load fn-name #:quote-all (quote-all #f) . args) (format "$(document).ready(function() { ~A })" (apply js-call fn-name #:quote-all quote-all args))) js.scm 9ccdcd64d075edcbf1354f448fc535c002c4918c Rob Hunter rob.hunter@gmail.com http://github.com/vegashacker/leftparen/commit/8ab1648f91f77aa2b28489411fc05a2210005bc9 8ab1648f91f77aa2b28489411fc05a2210005bc9 2008-11-25T12:28:30-08:00 2008-11-25T12:28:30-08:00 safer quoting b4b310828c249df317da2585652fff1801f471a0 Rob Hunter rob.hunter@gmail.com