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

- Adding refresh page directive.

Browse source 
- Moving controller inside link function because it was not shared code anyways.
This commit is contained in:
Gunther Brunner 2014-03-26 14:31:35 +09:00
parent b4e6e39761
commit 334d26eb30
7 changed files with 134 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/app/components/stf/common-ui/refresh-page/index.js Normal file
View file

@ -0,0 +1,2 @@
module.exports = angular.module('stf.refresh-page', [])
.directive('refreshPage', require('./refresh-page-directive'))

12
res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js Normal file
View file

@ -0,0 +1,12 @@
module.exports = function refreshPageDirective() {
return {
restrict: 'E',
replace: true,
scope: {
},
template: require('./refresh-page.jade'),
link: function (scope, element, attrs) {
// TODO: reload with $route.reload()
}
}
}

23
res/app/components/stf/common-ui/refresh-page/refresh-page-spec.js Normal file
View file

@ -0,0 +1,23 @@
describe('refreshPage', function () {
beforeEach(module('stf.refresh-page'));
var scope, compile;
beforeEach(inject(function ($rootScope, $compile) {
scope = $rootScope.$new();
compile = $compile;
}));
it('should ...', function () {
/*
To test your directive, you need to create some html that would use your directive,
send that through compile() then compare the results.
var element = compile('<div refresh-page name="name">hi</div>')(scope);
expect(element.text()).toBe('hello, world');
*/
});
});

3
res/app/components/stf/common-ui/refresh-page/refresh-page.jade Normal file
View file

@ -0,0 +1,3 @@
button.btn.btn-sm.btn-primary-outline(ng-click='window.location.reload()')
i.fa.fa-refresh
span(translate) Refresh

4
res/app/components/stf/socket/socket-state/index.js
View file

