keeweb/keeweb
1
0
Fork 0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-27 07:45:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'release-1.0'

Browse Source
This commit is contained in:
Antelle 2016-02-17 23:59:57 +03:00
commit e88aabe431
9 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scripts/mixins/scrollable.js
View File

@ -24,11 +24,6 @@ var Scrollable = {
removeScroll: function() { removeScroll: function() {
if (this.scroll) { if (this.scroll) {
this.scroll.dispose(); this.scroll.dispose();
// TODO: remove once the bug in custom scrollbar is resolved
var ix = baron._instances.indexOf(this.scroll[0]);
if (ix >= 0) {
baron._instances.splice(ix, 1);
}
this.scroll = null; this.scroll = null;
} }
}, },

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

@ -386,7 +386,7 @@ var DetailsView = Backbone.View.extend({
} }
this.$el.find('.details').removeClass('details--drag'); this.$el.find('.details').removeClass('details--drag');
this.dragging = false; this.dragging = false;
var files = e.target.files || e.dataTransfer.files; var files = e.target.files || e.originalEvent.dataTransfer.files;
_.forEach(files, function(file) { _.forEach(files, function(file) {
var reader = new FileReader(); var reader = new FileReader();
reader.onload = (function() { reader.onload = (function() {

4
app/scripts/views/list-view.js
View File

@ -203,8 +203,8 @@ var ListView = Backbone.View.extend({
itemDragStart: function(e) { itemDragStart: function(e) {
e.stopPropagation(); e.stopPropagation();
var id = $(e.target).closest('.list__item').attr('id'); var id = $(e.target).closest('.list__item').attr('id');
e.dataTransfer.setData('text/entry', id); e.originalEvent.dataTransfer.setData('text/entry', id);
e.dataTransfer.effectAllowed = 'move'; e.originalEvent.dataTransfer.effectAllowed = 'move';
DragDropInfo.dragObject = this.items.get(id); DragDropInfo.dragObject = this.items.get(id);
} }
}); });

6
app/scripts/views/menu/menu-item-view.js
View File

@ -173,14 +173,14 @@ var MenuItemView = Backbone.View.extend({
}, },
dropAllowed: function(e) { dropAllowed: function(e) {
return ['text/group', 'text/entry'].indexOf(e.dataTransfer.types[0]) >= 0; return ['text/group', 'text/entry'].indexOf(e.originalEvent.dataTransfer.types[0]) >= 0;
}, },
dragstart: function(e) { dragstart: function(e) {
e.stopPropagation(); e.stopPropagation();
if (this.model.get('drag')) { if (this.model.get('drag')) {
e.dataTransfer.setData('text/group', this.model.id); e.originalEvent.dataTransfer.setData('text/group', this.model.id);
e.dataTransfer.effectAllowed = 'move'; e.originalEvent.dataTransfer.effectAllowed = 'move';
DragDropInfo.dragObject = this.model; DragDropInfo.dragObject = this.model;
} }
}, },

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

@ -251,7 +251,7 @@ var OpenView = Backbone.View.extend({
clearTimeout(this.dragTimeout); clearTimeout(this.dragTimeout);
} }
this.$el.removeClass('open--drag'); this.$el.removeClass('open--drag');
var files = e.target.files || e.dataTransfer.files; var files = e.target.files || e.originalEvent.dataTransfer.files;
var dataFile = _.find(files, function(file) { return file.name.split('.').pop().toLowerCase() === 'kdbx'; }); var dataFile = _.find(files, function(file) { return file.name.split('.').pop().toLowerCase() === 'kdbx'; });
var keyFile = _.find(files, function(file) { return file.name.split('.').pop().toLowerCase() === 'key'; }); var keyFile = _.find(files, function(file) { return file.name.split('.').pop().toLowerCase() === 'key'; });
if (dataFile) { if (dataFile) {

2
bower.json
View File

@ -24,7 +24,7 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"backbone": "~1.2.3", "backbone": "~1.2.3",
"baron": "~2.0.1", "baron": "~2.0.2",
"bourbon": "~4.2.5", "bourbon": "~4.2.5",
"dropbox": "antelle/dropbox-js#0.10.6", "dropbox": "antelle/dropbox-js#0.10.6",
"font-awesome": "~4.4.0", "font-awesome": "~4.4.0",

2
electron/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "KeeWeb", "name": "KeeWeb",
"version": "1.0.1", "version": "1.0.2",
"description": "KeePass web app", "description": "KeePass web app",
"main": "main.js", "main": "main.js",
"repository": "https://github.com/antelle/keeweb", "repository": "https://github.com/antelle/keeweb",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "keeweb", "name": "keeweb",
"version": "1.0.1", "version": "1.0.2",
"description": "KeePass web app", "description": "KeePass web app",
"main": "Gruntfile.js", "main": "Gruntfile.js",
"repository": "https://github.com/antelle/keeweb", "repository": "https://github.com/antelle/keeweb",

4
release-notes.md
View File

@ -1,5 +1,9 @@
Release notes Release notes
------------- -------------
##### v1.0.2 (2016-02-17)
Hotfix
`-` #80: dragdrop bug
##### v1.0.1 (2016-02-14) ##### v1.0.1 (2016-02-14)
Bugfixes Bugfixes
`-` fixed tags selection `-` fixed tags selection