Commit Graph

121 Commits

Author SHA1 Message Date
dependabot-preview[bot] 6e6fbc6783 Bump webpack from 4.39.2 to 4.39.3
Bumps [webpack](https://github.com/webpack/webpack) from 4.39.2 to 4.39.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.39.2...v4.39.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-09-02 14:24:00 +00:00
dependabot-preview[bot] e4a23632ee Bump sass-loader from 7.2.0 to 7.3.1
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.2.0 to 7.3.1.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.2.0...v7.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-08-25 18:03:47 +00:00
dependabot-preview[bot] 20a83bed16 Bump webpack from 4.39.1 to 4.39.2
Bumps [webpack](https://github.com/webpack/webpack) from 4.39.1 to 4.39.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.39.1...v4.39.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-08-18 14:22:01 +00:00
dependabot-preview[bot] 723815f081 Bump style-loader from 0.23.1 to 1.0.0
Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 0.23.1 to 1.0.0.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/style-loader/compare/v0.23.1...v1.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-08-11 17:43:33 +00:00
dependabot-preview[bot] b84b78d203 Bump webpack from 4.38.0 to 4.39.1
Bumps [webpack](https://github.com/webpack/webpack) from 4.38.0 to 4.39.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.38.0...v4.39.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-08-04 07:57:44 +00:00
dependabot-preview[bot] 4a401865f2
Bump css-loader from 2.1.1 to 3.0.0
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.0.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-06-25 21:33:38 +02:00
dependabot-preview[bot] 53f18a9770
Bump webpack from 4.31.0 to 4.32.2
Bumps [webpack](https://github.com/webpack/webpack) from 4.31.0 to 4.32.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.31.0...v4.32.2)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-05-27 11:35:14 +02:00
Christoph Wurst 278c281cc9
Deprecate oc_current_user, fix usage and move currentUser to the bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-05-08 09:44:51 +02:00
John Molakvoæ (skjnldsv) b38445b17a
Show comments and restore in popover menu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-04-02 12:24:48 +02:00
Roeland Jago Douma 41ef3d860c
Move comments to webpack
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-02-26 09:10:23 +01:00
Daniel Calviño Sánchez d2945a9375 Show autocompletion as soon as "@" is typed
In order to show the autocompletion it was needed to type at least
another character after "@", so only the mentions that matched that
character were shown. Now the autocompletion is shown as soon as "@" is
typed, which shows all the possible mentions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-01-31 13:49:43 +01:00
Daniel Calviño Sánchez bc74a44cbc Fix opening search results for comments
"OC.dirname" removes everything after the last "/", so a path without
slashes is returned without changes. "result.path" does not include
leading nor trailing "/", so when the path is for a file or folder in
the base folder "OC.dirname(result.path)" returns "result.path".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-21 21:49:10 +01:00
Joas Schilling 375589b274
Fix the comments UI and activities for space-mentions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-07 12:33:44 +01:00
Julius Härtl d14434fa2e
Adjust some jsdocs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-24 16:24:16 +02:00
Julius Härtl 45804b5bef
Add icon to file sidebar tabs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-18 15:54:17 +02:00
Roeland Jago Douma e7443ee892
Move more comments to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-15 19:52:22 +02:00
Roeland Jago Douma 363ec1d3c3
Remove leftover '
Followup to #11583

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 16:02:09 +02:00
Roeland Jago Douma d281f2625d
Move Comments to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Daniel Calviño Sánchez 527d237289 Fix contacts menu not triggered on certain areas of a mention
The contacts menu was triggered only when the avatar or the name of the
user were clicked. Due to this, clicking on certain (small) areas of a
mention (like the right end, or the space between the avatar and the
name) did not show the contacts menu. Now the contacts menu is shown
when any area of the mention is clicked.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-15 18:42:52 +02:00
Daniel Calviño Sánchez 63ab5d919e Reformat embedded HTML code to resemble HTML code
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez db1fce6a59 Remove space between avatar and user name
The avatar should be shown immediately after the avatar to be able to
accurately define the space between them using only CSS rules.

Note that in the case of the "atwho" menu it is not really needed, as a
whitespace removal seems to be done automatically by the plugin, but it
was modified for its displayed elements too for consistency.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez c9ce96ff05 Show avatar using "span" instead of "div"
Visually it makes no difference, but as the ".avatar" element is inside
a "span" element it can not be a block element to be compliant with the
HTML specification.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:33:10 +02:00
Joas Schilling 5ba881ba41 Do not parse HTML in user id and display name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-28 18:57:07 +02:00
Morris Jobke 61397ee091
Merge pull request #9222 from nextcloud/feature/noid/search-for-files-by-comments
Allow to search files by comments
2018-07-25 20:30:00 +02:00
Morris Jobke 2dd55b0550
Brighter comments icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-25 20:28:49 +02:00
Joas Schilling 8c7969e730 Allow to search by comments
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 18:53:44 +02:00
Julius Härtl 6d29b36200
Limit small avatar rendering only to inline mentions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-25 14:26:04 +02:00
John Molakvoæ (skjnldsv) b7317a35e7
Focus the comment input on tab select/loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:34:02 +02:00
Julius Härtl 9771b70c8f
Fix inline avatar display for mentions in comments
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-18 20:28:02 +02:00
Abijeet 16bf9326cb Fixing failing test cases due to change in functionality.
Also fixes scrutinizer warnings.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 01:34:00 +05:30
Abijeet 01c5a31a4a Adds a tooltip for the submit / save button in comments.
Towards #7281

Also hiding the menu before triggering click action.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet 872853af58 Moves the edit and delete options into a dropdown menu.
Fixes #7281

- Added a new View to render the dropdown.
- Modified the existing code.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet 61b38a16fa Fixes the following UI issues,
1. Increased the size of the delete, edit, close and submit buttons to take up 44x44px.
2. Now showing the delete button at all times when editing to avoid usability issues with touch screens.
3. Edit icon is also shown at all times, rather than only on hover.
4. Reduced the gap between comments a wee bit.
5. Fixed issues with focus event now working properly for edit and delete.
6. Removed absolute positioning of elements for alignment.
7. Fixed issue with tooltips becoming too high due to padding around actions. Occurred due to my changes.
8. Changed the position of the submit and close icons.
9. Fixed issue with jumping of the delete icon in Firefox. Occurred due to my changes.
10. Fixed issue with wrapping of content due to long author names. Occurred due to my changes.
11. Fixed issue with longer comments not appearing properly. This might have occurred due to my changes.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet b3e1026cab Fixes div being added placed directly under ul during editing of comments.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet facd1cae2f Fixes issue where saving a non-modified comment kept the edit window open.
Now irrespective of the whether the comment has been modified we are going to go back to the view mode.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Joas Schilling dabd7291c3
Make the new autocomplete endpoint OCS
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-21 09:46:52 +01:00
rakekniven b348cd170a
Update commentstabview.js
Changed typo reported at GitHub.
See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91002505?issue=yes
2018-03-01 20:53:50 +01:00
Arthur Schiwon 282567fced
format links in comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:11:20 +01:00
Roeland Jago Douma 4c0c3c0bef
Show max warning comment lenth again
Fixes #7414

Since we no longer use an input field we have to use text instead of
val.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 10:28:09 +01:00
Morris Jobke 5724e75827
Merge pull request #7252 from nextcloud/send-comment-on-enter
Submit comments with Enter and use Shift+Enter for new lines
2017-12-08 15:31:10 +01:00
Daniel Calviño Sánchez 9b1f3b969e Fix Enter sending comment instead of adding autocomplete item to message
When the autocomplete popover is shown the At.js plugin listens on the
message input field for key down events, and when Enter is pressed it
adds the selected item to the message. However, as "_onTypeComment" also
handles key down events for the message input field, when Enter was
pressed the comment was submitted and At.js had no chance to add the
item before that happened. Now when Enter is pressed and the
autocomplete popover is shown the comment is not submitted, and thus
At.js adds the selected item to the message as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-07 15:38:46 +01:00
blizzz e428ef9d75
Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-in-comments
Fix cursor for avatar and user names in comments
2017-11-27 15:14:40 +01:00
Morris Jobke cfae590ac9
Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent
Fix input field not disabled while a comment is being sent
2017-11-27 13:40:03 +01:00
Lukas Reschke d15ca9ffaf
Replace with non-deprecated JS call
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 11:53:24 +01:00
Daniel Calviño Sánchez ea4414f9bc Disable contacts menu for mentions to current user in comment messages
The contacts menu is not shown for avatars and user names in the author
row if they represent the current user. For consistency, and because the
contacts menu provides no value when shown for the current user, this
commit also disables the contacts menu for mentions to the current user.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 00:10:53 +01:00
Daniel Calviño Sánchez 8eb19a278c Disable contacts menu for mentioned users in comments being composed
The contacts menu does not provide too much value for users mentioned in
a message being composed, so it is now disabled in this case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 00:05:54 +01:00
Daniel Calviño Sánchez 107952ff00 Fix cursor for author row and avatars in comments
When it was on an author row the cursor was shown as a pointer, even if
clicking on the author row itself does nothing. On the other hand,
avatars used the default cursor, even if clicking on them either shows
the contacts menu (in the case of the author row, only when the avatar
is for a different user than the current one) or inserts a mention (for
avatars shown in the list of suggested mentions), depending on the case.

Now, the author row uses the default cursor, and avatars (and their
associated user name) use a pointer cursor if clicking on them will
trigger an action (either showing the contacts menu or inserting a
mention).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-26 23:56:03 +01:00
Daniel Calviño Sánchez 9bb2bb7870 Show delete working icon at the same position as the delete icon
When a comment was being deleted the submit working icon was shown. Now
the submit working icon is kept hidden in that case and a specific
delete working icon, which is shown at the same position as the delete
icon, is used instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 16:31:37 +01:00
Daniel Calviño Sánchez 5e6d4ad27c Disable elements while a comment is being deleted
When a comment is being deleted the "disabled" class is added to the
comment div, which causes it to look disabled. However, the input
elements and the content editable div were not truly disabled, and thus
it was still possible to interact with them. This commit ensures that
they are properly disabled while the comment is being deleted.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 13:17:55 +01:00
Daniel Calviño Sánchez bbe00079cc Fix input field not disabled while a comment is being sent
Since the change of the text area to a content editable div the input
field was no longer disabled while a new comment was being sent. It was
caused by still trying to disable the div using the "disabled" property,
which works only on real input fields; when using a content editable div
the way to disable it is by setting "contenteditable" to "false".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 14:34:09 +01:00