Skip to content

Commit

Permalink
Merge pull request #122 from plentymarkets/fix/comment_breaks
Browse files Browse the repository at this point in the history
Don't convert line break to br and add css white space prop
  • Loading branch information
felixgehrmann authored May 4, 2021
2 parents ff848c5 + 31a36cd commit 44ee39e
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 16 deletions.
10 changes: 10 additions & 0 deletions meta/documents/changelog_de.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Release Notes für Feedback

## v4.0.2 (2021-05-05)

### TODO

- Nach dem Update auf Version 4.0.2 müssen Widgets im Menü **CMS » ShopBuilder** durch Klick auf **Inhalte neu generieren** aktualisiert werden.

### Behoben

- Zeilenumbrüche in Kommentaren zu Kundenrezensionen wurden als `<br>`-Tag gerendert. Dies wurde behoben.

## v4.0.1 (2021-04-28)

### TODO
Expand Down
12 changes: 11 additions & 1 deletion meta/documents/changelog_en.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
# Release Notes for Feedback

## v4.0.2 (2021-05-05)

### TODO

- After updating the feedback plugin to v4.0.2, it is necessary to re-generate ShopBuilder widgets via the **Regenerate contents** button in the **CMS » ShopBuilder** menu.

### Fixed

- Line breaks in comments for customer reviews were rendered as `<br>` tags. This has been fixed.

## v4.0.1 (2021-04-28)

### TODO

- This version of the feedback plugin is only compatible with Ceres v5.0.27 or higher.
- After updating the feedback plugin to v4.0.1, it is necessary to re-generate ShopBuilder widgets via the **Regenerate contents** button in the **CMS » ShopBuilder** menu.

### Behoben
### Fixed

- The number of feedbacks in the star rating widget was incorrectly positioned. As a result, the rating stars concealed the feedback count. This has been fixed.

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plentymarkets-feedback",
"license": "AGPL-3.0",
"version": "4.0.1",
"version": "4.0.2",
"repository": {
"type": "git",
"url": "https://github.com/plentymarkets/feedback-plugin.git"
Expand Down
2 changes: 1 addition & 1 deletion plugin.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "4.0.1",
"version": "4.0.2",
"name": "Feedback",
"marketplaceName": {
"de": "Kunden-Feedback",
Expand Down
3 changes: 2 additions & 1 deletion resources/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@
vertical-align: bottom; }
.feedback-container .feedback-list .feedback .feedback-comment .feedback-comment-text {
margin-bottom: 0px;
word-break: break-word; }
word-break: break-word;
white-space: pre-line; }
.feedback-container .feedback-list .feedback .feedback-comment .feedback-replies {
margin-top: 20px;
padding-left: 30px; }
Expand Down
2 changes: 1 addition & 1 deletion resources/css/main.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions resources/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
.feedback-comment-text {
margin-bottom: 0px;
word-break: break-word;
white-space: pre-line;
}

.feedback-replies {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/dist/chunks/feedback-2.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion resources/js/dist/chunks/feedback-2.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/js/dist/chunks/feedback-3.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/js/dist/chunks/feedback-3.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/js/dist/feedback-server.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion resources/js/dist/feedback-server.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/js/dist/feedback-server.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/js/dist/feedback-server.min.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,7 @@ export default {
return this.feedbackData
.feedbackComment
.comment
.message.split('\n')
.join('<br />')
.message
},
isPurchased () {
Expand Down

0 comments on commit 44ee39e

Please sign in to comment.