From 0336d0f7c9019a229d00cd9aaf15dc5e32b21fcc Mon Sep 17 00:00:00 2001 From: Filippo Campi Date: Thu, 25 Oct 2018 23:34:21 +0200 Subject: [PATCH 1/3] [doc][fix] updated CHANGES + changed the method to wait for page to load --- CHANGES.rst | 4 ++++ plone/app/discussion/browser/javascripts/moderation.js | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7220d75..f472b67 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -15,6 +15,10 @@ New features: Bug fixes: +- Changed $(window).load with $(document).ready in moderation.js + because in some version of FF and IE doesn't work. + [eikcihi18] + - Fix location of controlpanel events. [jensens] diff --git a/plone/app/discussion/browser/javascripts/moderation.js b/plone/app/discussion/browser/javascripts/moderation.js index d2a2b9d..17a3179 100644 --- a/plone/app/discussion/browser/javascripts/moderation.js +++ b/plone/app/discussion/browser/javascripts/moderation.js @@ -24,10 +24,9 @@ require([ // jshint ignore:line //#JSCOVERAGE_IF 0 /************************************************************************** - * Window Load Function: Executes when complete page is fully loaded, - * including all frames, + * Document Ready Function: Executes when DOM is ready. **************************************************************************/ - $(window).load(function () { + $(document).ready(function () { /********************************************************************** * Delete a single comment. From 3356240104d5296eaa23900ec2710f0a7f1bf015 Mon Sep 17 00:00:00 2001 From: Filippo Campi Date: Thu, 25 Oct 2018 23:46:52 +0200 Subject: [PATCH 2/3] [doc] fixed a typo --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index f472b67..dffcbe5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -17,7 +17,7 @@ Bug fixes: - Changed $(window).load with $(document).ready in moderation.js because in some version of FF and IE doesn't work. - [eikcihi18] + [eikichi18] - Fix location of controlpanel events. [jensens] From 51bad41a3e4f49eee2c991c9181aecf4d1a0894a Mon Sep 17 00:00:00 2001 From: Filippo Campi Date: Thu, 13 Dec 2018 09:38:12 +0100 Subject: [PATCH 3/3] [doc] updated CHANGES --- CHANGES.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index db436e6..abce5e0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -14,7 +14,9 @@ New features: Bug fixes: -- *add item here* +- Changed $(window).load with $(document).ready in moderation.js + because in some version of FF and IE doesn't work. + [eikichi18] 3.1.0 (2018-10-30) @@ -27,10 +29,6 @@ New features: Bug fixes: -- Changed $(window).load with $(document).ready in moderation.js - because in some version of FF and IE doesn't work. - [eikichi18] - - Fix location of controlpanel events. [jensens]