tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-01-22 23:08:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disallow names starting with underscore when saving externalProfile.

Browse Source
This commit is contained in:
FelisCatus 2014-10-15 10:11:33 +08:00
parent abd362f424
commit 0be33856e2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
omega-web/src/coffee/popup.coffee
View File

@ -50,7 +50,10 @@ module.controller 'PopupCtrl', ($scope, $window, $q, omegaTarget,
omegaTarget.addCondition(condition, profileName).then -> omegaTarget.addCondition(condition, profileName).then ->
refresh() refresh()
$scope.notConflict = (name) -> not $scope.availableProfiles?['+' + name] $scope.validateProfileName =
conflict: '!$value || !availableProfiles["+" + $value]'
hidden: '!$value || $value[0] != "_"'
$scope.saveExternal = -> $scope.saveExternal = ->
$scope.nameExternal.open = false $scope.nameExternal.open = false
name = $scope.externalProfile.name name = $scope.externalProfile.name

2
omega-web/src/popup.jade
View File

@ -37,7 +37,7 @@ html(lang='en' ng-app='omegaPopup' ng-controller='PopupCtrl' ng-csp)
= ' ' = ' '
span(ng-show='!nameExternal.open') {{'popup_externalProfile' | tr}} span(ng-show='!nameExternal.open') {{'popup_externalProfile' | tr}}
input.form-control(ng-show='!!nameExternal.open' ng-model='externalProfile.name' ng-blur='nameExternalForm.submit()' input.form-control(ng-show='!!nameExternal.open' ng-model='externalProfile.name' ng-blur='nameExternalForm.submit()'
placeholder='{{"popup_externalProfileName" | tr}}' ui-validate='{conflict: "notConflict($value)"}') placeholder='{{"popup_externalProfileName" | tr}}' ui-validate='validateProfileName')
li.divider li.divider
li.profile(ng-repeat='profile in customProfiles' ng-class='{active: isActive(profile.name), "bg-info": isEffective(profile.name)}') li.profile(ng-repeat='profile in customProfiles' ng-class='{active: isActive(profile.name), "bg-info": isEffective(profile.name)}')
a(ng-click='applyProfile(profile)') a(ng-click='applyProfile(profile)')