starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-19 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update bower dependencies.

Browse Source 
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:
Gunther Brunner
2016-01-14 20:48:38 +09:00
parent af6a08581b
commit b8b293d18a
34 changed files with 136 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js
View File

@@ -1,15 +1,15 @@
module.exports =
function AddAdbKeyModalServiceFactory($modal) {
function AddAdbKeyModalServiceFactory($uibModal) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance, data) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance, data) {
$scope.modal = {}
$scope.modal.showAdd = true
$scope.modal.fingerprint = data.fingerprint
$scope.modal.title = data.title
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
}
$scope.$watch('modal.showAdd', function (newValue) {
@@ -19,12 +19,12 @@ module.exports =
})
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function (data) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./add-adb-key-modal.jade'),
controller: ModalInstanceCtrl,
resolve: {

10
res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js
View File

@@ -1,9 +1,9 @@
module.exports = function ServiceFactory($modal, $sce) {
module.exports = function ServiceFactory($uibModal, $sce) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance, url, title, icon) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance, url, title, icon) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
}
$scope.url = $sce.trustAsResourceUrl(url)
@@ -11,12 +11,12 @@ module.exports = function ServiceFactory($modal, $sce) {
$scope.icon = icon
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function (url, title, icon) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./external-url-modal.jade'),
controller: ModalInstanceCtrl,
windowClass: 'modal-size-80p',

12
res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
View File

@@ -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: {

10
res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js
View File

@@ -1,21 +1,21 @@
module.exports = function ServiceFactory($modal) {
module.exports = function ServiceFactory($uibModal) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance, title, imageUrl) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance, title, imageUrl) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
}
$scope.title = title
$scope.imageUrl = imageUrl
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function (title, imageUrl) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./lightbox-image.jade'),
controller: ModalInstanceCtrl,
windowClass: 'modal-size-xl',

10
res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js
View File

@@ -1,23 +1,23 @@
module.exports =
function SocketDisconnectedServiceFactory($modal, $location, $window) {
function SocketDisconnectedServiceFactory($uibModal, $location, $window) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance, message) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance, message) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
$window.location.reload()
}
$scope.message = message
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function (message) {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./socket-disconnected.jade'),
controller: ModalInstanceCtrl,
resolve: {

10
res/app/components/stf/common-ui/modals/version-update/version-update-service.js
View File

@@ -1,19 +1,19 @@
module.exports = function ServiceFactory($modal, $location) {
module.exports = function ServiceFactory($uibModal, $location) {
var service = {}
var ModalInstanceCtrl = function ($scope, $modalInstance) {
var ModalInstanceCtrl = function ($scope, $uibModalInstance) {
$scope.ok = function () {
$modalInstance.close(true)
$uibModalInstance.close(true)
$location.path('/')
}
$scope.cancel = function () {
$modalInstance.dismiss('cancel')
$uibModalInstance.dismiss('cancel')
}
}
service.open = function () {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
template: require('./version-update.jade'),
controller: ModalInstanceCtrl
})