mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-19 00:23:25 +02:00
Update bower dependencies.
Update to latest bootstrap-ui 1.0.3. Change Wifi settings button and behaviour of several tooltips accordingly. Remove collapse elements since the animation breaks.
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
module.exports =
|
||||
function FatalMessageServiceFactory($modal, $location, $route, $interval,
|
||||
function FatalMessageServiceFactory($uibModal, $location, $route, $interval,
|
||||
StateClassesService) {
|
||||
var FatalMessageService = {}
|
||||
|
||||
var intervalDeviceInfo
|
||||
|
||||
var ModalInstanceCtrl = function ($scope, $modalInstance, device,
|
||||
var ModalInstanceCtrl = function ($scope, $uibModalInstance, device,
|
||||
tryToReconnect) {
|
||||
$scope.ok = function () {
|
||||
$modalInstance.close(true)
|
||||
$uibModalInstance.close(true)
|
||||
$route.reload()
|
||||
}
|
||||
|
||||
@@ -35,12 +35,12 @@ module.exports =
|
||||
}
|
||||
|
||||
$scope.second = function () {
|
||||
$modalInstance.dismiss()
|
||||
$uibModalInstance.dismiss()
|
||||
$location.path('/devices/')
|
||||
}
|
||||
|
||||
$scope.cancel = function () {
|
||||
$modalInstance.dismiss('cancel')
|
||||
$uibModalInstance.dismiss('cancel')
|
||||
}
|
||||
|
||||
var destroyInterval = function () {
|
||||
@@ -56,7 +56,7 @@ module.exports =
|
||||
}
|
||||
|
||||
FatalMessageService.open = function (device, tryToReconnect) {
|
||||
var modalInstance = $modal.open({
|
||||
var modalInstance = $uibModal.open({
|
||||
template: require('./fatal-message.jade'),
|
||||
controller: ModalInstanceCtrl,
|
||||
resolve: {
|
||||
|
||||
Reference in New Issue
Block a user