mirror of
https://github.com/zero-peak/ZeroOmega.git
synced 2025-02-02 11:08:13 -05:00
Compare commits
No commits in common. "eca6192077c0c41cb26992fcbef57301c3aae3eb" and "f4a511749b5432d5f50741e0f91f3306b053280b" have entirely different histories.
eca6192077
...
f4a511749b
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"manifest_version": 3,
|
"manifest_version": 3,
|
||||||
"name": "Proxy SwitchyOmega 3 (ZeroOmega)",
|
"name": "Proxy SwitchyOmega 3 (ZeroOmega)",
|
||||||
"version": "3.3.18",
|
"version": "3.3.17",
|
||||||
"description": "__MSG_manifest_app_description__",
|
"description": "__MSG_manifest_app_description__",
|
||||||
"icons": {
|
"icons": {
|
||||||
"16": "img/icons/omega-action-16.png",
|
"16": "img/icons/omega-action-16.png",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"manifest_version": 3,
|
"manifest_version": 3,
|
||||||
"name": "Proxy SwitchyOmega 3 (ZeroOmega)",
|
"name": "Proxy SwitchyOmega 3 (ZeroOmega)",
|
||||||
"version": "3.3.18",
|
"version": "3.3.17",
|
||||||
"description": "__MSG_manifest_app_description__",
|
"description": "__MSG_manifest_app_description__",
|
||||||
"icons": {
|
"icons": {
|
||||||
"16": "img/icons/omega-action-16.png",
|
"16": "img/icons/omega-action-16.png",
|
||||||
|
@ -154,8 +154,6 @@ updateGist = (gistId, options) ->
|
|||||||
}).then((res) ->
|
}).then((res) ->
|
||||||
res.json()
|
res.json()
|
||||||
).then((data) ->
|
).then((data) ->
|
||||||
if data.status is "404"
|
|
||||||
throw new Error("The token with Gist permission is required.")
|
|
||||||
if data.message
|
if data.message
|
||||||
throw data.message
|
throw data.message
|
||||||
lastGistCommit = data.history[0]?.version
|
lastGistCommit = data.history[0]?.version
|
||||||
|
@ -548,15 +548,3 @@ main {
|
|||||||
.use-built-in-sync-enhance-tip {
|
.use-built-in-sync-enhance-tip {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
.settings-group .sync-form .clean-btn{
|
|
||||||
position: absolute;
|
|
||||||
}
|
|
||||||
.sync-form input.form-control[readonly]{
|
|
||||||
-webkit-text-security: disc;
|
|
||||||
text-security: disc;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sync-form input.form-control:focus{
|
|
||||||
-webkit-text-security: initial;
|
|
||||||
text-security: initial;
|
|
||||||
}
|
|
||||||
|
@ -107,10 +107,6 @@ angular.module('omega').controller 'IoCtrl', (
|
|||||||
else
|
else
|
||||||
$rootScope.applyOptionsConfirm().then enable
|
$rootScope.applyOptionsConfirm().then enable
|
||||||
|
|
||||||
$scope.cleanInput = (target) ->
|
|
||||||
$scope[target] = ''
|
|
||||||
omegaTarget.state(target, '')
|
|
||||||
|
|
||||||
$scope.checkOptionsSyncChange = ->
|
$scope.checkOptionsSyncChange = ->
|
||||||
$scope.enableOptionsSyncing = true
|
$scope.enableOptionsSyncing = true
|
||||||
omegaTarget.checkOptionsSyncChange().then( ->
|
omegaTarget.checkOptionsSyncChange().then( ->
|
||||||
|
@ -39,13 +39,12 @@ section.settings-group
|
|||||||
section.settings-group
|
section.settings-group
|
||||||
h3 {{'options_group_syncing' | tr}}
|
h3 {{'options_group_syncing' | tr}}
|
||||||
div
|
div
|
||||||
form.sync-form
|
form
|
||||||
div.form-group
|
div.form-group
|
||||||
label {{'Gist Id'}}
|
label {{'Gist Id'}}
|
||||||
.input-group.width-limit
|
.input-group.width-limit
|
||||||
span.input-group-addon {{'ID'}}
|
span.input-group-addon {{'ID'}}
|
||||||
input.form-control(type='text' ng-model='gistId' ng-readonly='syncOptions == "sync"' placeholder="Gist Id e.g. https://gist.github.com/{username}/{Gist Id}")
|
input.form-control(type='text' ng-model='gistId' ng-readonly='syncOptions == "sync"' placeholder="Gist Id e.g. https://gist.github.com/{username}/{Gist Id}")
|
||||||
span.glyphicon.glyphicon-remove.btn.clean-btn(ng-click='cleanInput("gistId")' ng-if='syncOptions != "sync"')
|
|
||||||
span.help-block
|
span.help-block
|
||||||
a(href="https://gist.github.com/" role="button" target="_blank")
|
a(href="https://gist.github.com/" role="button" target="_blank")
|
||||||
| {{'Create a secret Gist. '}}
|
| {{'Create a secret Gist. '}}
|
||||||
@ -56,12 +55,9 @@ section.settings-group
|
|||||||
.input-group.width-limit
|
.input-group.width-limit
|
||||||
span.input-group-addon {{'TOKEN'}}
|
span.input-group-addon {{'TOKEN'}}
|
||||||
input.form-control(type='text' ng-model='gistToken' ng-readonly='syncOptions == "sync"' placeholder="Gist Token")
|
input.form-control(type='text' ng-model='gistToken' ng-readonly='syncOptions == "sync"' placeholder="Gist Token")
|
||||||
span.glyphicon.glyphicon-remove.btn.clean-btn(ng-click='cleanInput("gistToken")' ng-if='syncOptions != "sync"')
|
|
||||||
span.help-block
|
span.help-block
|
||||||
a(href="https://github.com/settings/tokens/new" role="button" target="_blank")
|
a(href="https://github.com/settings/tokens/new" role="button" target="_blank")
|
||||||
| {{ 'Create a token that manages the Gist.' }}
|
| {{ 'Create a token that manages the Gist.(Only gist permission is required.)'}}
|
||||||
strong
|
|
||||||
| {{ '(Gist permission is required.)'}}
|
|
||||||
div(ng-show='syncOptions == "pristine" || syncOptions == "disabled"')
|
div(ng-show='syncOptions == "pristine" || syncOptions == "disabled"')
|
||||||
div.checkbox
|
div.checkbox
|
||||||
label
|
label
|
||||||
@ -95,6 +91,7 @@ section.settings-group
|
|||||||
span.glyphicon.glyphicon-ok
|
span.glyphicon.glyphicon-ok
|
||||||
= ' '
|
= ' '
|
||||||
| {{"options_syncSyncAlert" | tr}}
|
| {{"options_syncSyncAlert" | tr}}
|
||||||
|
p.help-block(omega-html='"options_syncSyncHelp" | tr')
|
||||||
p
|
p
|
||||||
button.btn.btn-warning(ng-click='disableOptionsSync()')
|
button.btn.btn-warning(ng-click='disableOptionsSync()')
|
||||||
span.glyphicon.glyphicon-remove-sign
|
span.glyphicon.glyphicon-remove-sign
|
||||||
|
Loading…
Reference in New Issue
Block a user