From 0be33856e26257419e46819e15282dc599c0e44a Mon Sep 17 00:00:00 2001 From: FelisCatus Date: Wed, 15 Oct 2014 10:11:33 +0800 Subject: [PATCH] Disallow names starting with underscore when saving externalProfile. --- omega-web/src/coffee/popup.coffee | 5 ++++- omega-web/src/popup.jade | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/omega-web/src/coffee/popup.coffee b/omega-web/src/coffee/popup.coffee index 19ef0c9..976e260 100644 --- a/omega-web/src/coffee/popup.coffee +++ b/omega-web/src/coffee/popup.coffee @@ -50,7 +50,10 @@ module.controller 'PopupCtrl', ($scope, $window, $q, omegaTarget, omegaTarget.addCondition(condition, profileName).then -> refresh() - $scope.notConflict = (name) -> not $scope.availableProfiles?['+' + name] + $scope.validateProfileName = + conflict: '!$value || !availableProfiles["+" + $value]' + hidden: '!$value || $value[0] != "_"' + $scope.saveExternal = -> $scope.nameExternal.open = false name = $scope.externalProfile.name diff --git a/omega-web/src/popup.jade b/omega-web/src/popup.jade index 49c6ea0..a2c055f 100644 --- a/omega-web/src/popup.jade +++ b/omega-web/src/popup.jade @@ -37,7 +37,7 @@ html(lang='en' ng-app='omegaPopup' ng-controller='PopupCtrl' ng-csp) = ' ' span(ng-show='!nameExternal.open') {{'popup_externalProfile' | tr}} 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.profile(ng-repeat='profile in customProfiles' ng-class='{active: isActive(profile.name), "bg-info": isEffective(profile.name)}') a(ng-click='applyProfile(profile)')