starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-19 00:23:25 +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/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',