mirror of
https://github.com/openstf/stf
synced 2025-10-05 19:42:01 +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:
parent
af6a08581b
commit
b8b293d18a
34 changed files with 136 additions and 135 deletions
|
@ -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: {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue