diff --git a/Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js b/Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js index 78bb1291b..3a3088a62 100644 --- a/Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js +++ b/Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js @@ -179,7 +179,7 @@ var selector = activePalette, selectorParent = $(event.target).parents("#" + selector.attr('id')).length; - if (event.target === $(selector)[0] || event.target === selectorOwner || selectorParent > 0) { + if (event.target === $.find(selector)[0] || event.target === selectorOwner || selectorParent > 0) { return; } diff --git a/Allura/allura/templates/repo/commit.html b/Allura/allura/templates/repo/commit.html index f92483821..630a1aaa4 100644 --- a/Allura/allura/templates/repo/commit.html +++ b/Allura/allura/templates/repo/commit.html @@ -49,9 +49,10 @@ {{ super() }}