antville/antville
antville/antville
1
1
Fork 0
Code Issues 51 Pull requests 9 Projects Releases 9 Wiki Activity Actions

Merge branch 'feature/batch-upload' into develop

Browse source
This commit is contained in:
Tobi Schäfer 2015-03-27 17:51:33 +01:00
commit 953462e3ea
2 changed files with 45 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
code/Images/$Images.skin
View file

@ -33,3 +33,48 @@
<div class='uk-hidden av-upload-drop'>
<i class='uk-icon uk-icon-cloud-upload'></i>
</div>
<script type='text/javascript'>
(function () {
var dropTimer, dropHasHilite;
var dropElement = $('.av-upload-drop');
var parent = location.href.lastIndexOf('/layout/images/') > -1 ? 'layout' : 'site';
var uploadUrl = '<% site.images.href upload %>?parent=' + parent;
var target = $(document).on('dragstart dragenter dragover', function () {
if (!dropHasHilite) {
dropElement.removeClass('uk-hidden');
dropHasHilite = true;
}
}).on('dragleave dragend', function () {
dropHasHilite = false;
clearTimeout(dropTimer);
dropTimer = setTimeout(function () {
dropHasHilite || dropElement.addClass('uk-hidden');
}, 100);
});
var restoreDrop = function () {
dropElement.addClass('uk-hidden')
.find('i').removeClass('av-upload-glow');
};
var uploadDrop = UIkit.uploadDrop(target, {
action: uploadUrl,
allow: '*.(jpg|jpeg|gif|png)',
loadstart: function (event) {
dropElement.find('i')
.addClass('av-upload-glow');
},
progress: function (percent) {
//console.log(percent, '% progress');
},
allcomplete: function (response) {
location.href = response;
},
notallowed: restoreDrop,
error: restoreDrop,
abort: restoreDrop
});
})();
</script>

42
code/Site/$Site.skin
View file

@ -367,48 +367,6 @@
<% #javascript %>
$(function () {
var dropTimer, dropHasHilite;
var dropElement = $('.av-upload-drop');
var parent = location.href.lastIndexOf('/layout/images/') > -1 ? 'layout' : 'site';
var uploadUrl = '<% site.images.href upload %>?parent=' + parent;
var target = $(document).on('dragstart dragenter dragover', function () {
if (!dropHasHilite) {
dropElement.removeClass('uk-hidden');
dropHasHilite = true;
}
}).on('dragleave dragend', function () {
dropHasHilite = false;
clearTimeout(dropTimer);
dropTimer = setTimeout(function () {
dropHasHilite || dropElement.addClass('uk-hidden');
}, 100);
});
var restoreDrop = function () {
dropElement.addClass('uk-hidden')
.find('i').removeClass('av-upload-glow');
};
var uploadDrop = UIkit.uploadDrop(target, {
action: uploadUrl,
allow: '*.(jpg|jpeg|gif|png)',
loadstart: function (event) {
dropElement.find('i')
.addClass('av-upload-glow');
},
progress: function (percent) {
//console.log(percent, '% progress');
},
allcomplete: function (response) {
location.href = response;
},
notallowed: restoreDrop,
error: restoreDrop,
abort: restoreDrop
});
// Unhide hidden links triggering JavaScript
$('a[href="javascript:"]:hidden').css('display', 'inline-block');