yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 10:39:25 +02:00
Code Issues Releases Wiki Activity

- WebSocket error notification stays even when switching tabs.

Browse source
This commit is contained in:
Gunther Brunner 2014-03-26 14:44:06 +09:00
parent 4aa914ea76
commit 9427e21f81
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/app/components/stf/common-ui/notifications/growl.css
View file

@ -3,7 +3,7 @@
top: 60px; top: 60px;
right: 15px; right: 15px;
float: right; float: right;
width: 250px; /*width: 320px;*/
z-index: 9999; z-index: 9999;
} }

12
res/app/components/stf/socket/socket-state/socket-state-directive.js
View file

@ -72,22 +72,22 @@ module.exports = function SocketStateDirectiveFactory(socket, growl, gettext) {
} else { } else {
switch (newValue) { switch (newValue) {
case 'disconnect': case 'disconnect':
growl.error('<h4>WebSocket</h4>' + gettext('Disconnected.'), {ttl: 2000}) growl.error('<h4>WebSocket</h4>' + gettext('Disconnected.<br />Socket connection was lost, try again reloading the page.'), {ttl: -1})
break; break;
case 'connect_failed': case 'connect_failed':
growl.error('<h4>WebSocket</h4>' + gettext('Error while connecting.'), {ttl: 2000}) growl.error('<h4>WebSocket</h4>' + gettext('Error while connecting.'), {ttl: -1})
break; break;
case 'error': case 'error':
growl.error('<h4>WebSocket</h4>' + gettext('Error.'), {ttl: 2000}) growl.error('<h4>WebSocket</h4>' + gettext('Error.'), {ttl: -1})
break; break;
case 'reconnect_failed': case 'reconnect_failed':
growl.error('<h4>WebSocket</h4>' + gettext('Error while reconnecting.'), {ttl: 2000}) growl.error('<h4>WebSocket</h4>' + gettext('Error while reconnecting.'), {ttl: -1})
break; break;
case 'reconnect': case 'reconnect':
growl.success('<h4>WebSocket</h4>' + gettext('Reconnected successfully.'), {ttl: 10000}) growl.success('<h4>WebSocket</h4>' + gettext('Reconnected successfully.'), {ttl: -1})
break; break;
case 'reconnecting': case 'reconnecting':
growl.error('<h4>WebSocket</h4>' + gettext('Reconnecting...') + '<refresh-page></refresh-page>', {ttl: 10000}) growl.error('<h4>WebSocket</h4>' + gettext('Reconnecting...') + '<refresh-page></refresh-page>', {ttl: -1})
break; break;
} }
} }

2
res/app/views/index.jade
View file

@ -8,9 +8,9 @@ html
div(pane).fill-height div(pane).fill-height
.pane-top-bar(pane, pane-anchor='north', pane-size='46px', pane-min='46px', pane-max='46px', pane-handle='') .pane-top-bar(pane, pane-anchor='north', pane-size='46px', pane-min='46px', pane-max='46px', pane-handle='')
div(ng-include='"menu.jade"') div(ng-include='"menu.jade"')
div(pane, pane-anchor='center').fill-height
socket-state socket-state
div(growl) div(growl)
div(pane, pane-anchor='center').fill-height
div(ng-view).fill-height div(ng-view).fill-height
script(src='/static/build/bundle.js') script(src='/static/build/bundle.js')