arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Front-end rewrite #275

Browse Source
This commit is contained in:
Tobias Reich 2014-11-22 20:37:22 +01:00
parent 88874750ba
commit edcffdc8eb
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/main.js vendored
View File

Binary file not shown.

118
src/scripts/init.js
View File

@ -6,73 +6,73 @@
$(document).ready(function() { $(document).ready(function() {
/* Event Name */ /* Event Name */
var event_name = (mobileBrowser()) ? "touchend" : "click"; var event_name = (mobileBrowser()) ? 'touchend' : 'click';
/* Disable ContextMenu */ /* Disable ContextMenu */
$(document).bind("contextmenu", function(e) { e.preventDefault() }); $(document).bind('contextmenu', function(e) { e.preventDefault() });
/* Multiselect */ /* Multiselect */
$("#content") .on("mousedown", multiselect.show); $('#content') .on('mousedown', multiselect.show);
$(document) .on("mouseup", multiselect.getSelection); $(document) .on('mouseup', multiselect.getSelection);
/* Header */ /* Header */
$("#button_share").on(event_name, function(e) { $('#button_share').on(event_name, function(e) {
if (photo.json.public==1||photo.json.public==2) contextMenu.sharePhoto(photo.getID(), e); if (photo.json.public==1||photo.json.public==2) contextMenu.sharePhoto(photo.getID(), e);
else photo.setPublic(photo.getID(), e); else photo.setPublic(photo.getID(), e);
}); });
$("#button_share_album").on(event_name, function(e) { $('#button_share_album').on(event_name, function(e) {
if (album.json.public==1) contextMenu.shareAlbum(album.getID(), e); if (album.json.public==1) contextMenu.shareAlbum(album.getID(), e);
else album.setPublic(album.getID(), e); else album.setPublic(album.getID(), e);
}); });
$("#hostedwith") .on(event_name, function() { window.open(lychee.website) }); $('#button_signin') .on(event_name, lychee.loginDialog);
$("#button_signin") .on(event_name, lychee.loginDialog); $('#button_settings') .on(event_name, contextMenu.settings);
$("#button_settings") .on(event_name, contextMenu.settings); $('#button_info_album') .on(event_name, view.infobox.show);
$("#button_more") .on(event_name, function(e) { contextMenu.photoMore(photo.getID(), e) }); $('#button_info') .on(event_name, view.infobox.show);
$("#button_trash_album") .on(event_name, function() { album.delete([album.getID()]) }); $('#button_more') .on(event_name, function(e) { contextMenu.photoMore(photo.getID(), e) });
$("#button_move") .on(event_name, function(e) { contextMenu.move([photo.getID()], e) }); $('#button_move') .on(event_name, function(e) { contextMenu.move([photo.getID()], e) });
$("#button_trash") .on(event_name, function() { photo.delete([photo.getID()]) }); $('#hostedwith') .on(event_name, function() { window.open(lychee.website) });
$("#button_info_album") .on(event_name, view.infobox.show); $('#button_trash_album') .on(event_name, function() { album.delete([album.getID()]) });
$("#button_info") .on(event_name, view.infobox.show); $('#button_trash') .on(event_name, function() { photo.delete([photo.getID()]) });
$("#button_archive") .on(event_name, function() { album.getArchive(album.getID()) }); $('#button_archive') .on(event_name, function() { album.getArchive(album.getID()) });
$("#button_star") .on(event_name, function() { photo.setStar([photo.getID()]) }); $('#button_star') .on(event_name, function() { photo.setStar([photo.getID()]) });
$("#button_back_home") .on(event_name, function() { lychee.goto("") }); $('#button_back_home') .on(event_name, function() { lychee.goto('') });
$("#button_back") .on(event_name, function() { lychee.goto(album.getID()) }); $('#button_back') .on(event_name, function() { lychee.goto(album.getID()) });
/* Search */ /* Search */
$("#search").on("keyup click", function() { search.find($(this).val()) }); $('#search').on('keyup click', function() { search.find($(this).val()) });
/* Clear Search */ /* Clear Search */
$("#clearSearch").on(event_name, function () { $('#clearSearch').on(event_name, function () {
$("#search").focus(); $('#search').focus();
search.reset(); search.reset();
}); });
/* Image View */ /* Image View */
lychee.imageview lychee.imageview
.on(event_name, ".arrow_wrapper.previous", photo.previous) .on(event_name, '.arrow_wrapper.previous', photo.previous)
.on(event_name, ".arrow_wrapper.next", photo.next); .on(event_name, '.arrow_wrapper.next', photo.next);
/* Infobox */ /* Infobox */
$("#infobox") $('#infobox')
.on(event_name, ".header a", view.infobox.hide) .on(event_name, '.header a', view.infobox.hide)
.on(event_name, "#edit_title_album", function() { album.setTitle([album.getID()]) }) .on(event_name, '#edit_title_album', function() { album.setTitle([album.getID()]) })
.on(event_name, "#edit_description_album", function() { album.setDescription(album.getID()) }) .on(event_name, '#edit_description_album', function() { album.setDescription(album.getID()) })
.on(event_name, "#edit_title", function() { photo.setTitle([photo.getID()]) }) .on(event_name, '#edit_title', function() { photo.setTitle([photo.getID()]) })
.on(event_name, "#edit_description", function() { photo.setDescription(photo.getID()) }) .on(event_name, '#edit_description', function() { photo.setDescription(photo.getID()) })
.on(event_name, "#edit_tags", function() { photo.editTags([photo.getID()]) }) .on(event_name, '#edit_tags', function() { photo.editTags([photo.getID()]) })
.on(event_name, "#tags .tag span", function() { photo.deleteTag(photo.getID(), $(this).data('index')) }); .on(event_name, '#tags .tag span', function() { photo.deleteTag(photo.getID(), $(this).data('index')) });
/* Keyboard */ /* Keyboard */
Mousetrap Mousetrap
.bind('left', function() { if (visible.photo()) $("#imageview a#previous").click() }) .bind('left', function() { if (visible.photo()) $('#imageview a#previous').click() })
.bind('right', function() { if (visible.photo()) $("#imageview a#next").click() }) .bind('right', function() { if (visible.photo()) $('#imageview a#next').click() })
.bind(['u', 'ctrl+u'], function() { $("#upload_files").click() }) .bind(['u', 'ctrl+u'], function() { $('#upload_files').click() })
.bind(['s', 'ctrl+s', 'f', 'ctrl+f'], function(e) { .bind(['s', 'ctrl+s', 'f', 'ctrl+f'], function(e) {
if (visible.photo()) { if (visible.photo()) {
$("#button_star").click(); $('#button_star').click();
} else if (visible.albums()) { } else if (visible.albums()) {
e.preventDefault(); e.preventDefault();
$("#search").focus(); $('#search').focus();
} }
}) })
.bind(['r', 'ctrl+r'], function(e) { .bind(['r', 'ctrl+r'], function(e) {
@ -106,17 +106,17 @@ $(document).ready(function() {
}); });
Mousetrap.bindGlobal('enter', function() { Mousetrap.bindGlobal('enter', function() {
if ($(".message .button.active").length) $(".message .button.active").addClass("pressed").click() if ($('.message .button.active').length) $('.message .button.active').addClass('pressed').click()
}); });
Mousetrap.bindGlobal(['esc', 'command+up'], function(e) { Mousetrap.bindGlobal(['esc', 'command+up'], function(e) {
e.preventDefault(); e.preventDefault();
if (visible.message()&&$(".message .close").length>0) modal.close(); if (visible.message()&&$('.message .close').length>0) modal.close();
else if (visible.contextMenu()) contextMenu.close(); else if (visible.contextMenu()) contextMenu.close();
else if (visible.infobox()) view.infobox.hide(); else if (visible.infobox()) view.infobox.hide();
else if (visible.photo()) lychee.goto(album.getID()); else if (visible.photo()) lychee.goto(album.getID());
else if (visible.album()) lychee.goto(""); else if (visible.album()) lychee.goto('');
else if (visible.albums()&&$("#search").val().length!==0) search.reset(); else if (visible.albums()&&$('#search').val().length!==0) search.reset();
}); });
@ -133,7 +133,7 @@ $(document).ready(function() {
}) })
/* Swipe on mobile */ /* Swipe on mobile */
.swipe().on('swipeStart', function() { if (visible.photo()) swipe.start($("#image")) }) .swipe().on('swipeStart', function() { if (visible.photo()) swipe.start($('#image')) })
.swipe().on('swipeMove', function(e) { if (visible.photo()) swipe.move(e.swipe) }) .swipe().on('swipeMove', function(e) { if (visible.photo()) swipe.move(e.swipe) })
.swipe().on('swipeEnd', function(e) { if (visible.photo()) swipe.stop(e.swipe, photo.previous, photo.next) }); .swipe().on('swipeEnd', function(e) { if (visible.photo()) swipe.stop(e.swipe, photo.previous, photo.next) });
@ -143,40 +143,40 @@ $(document).ready(function() {
$(document) $(document)
/* Login */ /* Login */
.on("keyup", "#password", function() { if ($(this).val().length>0) $(this).removeClass("error") }) .on('keyup', '#password', function() { if ($(this).val().length>0) $(this).removeClass('error') })
/* Header */ /* Header */
.on(event_name, "#title.editable", function() { .on(event_name, '#title.editable', function() {
if (visible.photo()) photo.setTitle([photo.getID()]); if (visible.photo()) photo.setTitle([photo.getID()]);
else album.setTitle([album.getID()]); else album.setTitle([album.getID()]);
}) })
/* Navigation */ /* Navigation */
.on("click", ".album", function() { lychee.goto($(this).attr("data-id")) }) .on('click', '.album', function() { lychee.goto($(this).attr('data-id')) })
.on("click", ".photo", function() { lychee.goto(album.getID() + "/" + $(this).attr("data-id")) }) .on('click', '.photo', function() { lychee.goto(album.getID() + '/' + $(this).attr('data-id')) })
/* Modal */ /* Modal */
.on(event_name, ".message .close", modal.close) .on(event_name, '.message .close', modal.close)
.on(event_name, ".message .button:first", function() { if (modal.fns!==null) modal.fns[0](); if (!visible.signin()) modal.close() }) .on(event_name, '.message .button:first', function() { if (modal.fns!==null) modal.fns[0](); if (!visible.signin()) modal.close() })
.on(event_name, ".message .button:last", function() { if (modal.fns!==null) modal.fns[1](); if (!visible.signin()) modal.close() }) .on(event_name, '.message .button:last', function() { if (modal.fns!==null) modal.fns[1](); if (!visible.signin()) modal.close() })
/* Add Dialog */ /* Add Dialog */
.on(event_name, ".button_add", function(e) { contextMenu.add(e) }) .on(event_name, '.button_add', function(e) { contextMenu.add(e) })
/* Context Menu */ /* Context Menu */
.on("contextmenu", ".photo", function(e) { contextMenu.photo(photo.getID(), e) }) .on('contextmenu', '.photo', function(e) { contextMenu.photo(photo.getID(), e) })
.on("contextmenu", ".album", function(e) { contextMenu.album(album.getID(), e) }) .on('contextmenu', '.album', function(e) { contextMenu.album(album.getID(), e) })
.on("contextmenu", ".contextmenu_bg", contextMenu.close) .on('contextmenu', '.contextmenu_bg', contextMenu.close)
.on(event_name, ".contextmenu_bg", contextMenu.close) .on(event_name, '.contextmenu_bg', contextMenu.close)
/* Infobox */ /* Infobox */
.on(event_name, "#infobox_overlay", view.infobox.hide) .on(event_name, '#infobox_overlay', view.infobox.hide)
/* Upload */ /* Upload */
.on("change", "#upload_files", function() { modal.close(); upload.start.local(this.files) }) .on('change', '#upload_files', function() { modal.close(); upload.start.local(this.files) })
.on(event_name, ".upload_message a.close", upload.close) .on(event_name, '.upload_message a.close', upload.close)
.on("dragover", function(e) { e.preventDefault(); }, false) .on('dragover', function(e) { e.preventDefault(); }, false)
.on("drop", function(e) { .on('drop', function(e) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();