@ -1,10 +1,10 @@
module.exports = angular.module('stf/socket/socket-state', [
require('stf/socket').name,
require('stf/common-ui/safe-apply').name,
require('stf/common-ui/notifications').name
require('stf/common-ui/notifications').name,
require('stf/common-ui/refresh-page').name
])
.directive('socketState', require('./socket-state-directive'))
.controller('SocketStateCtrl', require('./socket-state-controller'))
.config([
'$provide', function ($provide) {
return $provide.decorator('$rootScope', [

90
res/app/components/stf/socket/socket-state/socket-state-controller.js
View file

@ -1,90 +0,0 @@
module.exports = function ($scope, $element, $attrs, $transclude, socket, growl, gettext) {
var hasFailedOnce = false
socket.on('connect', function () {
$scope.$apply(function () {
$scope.socketState = 'connect'
})
})
socket.on('connecting', function () {
$scope.$apply(function () {
$scope.socketState = 'connecting'
})
})
socket.on('disconnect', function () {
$scope.$apply(function () {
$scope.socketState = 'disconnect'
})
hasFailedOnce = true
})
socket.on('connect_failed', function () {
$scope.$apply(function () {
$scope.socketState = 'connect_failed'
})
hasFailedOnce = true
})
socket.on('error', function () {
$scope.$apply(function () {
$scope.socketState = 'error'
})
hasFailedOnce = true
})
socket.on('reconnect_failed', function () {
$scope.$apply(function () {
$scope.socketState = 'reconnect_failed'
})
hasFailedOnce = true
})
socket.on('reconnect', function () {
$scope.$apply(function () {
$scope.socketState = 'reconnect'
})
hasFailedOnce = true
})
socket.on('reconnecting', function () {
$scope.$apply(function () {
$scope.socketState = 'reconnecting'
})
hasFailedOnce = true
})
$scope.$watch('socketState', function (newValue, oldValue) {
if (newValue) {
if (newValue === 'connecting' && oldValue) {
growl.info(gettext('<h4>WebSocket</h4> Connecting...'), {ttl: 1000})
} else if (newValue === 'connect' && oldValue === 'connecting') {
if (hasFailedOnce) {
growl.success(gettext('<h4>WebSocket</h4> Connected successfully.'), {ttl: 2000})
}
} else {
switch (newValue) {
case 'disconnect':
growl.error(gettext('<h4>WebSocket</h4> Disconnected.'), {ttl: 2000})
break;
case 'connect_failed':
growl.error(gettext('<h4>WebSocket</h4> Error while connecting.'), {ttl: 2000})
break;
case 'error':
growl.error(gettext('<h4>WebSocket</h4> Error.'), {ttl: 2000})
break;
case 'reconnect_failed':
growl.error(gettext('<h4>WebSocket</h4> Error while reconnecting.'), {ttl: 2000})
break;
case 'reconnect':
growl.success(gettext('<h4>WebSocket</h4> Reconnected successfully.'), {ttl: 10000})
break;
case 'reconnecting':
growl.info(gettext('<h4>WebSocket</h4> Reconnecting...'), {ttl: 10000})
break;
}
}
}
})
}

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

@ -1,9 +1,98 @@
module.exports = function SocketStateDirectiveFactory() {
module.exports = function SocketStateDirectiveFactory(socket, growl, gettext) {
return {
restrict: 'EA',
template: require('./socket-state.jade'),
controller: 'SocketStateCtrl',
scope: {
// scope: {
// }
link: function (scope) {
var hasFailedOnce = false
socket.on('connect', function () {
scope.$apply(function () {
scope.socketState = 'connect'
})
})
socket.on('connecting', function () {
scope.$apply(function () {
scope.socketState = 'connecting'
})
})
socket.on('disconnect', function () {
scope.$apply(function () {
scope.socketState = 'disconnect'
})
hasFailedOnce = true
})
socket.on('connect_failed', function () {
scope.$apply(function () {
scope.socketState = 'connect_failed'
})
hasFailedOnce = true
})
socket.on('error', function () {
scope.$apply(function () {
scope.socketState = 'error'
})
hasFailedOnce = true
})
socket.on('reconnect_failed', function () {
scope.$apply(function () {
scope.socketState = 'reconnect_failed'
})
hasFailedOnce = true
})
socket.on('reconnect', function () {
scope.$apply(function () {
scope.socketState = 'reconnect'
})
hasFailedOnce = true
})
socket.on('reconnecting', function () {
scope.$apply(function () {
scope.socketState = 'reconnecting'
})
hasFailedOnce = true
})
scope.$watch('socketState', function (newValue, oldValue) {
if (newValue) {
if (newValue === 'connecting' && oldValue) {
growl.info('<h4>WebSocket</h4>' + gettext('Connecting...'), {ttl: 1000})
} else if (newValue === 'connect' && oldValue === 'connecting') {
if (hasFailedOnce) {
growl.success('<h4>WebSocket</h4>' + gettext('Connected successfully.') + '<refresh-page></refresh-page>', {ttl: 2000})
}
} else {
switch (newValue) {
case 'disconnect':
growl.error('<h4>WebSocket</h4>' + gettext('Disconnected.'), {ttl: 2000})
break;
case 'connect_failed':
growl.error('<h4>WebSocket</h4>' + gettext('Error while connecting.'), {ttl: 2000})
break;
case 'error':
growl.error('<h4>WebSocket</h4>' + gettext('Error.'), {ttl: 2000})
break;
case 'reconnect_failed':
growl.error('<h4>WebSocket</h4>' + gettext('Error while reconnecting.'), {ttl: 2000})
break;
case 'reconnect':
growl.success('<h4>WebSocket</h4>' + gettext('Reconnected successfully.'), {ttl: 10000})
break;
case 'reconnecting':
growl.error('<h4>WebSocket</h4>' + gettext('Reconnecting...') + '<refresh-page></refresh-page>', {ttl: 10000})
break;
}
}
}
})
}
}
}