[Jifty-commit] jifty branch, autocomplete-refactor, updated. 2132ed8fd5d8c901de3a55332cb8f59a7d6700d2

Jifty commits jifty-commit at lists.jifty.org
Thu Mar 25 13:01:58 EDT 2010


The branch, autocomplete-refactor has been updated
       via  2132ed8fd5d8c901de3a55332cb8f59a7d6700d2 (commit)
       via  3890534b0ddff61841e5d04e0d99ed02c4159c3b (commit)
      from  3f51e76eb07ec6421004423e25aa91d9b4dfb82b (commit)

Summary of changes:
 share/web/static/js/jifty.js       |    6 +++---
 share/web/static/js/jifty_utils.js |    4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 3890534b0ddff61841e5d04e0d99ed02c4159c3b
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Mar 25 13:00:49 2010 -0400

    Add a Jifty.Utils.encodeEntities helper function
    
        which should die or at least be rewritten not to use jQuery in this way

diff --git a/share/web/static/js/jifty_utils.js b/share/web/static/js/jifty_utils.js
index 802301c..792586a 100644
--- a/share/web/static/js/jifty_utils.js
+++ b/share/web/static/js/jifty_utils.js
@@ -194,6 +194,10 @@ jQuery.extend(Jifty.Utils, {
 
     stripScripts: function(str) {
         return str.replace(/<script(.|\s)*?\/script>/g, "");
+    },
+
+    encodeEntities: function (str) {
+        return jQuery("<div />").text(str).html();
     }
 });
 

commit 2132ed8fd5d8c901de3a55332cb8f59a7d6700d2
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Mar 25 13:01:59 2010 -0400

    Encode HTML entities in label and value

diff --git a/share/web/static/js/jifty.js b/share/web/static/js/jifty.js
index 7431f2a..06b10f6 100644
--- a/share/web/static/js/jifty.js
+++ b/share/web/static/js/jifty.js
@@ -1797,11 +1797,11 @@ Jifty.addAutocompleter = function (id) {
             var value = data[1];
 
             if (label == value) {
-                return escape(label);
+                return Jifty.Utils.encodeEntities(label);
             }
             else {
-                return '<div class="ac_label">' + escape(label) + '</div>' +
-                       '<div class="ac_value">' + escape(value) + '</div>';
+                return '<div class="ac_label">' + Jifty.Utils.encodeEntities(label) + '</div>' +
+                       '<div class="ac_value">' + Jifty.Utils.encodeEntities(value) + '</div>';
             }
         },
     });

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


More information about the Jifty-commit mailing list