From 4bc25bf7e78cbebff431917a73c1bf6865759488 Mon Sep 17 00:00:00 2001 From: Giel Berkers Date: Tue, 22 Nov 2011 12:07:34 +0100 Subject: [PATCH] -fixed issue with a colon in the datasource xml-name --- assets/symphony.checkbox.js | 1 - assets/symphony.selectbox.js | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/assets/symphony.checkbox.js b/assets/symphony.checkbox.js index ae203ab..d81aac1 100644 --- a/assets/symphony.checkbox.js +++ b/assets/symphony.checkbox.js @@ -55,7 +55,6 @@ if (object.is(':checked')) div.main.addClass('checked'); /* Event handlers */ - div.main.bind('click.checkbox', click); object.bind('change.checkbox', update); diff --git a/assets/symphony.selectbox.js b/assets/symphony.selectbox.js index ccadba7..503dcff 100644 --- a/assets/symphony.selectbox.js +++ b/assets/symphony.selectbox.js @@ -41,7 +41,7 @@ var select = $(this); var selectbox = select.siblings('.selectbox'); var options = select.find('option'); - var escaper = function(s) { return s.replace(/([#;&,\.\+\*\~':"\!\^$\[\]\(\)=>\|])/g, "\\$1"); }; + var escaper = function(s) { return s.replace(/([#;&,\.\+\*\~':"\!\^$\[\]\(\)=>\|])/g, "\\$1"); }; if (!select.attr('multiple')) { selectbox @@ -154,7 +154,16 @@ .addClass('value') .html('' + $(this).text() + ''); - if ($(this).val() == object.val()) li.addClass('selected'); + + + if ($(this).val() == object.val()) { + li.addClass('selected'); + } else { + if($.inArray($(this).val(), object.val()) != -1) + { + li.addClass('selected'); + } + } ul[$(this).parent().is('optgroup') ? 'nested' : 'main'].append(li); } @@ -250,4 +259,4 @@ }; -})(jQuery.noConflict()); +})(jQuery.noConflict()); \ No newline at end of file