Skip to content

Commit

Permalink
[fc] Repository: plone.app.discussion
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2018-10-25T23:34:21+02:00
Author: Filippo Campi (eikichi18) <filippo.campi@redturtle.it>
Commit: plone/plone.app.discussion@0336d0f

[doc][fix] updated CHANGES + changed the method to wait for page to load

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/javascripts/moderation.js
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-10-25T23:46:52+02:00
Author: Filippo Campi (eikichi18) <filippo.campi@redturtle.it>
Commit: plone/plone.app.discussion@3356240

[doc] fixed a typo

Files changed:
M CHANGES.rst
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-12-13T09:36:47+01:00
Author: Filippo Campi (eikichi18) <filippo.campi@redturtle.it>
Commit: plone/plone.app.discussion@08dd858

Merge branch 'master' into filippo_load_moderation_js

Files changed:
M CHANGES.rst
M setup.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-12-13T09:38:12+01:00
Author: Filippo Campi (eikichi18) <filippo.campi@redturtle.it>
Commit: plone/plone.app.discussion@51bad41

[doc] updated CHANGES

Files changed:
M CHANGES.rst
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-12-19T01:36:58+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.discussion@b7fe86c

Merge pull request #144 from RedTurtle/filippo_load_moderation_js

window load on moderation.js doesn't work on some version of FF and IE

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/javascripts/moderation.js
  • Loading branch information
@jensens
jensens committed Dec 19, 2018
1 parent be46049 commit 876a11b
Showing 1 changed file with 60 additions and 14 deletions.
74 changes: 60 additions & 14 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,80 @@
Repository: plone.app.relationfield
Repository: plone.app.discussion


Branch: refs/heads/master
Date: 2018-12-17T10:45:12+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.relationfield/commit/ecf8a8401e077e8d3f411a98df6c465be7d22ea6
Date: 2018-10-25T23:34:21+02:00
Author: Filippo Campi (eikichi18) <filippo.campi@redturtle.it>
Commit: https://github.com/plone/plone.app.discussion/commit/0336d0f7c9019a229d00cd9aaf15dc5e32b21fcc

[doc][fix] updated CHANGES + changed the method to wait for page to load

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/javascripts/moderation.js

b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex 7220d757..f472b676 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -15,6 +15,10 @@ New features:\n \n Bug fixes:\n \n+- Changed $(window).load with $(document).ready in moderation.js \n+ because in some version of FF and IE doesn't work.\n+ [eikcihi18]\n+\n - Fix location of controlpanel events.\n [jensens]\n \ndiff --git a/plone/app/discussion/browser/javascripts/moderation.js b/plone/app/discussion/browser/javascripts/moderation.js\nindex d2a2b9d5..17a31799 100644\n--- a/plone/app/discussion/browser/javascripts/moderation.js\n+++ b/plone/app/discussion/browser/javascripts/moderation.js\n@@ -24,10 +24,9 @@ require([ // jshint ignore:line\n //#JSCOVERAGE_IF 0\n \n /**************************************************************************\n- * Window Load Function: Executes when complete page is fully loaded,\n- * including all frames,\n+ * Document Ready Function: Executes when DOM is ready.\n **************************************************************************/\n- $(window).load(function () {\n+ $(document).ready(function () {\n \n /**********************************************************************\n * Delete a single comment.\n"

Repository: plone.app.discussion


Branch: refs/heads/master
Date: 2018-10-25T23:46:52+02:00
Author: Filippo Campi (eikichi18) <filippo.campi@redturtle.it>
Commit: https://github.com/plone/plone.app.discussion/commit/3356240104d5296eaa23900ec2710f0a7f1bf015

[doc] fixed a typo

Files changed:
M CHANGES.rst

b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex f472b676..dffcbe55 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -17,7 +17,7 @@ Bug fixes:\n \n - Changed $(window).load with $(document).ready in moderation.js \n because in some version of FF and IE doesn't work.\n- [eikcihi18]\n+ [eikichi18]\n \n - Fix location of controlpanel events.\n [jensens]\n"

Repository: plone.app.discussion


Branch: refs/heads/master
Date: 2018-12-13T09:36:47+01:00
Author: Filippo Campi (eikichi18) <filippo.campi@redturtle.it>
Commit: https://github.com/plone/plone.app.discussion/commit/08dd858b9124fcdd09f856dfeacc710f2505f407

Merge branch 'master' into filippo_load_moderation_js

Files changed:
M CHANGES.rst
M setup.py

