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

bugfixes; plugin sorting

This commit is contained in:
antelle 2017-04-26 22:12:41 +02:00
parent f8bfa8b7db
commit 499cd675a0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/plugins/plugin.js
View File

@ -38,7 +38,7 @@ const Plugin = Backbone.Model.extend(_.extend({}, PluginStatus, {
updateError: null
},
resources: null,
resources: {},
module: null,
initialize(options) {
@ -368,7 +368,7 @@ const Plugin = Backbone.Model.extend(_.extend({}, PluginStatus, {
uninstall() {
const ts = this.logger.ts();
return this.disable.then(() => {
return this.disable().then(() => {
return this.deleteResources().then(() => {
this.set('status', '');
this.logger.info('Uninstall complete', this.logger.ts(ts));

3
app/scripts/views/settings/settings-plugins-view.js
View File

@ -2,6 +2,7 @@ const Backbone = require('backbone');
const Locale = require('../../util/locale');
const PluginManager = require('../../plugins/plugin-manager');
const AppSettingsModel = require('../../models/app-settings-model');
const Comparators = require('../../util/comparators');
const SettingsPluginsView = Backbone.View.extend({
template: require('templates/settings/settings-plugins.hbs'),
@ -29,7 +30,7 @@ const SettingsPluginsView = Backbone.View.extend({
status: plugin.get('status'),
installTime: Math.round(plugin.get('installTime')),
updateError: plugin.get('updateError')
})),
})).sort(Comparators.stringComparator('id', true)),
lastInstallUrl: PluginManager.get('installing') || (lastInstall.error ? lastInstall.url : ''),
lastInstallError: lastInstall.error
});