branch develop updated (7667843 -> 5a025da)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from 7667843 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5a025da fixes #1388: Create poll form broken since struts 2.3.32 update The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5a025dafd935450415b21879e931ee70d759293a Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Mar 24 17:45:56 2017 +0100 fixes #1388: Create poll form broken since struts 2.3.32 update Summary of changes: .../main/resources/template/jquery/theme.properties | 19 +++++++++++++++++++ .../src/main/webapp/js/ckeditor.config.js | 3 ++- pollen-ui-struts2/src/main/webapp/js/createPoll.js | 8 ++++---- pom.xml | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 pollen-ui-struts2/src/main/resources/template/jquery/theme.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 5a025dafd935450415b21879e931ee70d759293a Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Mar 24 17:45:56 2017 +0100 fixes #1388: Create poll form broken since struts 2.3.32 update --- .../main/resources/template/jquery/theme.properties | 19 +++++++++++++++++++ .../src/main/webapp/js/ckeditor.config.js | 3 ++- pollen-ui-struts2/src/main/webapp/js/createPoll.js | 8 ++++---- pom.xml | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties b/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties new file mode 100644 index 0000000..b1e18a8 --- /dev/null +++ b/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties @@ -0,0 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +parent = css_xhtml diff --git a/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js b/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js index 6af4a7e..8209104 100644 --- a/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js +++ b/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js @@ -28,11 +28,12 @@ CKEDITOR.editorConfig = function (config) { // ['Cut', 'Copy', 'Paste', 'PasteText', /*'PasteFromWord'*/, '-', 'Undo', 'Redo', '-', 'Scayt'], // [ 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'], ['Styles', 'Format'], - ['Bold', 'Italic', 'Strike', 'Underline','Strike','Subscript','Superscript'], + ['Bold', 'Italic', 'Strike', 'Underline','Subscript','Superscript'], ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote', 'TextColor','BGColor'], // '/', ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/, 'Link', 'Unlink', 'Anchor' ] ]; + config.removePlugins = 'elementspath'; }; \ No newline at end of file diff --git a/pollen-ui-struts2/src/main/webapp/js/createPoll.js b/pollen-ui-struts2/src/main/webapp/js/createPoll.js index e5da729..3be55ba 100644 --- a/pollen-ui-struts2/src/main/webapp/js/createPoll.js +++ b/pollen-ui-struts2/src/main/webapp/js/createPoll.js @@ -559,8 +559,8 @@ jQuery(document).ready(function () { container.removeClass('hidden').addClass('thispoll'). each(undisableAll); - $('[name="poll.pollType"]').attr('checked', false); - $('[name="poll.pollType"][value="' + type + '"]').attr('checked', 'checked'); + $('[name="poll.pollType"]').prop('checked', false); + $('[name="poll.pollType"][value="' + type + '"]').prop('checked', 'checked'); } function changeChoiceType(type) { @@ -573,8 +573,8 @@ jQuery(document).ready(function () { container.removeClass('hidden'). addClass('thischoice').each(undisableAll); - $('[name="poll.choiceType"]').attr('checked', false); - $('[name="poll.choiceType"][value="' + type + '"]').attr('checked', 'checked'); + $('[name="poll.choiceType"]').prop('checked', false); + $('[name="poll.choiceType"][value="' + type + '"]').prop('checked', 'checked'); } $('[name="poll.choiceAddAllowed"]').change(function () { diff --git a/pom.xml b/pom.xml index 5ad5692..0d39c09 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ <h2Version>1.3.172</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.32</struts2Version> - <jqueryPluginVersion>3.5.0</jqueryPluginVersion> + <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>8.1.11.v20130520</jettyVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm