diff --git a/res/app/components/stf/keys/add-adb-key/add-adb-key-controller.js b/res/app/components/stf/keys/add-adb-key/add-adb-key-controller.js deleted file mode 100644 index 532eab76..00000000 --- a/res/app/components/stf/keys/add-adb-key/add-adb-key-controller.js +++ /dev/null @@ -1,44 +0,0 @@ -module.exports = function AdbKeysCtrl($scope, AdbKeysService) { - $scope.title = '' - $scope.key = '' - - //$scope.$watch('showClipboard', function (e) { - // console.log('hi',e) - // $scope.showClipboard = true - //}) - - $scope.addKey = function () { - if ($scope.title && $scope.key) { - - var title = $scope.title - var fingerprint = '97:ca:ae:fa:09:0b:c4:fe:22:94:7d:b2:be:77:66:a1' - - console.log('Adding key') - //$scope.adbKeys.push({ - // title: title, - // fingerprint: fingerprint - //}) - - $scope.closeAddKey() - } - } - - $scope.closeAddKey = function () { - $scope.title = '' - $scope.key = '' - $scope.adbkeyform.$setPristine() - $scope.showAdd = false - } - - $scope.changed = function () { - //console.log('changedx', $scope.key) - } - - $scope.$watch('key', function (newValue) { - //console.log('newValue', newValue) - - if (newValue && !$scope.title) { - $scope.title = AdbKeysService.hostNameFromKey(newValue) - } - }) -} diff --git a/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js b/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js index 0db2cb79..db43c4f9 100644 --- a/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js +++ b/res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js @@ -1,14 +1,37 @@ -module.exports = function addAdbKeyDirective() { +module.exports = function addAdbKeyDirective(AdbKeysService) { return { - restrict: 'E', - //replace: true, - //scope: { - // showAdd: '=', - // showClipboard: '=' - //}, - controller: require('./add-adb-key-controller.js'), + restrict: 'EA', + replace: true, + scope: { + showAdd: '=', + showClipboard: '=' + }, template: require('./add-adb-key.jade'), link: function (scope) { + scope.addForm = { + title: '', + key: '' + } + + scope.addKey = function () { + console.log('Add key') + scope.closeAddKey() + } + + scope.closeAddKey = function () { + scope.addForm.title = '' + scope.addForm.key = '' + console.log('scope', scope) + // TODO: cannot access to the form by name? + //scope.adbkeyform.$setPristine() + scope.showAdd = false + } + + scope.$watch('addForm.key', function (newValue) { + if (newValue && !scope.addForm.title) { + scope.addForm.title = AdbKeysService.hostNameFromKey(newValue) + } + }) } } diff --git a/res/app/components/stf/keys/add-adb-key/add-adb-key.jade b/res/app/components/stf/keys/add-adb-key/add-adb-key.jade index bccbc310..1e69fba9 100644 --- a/res/app/components/stf/keys/add-adb-key/add-adb-key.jade +++ b/res/app/components/stf/keys/add-adb-key/add-adb-key.jade @@ -1,10 +1,10 @@ -.panel.panel-default(ng-if='showAdd').stf-add-adb-key +.panel.panel-default.stf-add-adb-key(ng-show='showAdd') .panel-heading h3.panel-title(translate) Add ADB Key .panel-body form.form-horizontal(name='adbkeyform', ng-submit='addKey(key)') - div(ng-show='true') + div(ng-show='showClipboard') .alert.alert-info.selectable Tip: Run this command to copy the key to your clipboard a(ng-href='/#!/docs/adb-keys').pull-right @@ -19,7 +19,7 @@ i.fa.fa-key.fa-fw span(translate) Key .col-md-11 - textarea(rows='4', ng-model='key', ng-change='changed()', ng-required='true', + textarea(rows='4', name='deviceKey', ng-model='addForm.key', ng-required='true', autocorrect='off', autocapitalize='off', spellcheck='false', focus-element='focusAddKey', ng-paste='focusAddTitle = true').form-control @@ -28,7 +28,7 @@ i.fa.fa-laptop.fa-fw span(translate) Device .col-md-11 - input(type='text', ng-model='title', ng-required='true', + input(type='text', name='deviceTitle', ng-model='addForm.title', ng-required='true', text-focus-select, focus-element='focusAddTitle').form-control button.btn.btn-primary-outline.btn-sm.pull-right(type='submit') diff --git a/res/app/components/stf/keys/add-adb-key/index.js b/res/app/components/stf/keys/add-adb-key/index.js index f8091fcc..28653725 100644 --- a/res/app/components/stf/keys/add-adb-key/index.js +++ b/res/app/components/stf/keys/add-adb-key/index.js @@ -5,6 +5,5 @@ module.exports = angular.module('stf.add-adb-key', [ require('stf/common-ui').name ]) .directive('addAdbKey', require('./add-adb-key-directive')) - .controller('addAdbKeyCtrl', require('./add-adb-key-controller.js')) .factory('AdbKeysService', require('./adb-keys-service')) diff --git a/res/app/settings/adb-keys/adb-keys-controller.js b/res/app/settings/adb-keys/adb-keys-controller.js index a20cc10d..75f4bb15 100644 --- a/res/app/settings/adb-keys/adb-keys-controller.js +++ b/res/app/settings/adb-keys/adb-keys-controller.js @@ -1,7 +1,5 @@ module.exports = function AdbKeysCtrl($scope, AdbKeysService) { - - $scope.adbKeys = [ { title: 'PC1264', @@ -20,14 +18,4 @@ module.exports = function AdbKeysCtrl($scope, AdbKeysService) { - $scope.toggleAddKey = function () { - $scope.showAdd = !$scope.showAdd - } - - $scope.$watch('key', function (newValue) { - if (newValue && !$scope.title) { - $scope.title = AdbKeysService.hostNameFromKey(newValue) - } - }) - } diff --git a/res/app/settings/adb-keys/adb-keys.jade b/res/app/settings/adb-keys/adb-keys.jade index 4c28a092..31e43658 100644 --- a/res/app/settings/adb-keys/adb-keys.jade +++ b/res/app/settings/adb-keys/adb-keys.jade @@ -6,14 +6,14 @@ span(translate) ADB Keys button.btn.pull-right.btn-sm( - ng-click='toggleAddKey()', + ng-click='showAdd = !showAdd', ng-class='{ "btn-primary-outline": !showAdd, "btn-primary": showAdd }') //(tooltip='{{ "Add ADB Key" | translate }}') i.fa.fa-plus.fa-fw .widget-content.padded - add-adb-key(show-add='showAdd', show-clipboard='true') + add-adb-key(show-clipboard='true', show-add='showAdd') nothing-to-show(icon='fa-key', message='{{"No ADB keys" | translate}}', ng-if='!adbKeys.length && !showAdd') diff --git a/res/app/settings/settings-controller.js b/res/app/settings/settings-controller.js index a54d9c28..f0e1fc56 100644 --- a/res/app/settings/settings-controller.js +++ b/res/app/settings/settings-controller.js @@ -1,20 +1,20 @@ module.exports = function SettingsCtrl($scope, gettext) { $scope.settingTabs = [ - //{ - // title: gettext('Keys'), - // icon: 'fa-key fa-fw', - // templateUrl: 'settings/adb-keys/adb-keys.jade' - //}, + { + title: gettext('Keys'), + icon: 'fa-key fa-fw', + templateUrl: 'settings/adb-keys/adb-keys.jade' + }, { title: gettext('General'), icon: 'fa-gears fa-fw', templateUrl: 'settings/general/general.jade' }, - { - title: gettext('Keys'), - icon: 'fa-key fa-fw', - templateUrl: 'settings/adb-keys/adb-keys.jade' - } + //{ + // title: gettext('Keys'), + // icon: 'fa-key fa-fw', + // templateUrl: 'settings/adb-keys/adb-keys.jade' + //} ] } diff --git a/res/app/settings/settings.jade b/res/app/settings/settings.jade index 1f4f9338..60d1d42b 100644 --- a/res/app/settings/settings.jade +++ b/res/app/settings/settings.jade @@ -1,4 +1,4 @@ div(pane='center', ng-controller='SettingsCtrl') - br + //br .widget-container.fluid-height nice-tabs(key='SettingsTabs', tabs='settingTabs', filter='')