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

Condition type - show help not showing help #76

Browse Source
This commit is contained in:
proxy.zeroomega 2025-01-13 09:02:05 +08:00
parent 1b2d20b4cb
commit 0fd0a945b2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,14 +129,14 @@ module.controller 'PopupCtrl', ($scope, $window, $q, omegaTarget,
$window.top.close() $window.top.close()
$scope.openConditionHelp = -> $scope.openConditionHelp = ->
pname = encodeURIComponent($scope.currentProfileName) pname = encodeURIComponent($scope.currentProfileName)
$scope.openOptions("#/profile/#{pname}?help=condition") $scope.openOptions("#!/profile/#{pname}?help=condition")
$scope.applyProfile = (profile) -> $scope.applyProfile = (profile) ->
next = -> next = ->
if profile.profileType == 'SwitchProfile' if profile.profileType == 'SwitchProfile'
return omegaTarget.state('web.switchGuide').then (switchGuide) -> return omegaTarget.state('web.switchGuide').then (switchGuide) ->
if switchGuide == 'showOnFirstUse' if switchGuide == 'showOnFirstUse'
return $scope.openOptions("#/profile/#{profile.name}") return $scope.openOptions("#!/profile/#{profile.name}")
if not refreshOnProfileChange if not refreshOnProfileChange
omegaTarget.applyProfileNoReply(profile.name) omegaTarget.applyProfileNoReply(profile.name)
apply = next() apply = next()

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

@ -167,7 +167,7 @@ html(lang='en' ng-app='omegaPopup' ng-controller='PopupCtrl' ng-csp)
| {{'Add temp condition'}} | {{'Add temp condition'}}
button.btn.btn-primary(type='submit' ng-show='!!currentProfileCanAddRule') {{'popup_addCondition' | tr}} button.btn.btn-primary(type='submit' ng-show='!!currentProfileCanAddRule') {{'popup_addCondition' | tr}}
button.btn.btn-default.pull-right(type='button' ng-show='!currentProfileCanAddRule' button.btn.btn-default.pull-right(type='button' ng-show='!currentProfileCanAddRule'
ng-click='openOptions("#/general")') {{'popup_configureMonitorWebRequests' | tr}} ng-click='openOptions("#!/general")') {{'popup_configureMonitorWebRequests' | tr}}
script(src='js/log_error.js') script(src='js/log_error.js')
script(src='lib/iframeResizer/iframeResizer.contentWindow.min.js') script(src='lib/iframeResizer/iframeResizer.contentWindow.min.js')