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

Dismiss modal when going to the device list.

Browse source
This commit is contained in:
Gunther Brunner 2014-05-13 19:30:34 +09:00
parent 1d44bf5da3
commit ef7fd77322
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
res/app/components/stf/common-ui/fatal-message/fatal-message-service.js
View file

@ -4,12 +4,13 @@ module.exports = function FatalMessageServiceFactory($modal, $location, $route)
var ModalInstanceCtrl = function ($scope, $modalInstance, device) { var ModalInstanceCtrl = function ($scope, $modalInstance, device) {
$scope.ok = function () { $scope.ok = function () {
$modalInstance.close(5) $modalInstance.close(true)
$route.reload() $route.reload()
//$location.path('/control/' + device.serial) //$location.path('/control/' + device.serial)
} }
$scope.second = function () { $scope.second = function () {
$modalInstance.dismiss()
$location.path('/devices/') $location.path('/devices/')
} }
@ -23,17 +24,14 @@ module.exports = function FatalMessageServiceFactory($modal, $location, $route)
template: require('./fatal-message.jade'), template: require('./fatal-message.jade'),
controller: ModalInstanceCtrl, controller: ModalInstanceCtrl,
resolve: { resolve: {
device: device, device: device
items: function () {
return 10
}
} }
}) })
modalInstance.result.then(function (selectedItem) { modalInstance.result.then(function (selectedItem) {
console.log(selectedItem) console.log(selectedItem)
}, function () { }, function () {
console.log('Modal dismissed at: ' + new Date())
}) })
} }