0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:4810a7ee97f08ba55266305d6bef4c9a13a1518b
Branches Tags
0x2620:master
..
compare: 0x2620:bb18c9155b8a488fd6f127a82bb6df83cfe8d833
Branches Tags
0x2620:master

No commits in common. "4810a7ee97f08ba55266305d6bef4c9a13a1518b" and "bb18c9155b8a488fd6f127a82bb6df83cfe8d833" have entirely different histories.
4810a7ee97 ... bb18c9155b

2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
static/js/oml.js
View file

@ -118,14 +118,10 @@
}); });
Ox.$document.on({ Ox.$document.on({
dragenter: function(event) { dragenter: function(event) {
if (Ox.contains(event.originalEvent.dataTransfer.types, 'Files')) { event.originalEvent.preventDefault();
event.originalEvent.preventDefault(); event.originalEvent.stopPropagation();
event.originalEvent.stopPropagation(); if (!$('#importScreen').length && !$('#closedScreen').length) {
if (!$('#importScreen').length && !$('#closedScreen').length) { oml.ui.importScreen().appendTo(Ox.$body);
oml.ui.importScreen().appendTo(Ox.$body);
}
} else {
console.log(event.originalEvent.dataTransfer);
} }
}, },
dragover: function(event) { dragover: function(event) {

1
static/json/js.json
View file

@ -4,7 +4,6 @@
"URL.js", "URL.js",
"allItems.js", "allItems.js",
"annotation.js", "annotation.js",
"annotationFolder.js",
"annotationPanel.js", "annotationPanel.js",
"appDialog.js", "appDialog.js",
"appPanel.js", "appPanel.js",