Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
37abce5c
Commit
37abce5c
authored
9 years ago
by
Gabriel Engel
Browse files
Options
Downloads
Patches
Plain Diff
fix load more
parent
3b5af150
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
client/lib/RoomHistoryManager.coffee
+1
-7
1 addition, 7 deletions
client/lib/RoomHistoryManager.coffee
client/lib/RoomManager.coffee
+3
-3
3 additions, 3 deletions
client/lib/RoomManager.coffee
client/stylesheets/base.less
+1
-1
1 addition, 1 deletion
client/stylesheets/base.less
with
5 additions
and
11 deletions
client/lib/RoomHistoryManager.coffee
+
1
−
7
View file @
37abce5c
...
@@ -12,15 +12,10 @@
...
@@ -12,15 +12,10 @@
return
histories
[
rid
]
return
histories
[
rid
]
initRoom
=
(
rid
,
from
=
new
Date
)
->
room
=
getRoom
rid
room
.
from
=
from
getMore
=
(
rid
,
limit
=
defaultLimit
)
->
getMore
=
(
rid
,
limit
=
defaultLimit
)
->
room
=
getRoom
rid
room
=
getRoom
rid
if
room
.
hasMore
.
curValue
isnt
true
or
not
room
.
from
?
if
room
.
hasMore
.
curValue
isnt
true
return
return
room
.
isLoading
.
set
true
room
.
isLoading
.
set
true
...
@@ -56,7 +51,6 @@
...
@@ -56,7 +51,6 @@
return
room
.
isLoading
.
get
()
return
room
.
isLoading
.
get
()
initRoom
:
initRoom
getMore
:
getMore
getMore
:
getMore
hasMore
:
hasMore
hasMore
:
hasMore
isLoading
:
isLoading
isLoading
:
isLoading
This diff is collapsed.
Click to expand it.
client/lib/RoomManager.coffee
+
3
−
3
View file @
37abce5c
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
subscription
=
Meteor
.
subscribe
(
'subscription'
)
subscription
=
Meteor
.
subscribe
(
'subscription'
)
return
subscription
return
subscription
expireRoom
=
(
rid
)
->
close
=
(
rid
)
->
if
openedRooms
[
rid
]
if
openedRooms
[
rid
]
if
openedRooms
[
rid
].
sub
?
if
openedRooms
[
rid
].
sub
?
for
sub
in
openedRooms
[
rid
].
sub
for
sub
in
openedRooms
[
rid
].
sub
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
for
rid
of
openedRooms
for
rid
of
openedRooms
if
rid
isnt
except
and
not
openedRooms
[
rid
].
timeout
?
if
rid
isnt
except
and
not
openedRooms
[
rid
].
timeout
?
openedRooms
[
rid
].
timeout
=
setTimeout
expireRoom
,
defaultTime
,
rid
openedRooms
[
rid
].
timeout
=
setTimeout
close
,
defaultTime
,
rid
open
=
(
rid
)
->
open
=
(
rid
)
->
if
not
openedRooms
[
rid
]
?
if
not
openedRooms
[
rid
]
?
...
@@ -62,5 +62,5 @@
...
@@ -62,5 +62,5 @@
}
}
open
:
open
open
:
open
close
:
expireRoom
close
:
close
init
:
init
init
:
init
This diff is collapsed.
Click to expand it.
client/stylesheets/base.less
+
1
−
1
View file @
37abce5c
...
@@ -1789,7 +1789,7 @@ a.github-fork {
...
@@ -1789,7 +1789,7 @@ a.github-fork {
.date {
.date {
text-align: center;
text-align: center;
position: relative;
position: relative;
margin
-top: 12
px;
margin
: 15px 20
px;
&:before {
&:before {
content: " ";
content: " ";
height: 1px;
height: 1px;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment