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.
wnchen · Jan 14, 2016 · b8b293d · b8b293d
1 parent af6a085
commit b8b293d
Show file tree

Hide file tree

Showing 34 changed files with 136 additions and 135 deletions.
diff --git a/bower.json b/bower.json
@@ -10,28 +10,28 @@
     "angular-touch": "~1.5.0-rc.0",
     "lodash": "~3.10.1",
     "oboe": "~2.1.2",
-    "ng-table": "~1.0.0-beta.7",
-    "angular-gettext": "~2.1.0",
+    "ng-table": "~1.0.0-beta.9",
+    "angular-gettext": "~2.2.0",
     "angular-ui-ace": "~0.2.3",
-    "angular-dialog-service": "~5.2.6",
+    "angular-dialog-service": "~5.2.11",
     "ng-file-upload": "~2.0.5",
-    "angular-growl-v2": "JanStevens/angular-growl-2#~0.7.3",
+    "angular-growl-v2": "JanStevens/angular-growl-2#~0.7.9",
     "underscore.string": "~3.2.2",
-    "bootstrap": "~3.3.5",
+    "bootstrap": "~3.3.6",
     "font-lato-2-subset": "~0.4.0",
     "packery": "~1.4.3",
     "draggabilly": "~1.2.4",
     "angular-elastic": "~2.5.1",
     "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.6.0",
     "angular-borderlayout": "git://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67",
-    "angular-ui-bootstrap": "~0.14.2",
+    "angular-ui-bootstrap": "~1.0.3",
     "ng-context-menu": "AdiDahan/ng-context-menu#~1.0.5",
     "components-font-awesome": "~4.5.0",
-    "epoch": "~0.6.0",
+    "epoch": "~0.8.4",
     "ng-epoch": "~1.0.7",
     "eventEmitter": "~4.3.0",
     "angular-ladda": "~0.3.1",
-    "d3": "~3.5.11",
+    "d3": "~3.5.12",
     "spin.js": "~2.3.2",
     "angular-xeditable": "~0.1.9"
   },
@@ -43,6 +43,7 @@
     "angular": "~1.5.0-rc.0",
     "d3": "~3.5.5",
     "spin.js": "~2.3.2",
-    "eventEmitter": "~4.3.0"
+    "eventEmitter": "~4.3.0",
+    "epoch": "~0.8.4"
   }
 }
diff --git a/res/app/components/stf/common-ui/badge-icon/badge-icon.jade b/res/app/components/stf/common-ui/badge-icon/badge-icon.jade
@@ -1,2 +1,2 @@
 div.stf-badge-icon
-  i.fa.fa-warning.stf-badge-icon-warning(tooltip-placement='bottom', tooltip='An error has ocurred')
+  i.fa.fa-warning.stf-badge-icon-warning(tooltip-placement='bottom', uib-tooltip='An error has ocurred')
diff --git a/res/app/components/stf/common-ui/filter-button/filter-button.jade b/res/app/components/stf/common-ui/filter-button/filter-button.jade
@@ -1,3 +1,3 @@
-button(btn-checkbox, title='{{"Filter"|translate}}').btn.btn-sm.btn-primary-outline.pull-right
+button(uib-btn-checkbox, title='{{"Filter"|translate}}').btn.btn-sm.btn-primary-outline.pull-right
   i.fa.fa-filter
-  span {{"Filter"|translate}}
+  span {{"Filter"|translate}}
diff --git a/res/app/components/stf/common-ui/help-icon/help-icon.jade b/res/app/components/stf/common-ui/help-icon/help-icon.jade
@@ -1,2 +1,2 @@
-a(ng-href='/#!/docs/{{topic}}', tooltip='{{tooltip}}', tooltip-placement='left').btn.btn-xs.btn-primary-outline.pull-right.transparent-border
+a(ng-href='/#!/docs/{{topic}}', uib-tooltip='{{tooltip}}', tooltip-placement='left').btn.btn-xs.btn-primary-outline.pull-right.transparent-border
     i.fa.fa-question-circle
diff --git a/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js b/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js
@@ -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: {

diff --git a/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js b/res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js
@@ -1,22 +1,22 @@
-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)
     $scope.title = title
     $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',

diff --git a/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js b/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
@@ -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: {

diff --git a/res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js b/res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js
@@ -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',

diff --git a/res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js b/res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js
@@ -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: {

diff --git a/res/app/components/stf/common-ui/modals/version-update/version-update-service.js b/res/app/components/stf/common-ui/modals/version-update/version-update-service.js
@@ -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
     })

diff --git a/res/app/components/stf/common-ui/nice-tabs/nice-tabs.jade b/res/app/components/stf/common-ui/nice-tabs/nice-tabs.jade
@@ -1,7 +1,7 @@
 .heading-for-tabs.tabs
