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

custom icon loading

This commit is contained in:
Antelle 2015-11-22 13:59:13 +03:00
parent e8d4cc5154
commit 03457a6e73
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,7 +386,7 @@ var FileModel = Backbone.Model.extend({
},
addCustomIcon: function(iconData) {
var id = new kdbxweb.KdbxUuid();
var id = kdbxweb.KdbxUuid.random();
this.db.meta.customIcons[id] = kdbxweb.ByteUtils.arrayToBuffer(kdbxweb.ByteUtils.base64ToBytes(iconData));
return id.toString();
}

2
app/scripts/views/details/details-view.js
View File

@ -249,7 +249,7 @@ var DetailsView = Backbone.View.extend({
this.render();
}
} else if (sel.id !== this.model.iconId) {
this.model.setIcon(sel.id);
this.model.setIcon(+sel.id);
this.entryUpdated();
} else {
this.render();

2
app/scripts/views/grp-view.js
View File

@ -97,7 +97,7 @@ var GrpView = Backbone.View.extend({
this.model.setCustomIcon(sel.id);
}
} else if (sel.id !== this.model.get('iconId')) {
this.model.setIcon(sel.id);
this.model.setIcon(+sel.id);
}
this.render();
},

15
app/scripts/views/icon-select-view.js
View File

@ -1,7 +1,8 @@
'use strict';
var Backbone = require('backbone'),
IconMap = require('../const/icon-map');
IconMap = require('../const/icon-map'),
Launcher = require('../comp/launcher');
var IconSelectView = Backbone.View.extend({
template: require('templates/icon-select.html'),
@ -54,18 +55,18 @@ var IconSelectView = Backbone.View.extend({
this.downloadingFavicon = true;
this.$el.find('.icon-select__icon-download>i').addClass('fa-spinner fa-spin');
var that = this;
var url = this.getIconUrl();
var url = this.getIconUrl(!Launcher); // inside launcher we can load images without CORS
var img = document.createElement('img');
img.crossOrigin = 'Anonymous';
img.src = url;
img.onload = function() {
img.onload = function () {
that.setSpecialImage(img, 'download');
that.$el.find('.icon-select__icon-download img').remove();
that.$el.find('.icon-select__icon-download>i').removeClass('fa-spinner fa-spin');
that.$el.find('.icon-select__icon-download').addClass('icon-select__icon--custom-selected').append(img);
that.downloadingFavicon = false;
};
img.onerror = function(e) {
img.onerror = function (e) {
console.error('Favicon download error: ' + url, e);
that.$el.find('.icon-select__icon-download>i').removeClass('fa-spinner fa-spin');
that.$el.find('.icon-select__icon-download').removeClass('icon-select__icon--custom-selected');
@ -73,7 +74,7 @@ var IconSelectView = Backbone.View.extend({
};
},
getIconUrl: function() {
getIconUrl: function(useGoogle) {
if (!this.model.url) {
return null;
}
@ -81,7 +82,9 @@ var IconSelectView = Backbone.View.extend({
if (url.indexOf('://') < 0) {
url = 'http://' + url;
}
url = 'http://www.google.com/s2/favicons?domain_url=' + encodeURIComponent(url);
if (useGoogle) {
return 'http://www.google.com/s2/favicons?domain_url=' + encodeURIComponent(url.replace('/favicon.ico', '/'));
}
return url;
},