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

Change function signature.

Browse Source
This commit is contained in:
Gunther Brunner
2014-09-29 19:43:16 +09:00
parent 9d38bced21
commit 6b1a2700bd
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/app/components/stf/keys/add-adb-key/adb-keys-service.js
View File

@@ -1,9 +1,9 @@
module.exports = function AdbKeysServiceFactory() {
var service = {}
service.hostNameFromKey = function (key) {
service.commentFromKey = function (key) {
if (key.match(/.+= (.+)/)) {
return key.replace(/.+= (.+)/g, '$1').replace(/(\.local)?/g, '')
return key.replace(/.+= (.+)/g, '$1')
}
return ''
}

6
res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js
View File

@@ -22,14 +22,16 @@ module.exports = function addAdbKeyDirective(AdbKeysService) {
scope.addForm.title = ''
scope.addForm.key = ''
console.log('scope', scope)
// TODO: cannot access to the form by name?
// TODO: cannot access to the form by name inside a directive?
//scope.adbkeyform.$setPristine()
scope.showAdd = false
}
scope.$watch('addForm.key', function (newValue) {
if (newValue && !scope.addForm.title) {
scope.addForm.title = AdbKeysService.hostNameFromKey(newValue)
// By default sets the title to the ADB key comment because
// usually it happens to be username@hostname.
scope.addForm.title = AdbKeysService.commentFromKey(newValue)
}
})