-  tabset
-    tab(ng-repeat='tab in tabs', active='tab.active', ng-hide='!tabFound(tab)')
-      tab-heading
+  uib-tabset
+    uib-tab(ng-repeat='tab in tabs', active='tab.active', ng-hide='!tabFound(tab)')
+      uib-tab-heading
         i.fa(ng-class='tab.icon')
         span {{tab.title | translate }}
       div(ng-if='tab.active')

diff --git a/res/app/control-panes/advanced/input/input.jade b/res/app/control-panes/advanced/input/input.jade
@@ -6,59 +6,59 @@
     div
       h6(translate) Special Keys
       div.special-keys-buttons
-        button(tooltip='{{ "Power" | translate }}', ng-click='press("power")').btn.btn-danger.btn-xs
+        button(uib-tooltip='{{ "Power" | translate }}', ng-click='press("power")').btn.btn-danger.btn-xs
           i.fa.fa-power-off
-        button(tooltip='{{ "Camera" | translate }}', ng-click='press("camera")').btn.btn-primary.btn-xs
+        button(uib-tooltip='{{ "Camera" | translate }}', ng-click='press("camera")').btn.btn-primary.btn-xs
           i.fa.fa-camera
-        button(tooltip='{{ "Switch Charset" | translate }}', ng-click='press("switch_charset")').btn.btn-primary.btn-info.btn-xs
+        button(uib-tooltip='{{ "Switch Charset" | translate }}', ng-click='press("switch_charset")').btn.btn-primary.btn-info.btn-xs
           i.fa  Aa
-        button(tooltip='{{ "Search" | translate }}', ng-click='press("search")').btn.btn-primary.btn-xs
+        button(uib-tooltip='{{ "Search" | translate }}', ng-click='press("search")').btn.btn-primary.btn-xs
           i.fa.fa-search
 
         h6(translate) Volume
         .btn-group
-          button(tooltip='{{ "Mute" | translate }}', ng-click='press("mute")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Mute" | translate }}', ng-click='press("mute")').btn.btn-primary.btn-xs
             i.fa.fa-volume-off
-          button(tooltip='{{ "Volume Down" | translate }}', ng-click='press("volume_down")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Volume Down" | translate }}', ng-click='press("volume_down")').btn.btn-primary.btn-xs
             i.fa.fa-volume-down
-          button(tooltip='{{ "Volume Up" | translate }}', ng-click='press("volume_up")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Volume Up" | translate }}', ng-click='press("volume_up")').btn.btn-primary.btn-xs
             i.fa.fa-volume-up
 
         h6(translate) Media
         .btn-group
-          button(tooltip='{{ "Rewind" | translate }}', ng-click='press("media_rewind")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Rewind" | translate }}', ng-click='press("media_rewind")').btn.btn-primary.btn-xs
             i.fa.fa-fast-backward
-          button(tooltip='{{ "Previous" | translate }}', ng-click='press("media_previous")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Previous" | translate }}', ng-click='press("media_previous")').btn.btn-primary.btn-xs
             i.fa.fa-step-backward
-          button(tooltip='{{ "Play/Pause" | translate }}', ng-click='press("media_play_pause")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Play/Pause" | translate }}', ng-click='press("media_play_pause")').btn.btn-primary.btn-xs
             i.fa.fa-youtube-play
-          button(tooltip='{{ "Stop" | translate }}', ng-click='press("media_stop")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Stop" | translate }}', ng-click='press("media_stop")').btn.btn-primary.btn-xs
             i.fa.fa-stop
-          button(tooltip='{{ "Next" | translate }}', ng-click='press("media_next")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Next" | translate }}', ng-click='press("media_next")').btn.btn-primary.btn-xs
             i.fa.fa-step-forward
-          button(tooltip='{{ "Fast Forward" | translate }}', ng-click='press("media_fast_forward")').btn.btn-primary.btn-xs
+          button(uib-tooltip='{{ "Fast Forward" | translate }}', ng-click='press("media_fast_forward")').btn.btn-primary.btn-xs
             i.fa.fa-fast-forward
     //h6 D-pad
     //table.special-keys-dpad-buttons
       tr
         td
         td
-          button(tooltip='{{ "D-pad Up" | translate }}', ng-click='press("dpad_up")').btn.btn-info.btn-xs
+          button(uib-tooltip='{{ "D-pad Up" | translate }}', ng-click='press("dpad_up")').btn.btn-info.btn-xs
             i.fa.fa-chevron-up
         td
       tr
         td
-          button(tooltip='{{ "D-pad Left" | translate }}', ng-click='press("dpad_left")').btn.btn-info.btn-xs
+          button(uib-tooltip='{{ "D-pad Left" | translate }}', ng-click='press("dpad_left")').btn.btn-info.btn-xs
             i.fa.fa-chevron-left
         td
-          button(tooltip='{{ "D-pad Center" | translate }}', ng-click='press("dpad_center")').btn.btn-info.btn-xs
+          button(uib-tooltip='{{ "D-pad Center" | translate }}', ng-click='press("dpad_center")').btn.btn-info.btn-xs
             i.fa.fa-circle-o
         td
-          button(tooltip='{{ "D-pad Right" | translate }}', ng-click='press("dpad_right")').btn.btn-info.btn-xs
+          button(uib-tooltip='{{ "D-pad Right" | translate }}', ng-click='press("dpad_right")').btn.btn-info.btn-xs
             i.fa.fa-chevron-right
       tr
         td
         td
-          button(tooltip='{{ "D-pad Down" | translate }}', ng-click='press("dpad_down")').btn.btn-info.btn-xs
+          button(uib-tooltip='{{ "D-pad Down" | translate }}', ng-click='press("dpad_down")').btn.btn-info.btn-xs
             i.fa.fa-chevron-down
         td
diff --git a/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade b/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade
@@ -2,13 +2,13 @@
   .heading
     span
       stacked-icon(icon='fa-random', color='color-orange')
-      span(translate, ng-click='isCollapsed = !isCollapsed').pointer Port Forwarding
+      span(translate).pointer Port Forwarding
 
       button.btn.pull-right.btn-sm.btn-primary-outline(
         ng-click='addRow()')
         i.fa.fa-plus.fa-fw
 
-  .widget-content.padded(collapse='isCollapsed')
+  .widget-content.padded
 
     nothing-to-show(icon='fa-random', message='{{"No Ports Forwarded" | translate}}',
     ng-if='!reversePortForwards.length')

diff --git a/res/app/control-panes/advanced/run-js/run-js.jade b/res/app/control-panes/advanced/run-js/run-js.jade
@@ -17,9 +17,9 @@
           i.fa.fa-save
           span(translate)  Save...
         button(type='button',
-        ng-disabled='!hasSnippets()').btn.btn-sm.btn-default-outline.dropdown-toggle
+        ng-disabled='!hasSnippets()').btn.btn-sm.btn-default-outline.uib-dropdown-toggle
           span.caret
-        ul.dropdown-menu.pull-right
+        ul.uib-dropdown-menu.pull-right
           li(ng-repeat='snip in snippets')
             a(ng-click='openSnippet(snip)').btn-link {{snip.name}}
           li.divider
@@ -33,8 +33,8 @@
       p
         div(ui-ace="aceOptions", scope-instance='editorInstance', ng-model='snippet.editorText').stf-ace-editor
       div(ng-controller='ReturnJavaScriptCtrl')
-        tabset.unselectable(ng-show='results.length')
-          tab(heading='Results')
+        uib-tabset.unselectable(ng-show='results.length')
+          uib-tab(heading='Results')
             table.table.table-hover(ng-table='tableParams').selectable
               tr(ng-repeat='result in $data')
                 td(width='30%', title="'Device'", sortable='deviceName')
@@ -47,7 +47,7 @@
                     .value-next-to-progress {{ result.value }}
                 td(width='40%', ng-show='result.isSpecialValue')
                   div(ng-show='result.isNumber')
-                    progressbar.table-progress(value='result.percentage', max='100')
+                    uib-progressbar.table-progress(value='result.percentage', max='100')
                   div(ng-show='result.isObject')
                     div.label.label-info Object
                   div(ng-show='result.isFunction')
@@ -60,6 +60,6 @@
                     div.label(style='width=100%', ng-class="{'label-success': result.value, 'label-important': !result.value}")
                       i.fa(ng-class="{'fa-check': result.value, 'fa-times-circle': !result.value }")
                       span {{ result.value.toString() }}
-          tab(heading='Raw')
+          uib-tab(heading='Raw')
             pre.selectable {{results | json}}
           clear-button(ng-click='clear()', ng-disabled='!results.length')
diff --git a/res/app/control-panes/advanced/vnc/vnc.jade b/res/app/control-panes/advanced/vnc/vnc.jade
@@ -4,7 +4,7 @@
     span(translate) VNC
 
     button.btn.pull-right.btn-sm.btn-primary-outline(
-    ng-click='generateVNCLogin()', tooltip='{{"Generate Login for VNC"|translate}}')
+    ng-click='generateVNCLogin()', uib-tooltip='{{"Generate Login for VNC"|translate}}')
       i.fa.fa-plus.fa-fw
 
   .widget-content.padded