From e2d8543020b97f01310c849aecc4d6a3532a3c4c Mon Sep 17 00:00:00 2001 From: ichim-david Date: Sun, 3 Feb 2013 22:01:46 +0200 Subject: [PATCH] Cherry-picked 7a48d5 and 10f031 from 2.1.x branch to master --- CHANGES.txt | 3 +++ plone/app/discussion/browser/javascripts/controlpanel.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 4fee121..51576ee 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,9 @@ Changelog 2.2.4 (unreleased) ------------------ +- Check for 'checked' attribute in a way that work also for jQuery 1.7 + [ichimdav] + - Better fix for #13037 by removing submit event trigger altogether [ichimdav] diff --git a/plone/app/discussion/browser/javascripts/controlpanel.js b/plone/app/discussion/browser/javascripts/controlpanel.js index 8449f6e..ba32492 100644 --- a/plone/app/discussion/browser/javascripts/controlpanel.js +++ b/plone/app/discussion/browser/javascripts/controlpanel.js @@ -103,7 +103,7 @@ $("input,select").live("change", function (e) { var id = $(this).attr("id"); if (id === "form-widgets-globally_enabled-0") { - if ($(this).attr("checked") === true) { + if ($(this).attr("checked")) { $("#content").addClass("globally_enabled"); } else {