Skip to content

Commit 24128e1

Browse files
engelgabrielengelgabriel
committed
Merge remote-tracking branch 'origin/channel-search'
2 parents 6db9d05 + ca0710d commit 24128e1

File tree

6 files changed

+301
-170
lines changed

6 files changed

+301
-170
lines changed

‎client/stylesheets/base.less

+124-123
Original file line numberDiff line numberDiff line change
@@ -2455,149 +2455,150 @@ a.github-fork {
24552455
border-radius: 4px;
24562456
}
24572457
}
2458-
.message {
2459-
font-size: 14px;
2460-
padding-left: 50px;
2461-
position: relative;
2462-
line-height: 20px;
2463-
margin: 12px 20px 5px;
2464-
margin-top: 12px;
2465-
min-height: 40px;
2466-
&:nth-child(1) {
2467-
margin-top: 0;
2468-
}
2469-
&.new-day {
2470-
margin-top: 60px;
2471-
}
2472-
&.new-day {
2473-
&:before {
2474-
content: attr(data-date);
2475-
display: block;
2476-
position: absolute;
2477-
top: -30px;
2478-
left: 0;
2479-
font-size: 12px;
2480-
font-weight: 600;
2481-
text-align: center;
2482-
.calc(left,
2483-
~"50% - 70px");
2484-
color: @secondary-font-color;
2485-
z-index: 10;
2486-
padding: 0 10px;
2487-
background-color: #FFF;
2488-
min-width: 140px;
2489-
}
2490-
&:after {
2491-
content: " ";
2492-
display: block;
2493-
position: absolute;
2494-
top: -20px;
2495-
left: 0;
2496-
width: 100%;
2497-
border-top: 1px solid #ddd;
2498-
}
2499-
}
2500-
.edit-message {
2501-
display: none;
2502-
cursor: pointer;
2503-
}
2504-
&.own:hover:not(.system) .edit-message {
2505-
display: inline-block;
2458+
}
2459+
2460+
.message {
2461+
font-size: 14px;
2462+
padding-left: 50px;
2463+
position: relative;
2464+
line-height: 20px;
2465+
margin: 12px 20px 5px;
2466+
margin-top: 12px;
2467+
min-height: 40px;
2468+
&:nth-child(1) {
2469+
margin-top: 0;
2470+
}
2471+
&.new-day {
2472+
margin-top: 60px;
2473+
}
2474+
&.new-day {
2475+
&:before {
2476+
content: attr(data-date);
2477+
display: block;
2478+
position: absolute;
2479+
top: -30px;
2480+
left: 0;
2481+
font-size: 12px;
2482+
font-weight: 600;
2483+
text-align: center;
2484+
.calc(left,
2485+
~"50% - 70px");
2486+
color: @secondary-font-color;
2487+
z-index: 10;
2488+
padding: 0 10px;
2489+
background-color: #FFF;
2490+
min-width: 140px;
25062491
}
2507-
.delete-message {
2508-
display: none;
2509-
cursor: pointer;
2492+
&:after {
2493+
content: " ";
2494+
display: block;
2495+
position: absolute;
2496+
top: -20px;
2497+
left: 0;
2498+
width: 100%;
2499+
border-top: 1px solid #ddd;
25102500
}
2511-
&.own:hover:not(.system) .delete-message {
2512-
display: inline-block;
2501+
}
2502+
.edit-message {
2503+
display: none;
2504+
cursor: pointer;
2505+
}
2506+
&.own:hover:not(.system) .edit-message {
2507+
display: inline-block;
2508+
}
2509+
.delete-message {
2510+
display: none;
2511+
cursor: pointer;
2512+
}
2513+
&.own:hover:not(.system) .delete-message {
2514+
display: inline-block;
2515+
}
2516+
.user {
2517+
display: inline-block;
2518+
font-weight: 600;
2519+
color: #444444;
2520+
margin-right: 5px;
2521+
&:hover {
2522+
color: #333;
25132523
}
2524+
}
2525+
.thumb {
2526+
position: absolute;
2527+
left: 0;
2528+
top: 0;
2529+
display: block;
2530+
width: 40px;
2531+
height: 40px;
2532+
}
2533+
.info {
2534+
font-size: 12px;
2535+
color: @info-font-color;
2536+
}
2537+
&.sequential {
2538+
margin-top: 5px;
2539+
min-height: 20px;
25142540
.user {
2515-
display: inline-block;
2516-
font-weight: 600;
2517-
color: #444444;
2518-
margin-right: 5px;
2519-
&:hover {
2520-
color: #333;
2521-
}
2541+
display: none;
25222542
}
25232543
.thumb {
2524-
position: absolute;
2525-
left: 0;
2526-
top: 0;
2527-
display: block;
2528-
width: 40px;
2529-
height: 40px;
2544+
display: none;
25302545
}
25312546
.info {
2532-
font-size: 12px;
2533-
color: @info-font-color;
2534-
}
2535-
&.sequential {
2536-
margin-top: 5px;
2537-
min-height: 20px;
2538-
.user {
2547+
position: absolute;
2548+
text-align: right;
2549+
left: -20px;
2550+
width: 65px;
2551+
.time {
25392552
display: none;
25402553
}
2541-
.thumb {
2542-
display: none;
2554+
.edited {
2555+
display: inline-block;
25432556
}
2544-
.info {
2545-
position: absolute;
2546-
text-align: right;
2547-
left: -20px;
2548-
width: 65px;
2549-
.time {
2550-
display: none;
2551-
}
2552-
.edited {
2553-
display: inline-block;
2554-
}
2555-
.edit-message {
2556-
float: left;
2557-
margin-left: 1px;
2558-
}
2559-
.delete-message {
2560-
float: left;
2561-
}
2557+
.edit-message {
2558+
float: left;
2559+
margin-left: 1px;
25622560
}
2563-
&:hover {
2564-
.time {
2565-
display: inline-block;
2566-
}
2567-
.edited {
2568-
display: none;
2569-
}
2561+
.delete-message {
2562+
float: left;
25702563
}
25712564
}
2572-
&.system {
2573-
.body {
2574-
color: @info-font-color;
2575-
font-style: italic;
2576-
text-transform: lowercase;
2577-
em {
2578-
font-weight: 600;
2579-
}
2565+
&:hover {
2566+
.time {
2567+
display: inline-block;
25802568
}
2581-
}
2582-
.avatar-initials {
2583-
line-height: 40px;
2584-
}
2585-
a {
2586-
color: @link-font-color;
2587-
font-weight: 400;
2588-
&:hover {
2589-
color: darken(@link-font-color, 10%);
2590-
text-decoration: underline;
2569+
.edited {
2570+
display: none;
25912571
}
25922572
}
2573+
}
2574+
&.system {
25932575
.body {
2594-
opacity: 1;
2595-
.transition(opacity 1s linear);
2576+
color: @info-font-color;
2577+
font-style: italic;
2578+
text-transform: lowercase;
2579+
em {
2580+
font-weight: 600;
2581+
}
25962582
}
2597-
&.temp .body {
2598-
opacity: .5;
2583+
}
2584+
.avatar-initials {
2585+
line-height: 40px;
2586+
}
2587+
a {
2588+
color: @link-font-color;
2589+
font-weight: 400;
2590+
&:hover {
2591+
color: darken(@link-font-color, 10%);
2592+
text-decoration: underline;
25992593
}
26002594
}
2595+
.body {
2596+
opacity: 1;
2597+
.transition(opacity 1s linear);
2598+
}
2599+
&.temp .body {
2600+
opacity: .5;
2601+
}
26012602
}
26022603

26032604
// FLEX-TAB and FLEX-TAB views
@@ -2700,7 +2701,7 @@ a.github-fork {
27002701
> div {
27012702
position: relative;
27022703
}
2703-
.icon-plus {
2704+
.icon-plus {
27042705
position: absolute;
27052706
top: 11px;
27062707
left: 8px;

‎client/views/app/message.coffee

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ Template.message.onViewRendered = (context) ->
8080

8181
if not lastNode.nextElementSibling?
8282
if lastNode.classList.contains('own') is true
83-
view.parentView.parentView.parentView.parentView.parentView.templateInstance().atBottom = true
83+
view.parentView.parentView.parentView.parentView.parentView.templateInstance?().atBottom = true
8484
else
85-
if view.parentView.parentView.parentView.parentView.parentView.templateInstance().atBottom isnt true
85+
if view.parentView.parentView.parentView.parentView.parentView.templateInstance?().atBottom isnt true
8686
newMessage = document.querySelector(".new-message")
8787
newMessage.className = "new-message"

‎client/views/app/room.coffee

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Template.room.helpers
66
tQuickSearch: ->
77
return t('Quick_Search')
88

9+
searchResult: ->
10+
return Template.instance().searchResult.get()
11+
912
favorite: ->
1013
sub = ChatSubscription.findOne { rid: this._id }, { fields: { f: 1 } }
1114
return 'icon-star favorite-room' if sub?.f? and sub.f
@@ -299,10 +302,11 @@ Template.room.events
299302
"click .upload-progress-item > a": ->
300303
Session.set "uploading-cancel-#{this.id}", true
301304

302-
"click .flex-tab .more": (event) ->
305+
"click .flex-tab .more": (event, t) ->
303306
if (Session.get('flexOpened'))
304307
Session.set('rtcLayoutmode', 0)
305308
Session.set('flexOpened',false)
309+
t.searchResult.set undefined
306310
else
307311
Session.set('flexOpened', true)
308312

@@ -635,6 +639,7 @@ Template.room.onCreated ->
635639
# this.typing = new msgTyping this.data._id
636640
this.showUsersOffline = new ReactiveVar false
637641
this.atBottom = true
642+
this.searchResult = new ReactiveVar
638643

639644
self = @
640645

0 commit comments

Comments
 (0)