created function to allow change default values, fix loading search users #14177
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tassoevan
requested changes
Apr 18, 2019
app/lib/client/lib/formatDate.js
Outdated
| lastDay: `[${ lastDay }]`, | ||
| sameDay, | ||
| lastWeek: 'dddd', | ||
| sameElse: 'MMM D', // TODO lastYear |
There was a problem hiding this comment.
If moment version is >=2.14.0, use a function to add the year when it is not the current one.
app/ui/client/views/app/room.js
Outdated
| @@ -697,7 +697,7 @@ Template.room.events({ | |||
| const hasMoreNext = RoomHistoryManager.hasMoreNext(this._id); | |||
|
|
|||
| if ((isLoading === false && hasMore === true) || hasMoreNext === true) { | |||
| if (hasMore === true && lastScrollTop <= height / 3) { | |||
| if (hasMore === true && lastScrollTop <= height / 4) { | |||
There was a problem hiding this comment.
Assign the height / 4 expression to a variable to make it more explicit as a scrolling threshold.
package-lock.json
Outdated
| @@ -5542,7 +5542,7 @@ | |||
| }, | |||
| "doctrine": { | |||
| "version": "1.5.0", | |||
| "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", | |||
| "resolved": "http://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", | |||
There was a problem hiding this comment.
Check if npm resolved these URLs from https to http before commit package-lock.json.
ggazzo
changed the title
tassoevan
approved these changes
Apr 22, 2019
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.