Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
ulakbus-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ulakbus
ulakbus-ui
Commits
706c1fe0
Commit
706c1fe0
authored
Jul 28, 2016
by
Vladimir Baranov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rfix #5402. Fix messaging window dissapearance
parent
ce11ec8c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
6 deletions
+18
-6
app.css
app/app.css
+1
-1
messaging.js
app/components/messaging/messaging.js
+16
-4
index.html
app/components/messaging/templates/index.html
+1
-1
No files found.
app/app.css
View file @
706c1fe0
...
@@ -2087,7 +2087,7 @@ table.dataTable thead .sorting:after {
...
@@ -2087,7 +2087,7 @@ table.dataTable thead .sorting:after {
right
:
15px
;
right
:
15px
;
-moz-box-shadow
:
0px
0px
45px
rgba
(
0
,
0
,
0
,
0.4
);
-moz-box-shadow
:
0px
0px
45px
rgba
(
0
,
0
,
0
,
0.4
);
box-shadow
:
0px
0px
45px
rgba
(
0
,
0
,
0
,
0.4
);
box-shadow
:
0px
0px
45px
rgba
(
0
,
0
,
0
,
0.4
);
z-index
:
1
0
;
z-index
:
210
0
;
border-radius
:
3px
;
border-radius
:
3px
;
}
}
...
...
app/components/messaging/messaging.js
View file @
706c1fe0
...
@@ -31,12 +31,27 @@ angular.module("ulakbus.messaging")
...
@@ -31,12 +31,27 @@ angular.module("ulakbus.messaging")
scope
:
{},
scope
:
{},
link
:
function
(
iScope
,
iElem
,
iAttrs
){
link
:
function
(
iScope
,
iElem
,
iAttrs
){
iScope
.
chatAppIsHidden
=
true
;
iScope
.
chatAppIsHidden
=
true
;
// track if user is logged in
// reset state when user log in/log out
$rootScope
.
$watch
(
'loggedInUser'
,
function
(
v
){
iScope
.
loggedIn
=
v
;
reset
();
});
// shared object to populate models through scopes
// shared object to populate models through scopes
iScope
.
shared
=
{};
iScope
.
shared
=
{};
var
popupRootElement
=
$
(
iElem
).
find
(
'.popup-placeholder'
);
var
popupRootElement
=
$
(
iElem
).
find
(
'.popup-placeholder'
);
function
reset
(){
iScope
.
selectedChannel
=
null
;
iScope
.
publicChannels
=
[];
iScope
.
notificationsChannel
=
[];
iScope
.
directChannels
=
[];
}
function
editChannelPopup
(
channel
){
function
editChannelPopup
(
channel
){
return
MessagingPopup
.
show
({
return
MessagingPopup
.
show
({
templateUrl
:
"components/messaging/templates/create_channel.html"
,
templateUrl
:
"components/messaging/templates/create_channel.html"
,
...
@@ -308,10 +323,7 @@ angular.module("ulakbus.messaging")
...
@@ -308,10 +323,7 @@ angular.module("ulakbus.messaging")
$rootScope
.
$on
(
"user_ready"
,
function
(){
$rootScope
.
$on
(
"user_ready"
,
function
(){
// init service after user logged in
// init service after user logged in
iScope
.
selectedChannel
=
null
;
reset
();
iScope
.
publicChannels
=
[];
iScope
.
notificationsChannel
=
[];
iScope
.
directChannels
=
[]
iScope
.
hideApp
();
iScope
.
hideApp
();
});
});
}
}
...
...
app/components/messaging/templates/index.html
View file @
706c1fe0
<div>
<div
ng-show=
"loggedIn"
>
<a
class=
"chat-app-button"
ng-show=
"chatAppIsHidden"
ng-click=
"showApp()"
><i
class=
"glyphicon glyphicon-comment"
></i></a>
<a
class=
"chat-app-button"
ng-show=
"chatAppIsHidden"
ng-click=
"showApp()"
><i
class=
"glyphicon glyphicon-comment"
></i></a>
<div
class=
"chat-app"
ng-hide=
"chatAppIsHidden"
>
<div
class=
"chat-app"
ng-hide=
"chatAppIsHidden"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment