keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Easy requested changes

This commit is contained in:
Grant Moyer 2019-08-14 22:59:53 -04:00
parent 93b05e448e
commit d96f458a1b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/models/app-settings-model.js
View File

@ -33,7 +33,7 @@ const AppSettingsModel = Backbone.Model.extend({
fontSize: 0,
tableViewColumns: null,
generatorPresets: null,
generatorHide: false,
generatorHidePassword: false,
cacheConfigSettings: false,
canOpen: true,

11
app/scripts/views/generator-view.js
View File

@ -33,7 +33,7 @@ const GeneratorView = Backbone.View.extend({
this.createPresets();
const preset = this.preset;
this.gen = _.clone(_.find(this.presets, pr => pr.name === preset));
this.hide = AppSettingsModel.instance.get('generatorHide');
this.hide = AppSettingsModel.instance.get('generatorHidePassword');
$('body').one('click', this.remove.bind(this));
this.listenTo(Backbone, 'lock-workspace', this.remove.bind(this));
},
@ -43,7 +43,7 @@ const GeneratorView = Backbone.View.extend({
const btnTitle = this.model.copy ? canCopy ? Locale.alertCopy : Locale.alertClose : Locale.alertOk;
this.renderTemplate({
btnTitle: btnTitle,
copy: this.model.copy,
showToggleButton: this.model.copy,
opt: this.gen,
hide: this.hide,
presets: this.presets,
@ -82,8 +82,7 @@ const GeneratorView = Backbone.View.extend({
showPassword: function() {
if (this.hide && !this.model.copy) {
const dots = '•'.repeat(this.password.length);
this.resultEl.text(dots);
this.resultEl.text(PasswordGenerator.present(this.password.length));
} else {
this.resultEl.text(this.password);
}
@ -130,8 +129,8 @@ const GeneratorView = Backbone.View.extend({
hideChange: function(e) {
this.hide = e.target.checked;
AppSettingsModel.instance.unset('generatorHide', { silent: true });
AppSettingsModel.instance.set('generatorHide', this.hide);
AppSettingsModel.instance.unset('generatorHidePassword', { silent: true });
AppSettingsModel.instance.set('generatorHidePassword', this.hide);
const label = this.$el.find('#gen__check-hide + label');
Tip.createTip(label[0], {title: this.hide ? Locale.genShowPass : Locale.genHidePass});
this.showPassword();

2
app/templates/generator.hbs
View File

@ -1,7 +1,7 @@
<div class="gen">
<div>{{res 'genLen'}}: <span class="gen__length-range-val">{{opt.length}}</span>
<i class="fa fa-refresh gen__btn-refresh gen__top-btn" title="{{res 'genNewPass'}}"></i>
{{#unless copy}}
{{#unless showToggleButton}}
<input type="checkbox" id="gen__check-hide" {{#if hide}}checked{{/if}}>
<label for="gen__check-hide" class="fa gen__top-btn"
{{#if hide}}