b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex dffcbe55..db436e66 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -1,7 +1,7 @@\n Changelog\n =========\n \n-3.0.7 (unreleased)\n+3.1.1 (unreleased)\n ------------------\n \n Breaking changes:\n@@ -10,6 +10,18 @@ Breaking changes:\n \n New features:\n \n+- *add item here*\n+\n+Bug fixes:\n+\n+- *add item here*\n+\n+\n+3.1.0 (2018-10-30)\n+------------------\n+\n+New features:\n+\n - Added notification about the publishing or elimination of a comment.\n [eikichi18]\n \ndiff --git a/setup.py b/setup.py\nindex a30fec09..ed0394e3 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -4,7 +4,7 @@\n from setuptools import setup\n \n \n-version = '3.0.7.dev0'\n+version = '3.1.1.dev0'\n \n install_requires = [\n 'setuptools',\n"

Repository: plone.app.discussion


Branch: refs/heads/master
Date: 2018-12-13T09:38:12+01:00
Author: Filippo Campi (eikichi18) <filippo.campi@redturtle.it>
Commit: https://github.com/plone/plone.app.discussion/commit/51bad41a3e4f49eee2c991c9181aecf4d1a0894a

Remove installation of plone.app.widgets default profile in tests
[doc] updated CHANGES

Files changed:
M CHANGES.rst
M plone/app/relationfield/testing.py

b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex 6ea9d77..3033b70 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,10 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Remove installation of plone.app.widgets default profile in tests.\n+ In Plone 5.0/5.1 with plone.app.widgets >= 2.0, the profile is only a dummy profile for BBB.\n+ In Plone 5.2 will be removed.\n+ [jensens]\n \n \n 1.4.2 (2018-09-28)\ndiff --git a/plone/app/relationfield/testing.py b/plone/app/relationfield/testing.py\nindex aae0be4..fc2e4eb 100644\n--- a/plone/app/relationfield/testing.py\n+++ b/plone/app/relationfield/testing.py\n@@ -122,7 +122,6 @@ def setUpZope(self, app, configurationContext):\n \n def setUpPloneSite(self, portal):\n self.applyProfile(portal, 'plone.app.dexterity:default')\n- self.applyProfile(portal, 'plone.app.widgets:default')\n self.applyProfile(portal, 'plone.app.relationfield:default')\n \n \n"
b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex db436e66..abce5e07 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,9 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Changed $(window).load with $(document).ready in moderation.js\n+ because in some version of FF and IE doesn't work.\n+ [eikichi18]\n \n \n 3.1.0 (2018-10-30)\n@@ -27,10 +29,6 @@ New features:\n \n Bug fixes:\n \n-- Changed $(window).load with $(document).ready in moderation.js \n- because in some version of FF and IE doesn't work.\n- [eikichi18]\n-\n - Fix location of controlpanel events.\n [jensens]\n \n"

Repository: plone.app.relationfield
Repository: plone.app.discussion


Branch: refs/heads/master
Date: 2018-12-19T01:34:14+01:00
Date: 2018-12-19T01:36:58+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.relationfield/commit/57e6bfa8ac1fbf62b54f31827971d8c1336f0a2f
Commit: https://github.com/plone/plone.app.discussion/commit/b7fe86c4ed94c1dc9506aa1c1d96cfe30ac2dd3d

Merge pull request #25 from plone/jensens/rm-p.a.widgets-profile
Merge pull request #144 from RedTurtle/filippo_load_moderation_js

Remove installation of plone.app.widgets default profile in tests
window load on moderation.js doesn't work on some version of FF and IE

Files changed:
M CHANGES.rst
M plone/app/relationfield/testing.py
M plone/app/discussion/browser/javascripts/moderation.js

b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex 6ea9d77..3033b70 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,10 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Remove installation of plone.app.widgets default profile in tests.\n+ In Plone 5.0/5.1 with plone.app.widgets >= 2.0, the profile is only a dummy profile for BBB.\n+ In Plone 5.2 will be removed.\n+ [jensens]\n \n \n 1.4.2 (2018-09-28)\ndiff --git a/plone/app/relationfield/testing.py b/plone/app/relationfield/testing.py\nindex aae0be4..fc2e4eb 100644\n--- a/plone/app/relationfield/testing.py\n+++ b/plone/app/relationfield/testing.py\n@@ -122,7 +122,6 @@ def setUpZope(self, app, configurationContext):\n \n def setUpPloneSite(self, portal):\n self.applyProfile(portal, 'plone.app.dexterity:default')\n- self.applyProfile(portal, 'plone.app.widgets:default')\n self.applyProfile(portal, 'plone.app.relationfield:default')\n \n \n"
b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex 3218b90e..abce5e07 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,9 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Changed $(window).load with $(document).ready in moderation.js\n+ because in some version of FF and IE doesn't work.\n+ [eikichi18]\n \n \n 3.1.0 (2018-10-30)\ndiff --git a/plone/app/discussion/browser/javascripts/moderation.js b/plone/app/discussion/browser/javascripts/moderation.js\nindex d2a2b9d5..17a31799 100644\n--- a/plone/app/discussion/browser/javascripts/moderation.js\n+++ b/plone/app/discussion/browser/javascripts/moderation.js\n@@ -24,10 +24,9 @@ require([ // jshint ignore:line\n //#JSCOVERAGE_IF 0\n \n /**************************************************************************\n- * Window Load Function: Executes when complete page is fully loaded,\n- * including all frames,\n+ * Document Ready Function: Executes when DOM is ready.\n **************************************************************************/\n- $(window).load(function () {\n+ $(document).ready(function () {\n \n /**********************************************************************\n * Delete a single comment.\n"

0 comments on commit 876a11b

Please sign in to comment.