From 595e40549ac0b86da67fba562fc5efaeb05274a8 Mon Sep 17 00:00:00 2001 From: Tobias Reich Date: Sat, 11 Jul 2015 14:47:56 +0200 Subject: [PATCH] Updated main.js (ES2015) --- dist/main.js | Bin 179967 -> 179941 bytes dist/view.js | Bin 100183 -> 100159 bytes src/scripts/header.js | 164 +++++++++++++++++++++--------------------- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/dist/main.js b/dist/main.js index 5161103574d1037f85f380ea40f35904554ba65b..21ffdb2cb2e869ebad21ec45b556735fd4d35f47 100644 GIT binary patch delta 166 zcmV;X09pV4{R-v%3V^f$lj4^Oasm*yu;Kw;2$w#u0R{mfmn)_L84Gi1WMyJuawsW$ ze3!xD0Tmd0e0FJbX<}?;E^TFVb75y?C@DW7F*+!h+35i&m%i%(FPEa}0W1MKm+k8T zke8S00UDQ=>;V`7DYv-n0oVr_eJL(tX>MdFB6K1wW_503bZKvHC}k;o3b(8D0q}g6 UZ)E}pm!ok48vzQpzHtIUO@;V@GXk}?j8fOZkKNC0Wp__@BtOKtn2~I2Ms$43VkUqVrgzJ?<VFId{gsEk%e2uIkwxIVi~hIA~Vx8$})>HlX6n^3NrFb@-;No z)D&SN#hEFoNr^=$V#)b=C8-r9zNvYoDB`)P#l?x~sT!J^)n$oA3VG8Pq%mqt-;lzn zKRqW6NSsJxoWPu?X*Jy-ol$&xQ97f<^nz?g(e2aI887lPa!t=DXOy45sgzN3`^Iv{ GK7Ihly+CLH diff --git a/src/scripts/header.js b/src/scripts/header.js index 213150c..4ff9d63 100644 --- a/src/scripts/header.js +++ b/src/scripts/header.js @@ -11,174 +11,174 @@ header = { header.dom = function(selector) { - if (selector===undefined||selector===null||selector==='') return header._dom; - return header._dom.find(selector); + if (selector==null || selector==='') return header._dom + return header._dom.find(selector) } header.bind = function() { // Event Name - var eventName = lychee.getEventName(); + let eventName = lychee.getEventName() /* Buttons */ header.dom('#title').on(eventName, function(e) { - if (!$(this).hasClass('editable')) return false; - if (visible.photo()) contextMenu.photoTitle(album.getID(), photo.getID(), e); - else contextMenu.albumTitle(album.getID(), e); - }); + if (!$(this).hasClass('editable')) return false + if (visible.photo()) contextMenu.photoTitle(album.getID(), photo.getID(), e) + else contextMenu.albumTitle(album.getID(), e) + }) header.dom('#button_share').on(eventName, function(e) { - if (photo.json.public==='1'||photo.json.public==='2') contextMenu.sharePhoto(photo.getID(), e); - else photo.setPublic(photo.getID(), e); - }); + if (photo.json.public==='1' || photo.json.public==='2') contextMenu.sharePhoto(photo.getID(), e) + else photo.setPublic(photo.getID(), e) + }) header.dom('#button_share_album').on(eventName, function(e) { - if (album.json.public==='1') contextMenu.shareAlbum(album.getID(), e); - else album.setPublic(album.getID(), true, e); - }); - header.dom('#button_signin') .on(eventName, lychee.loginDialog); - header.dom('#button_settings') .on(eventName, contextMenu.settings); - header.dom('#button_info_album') .on(eventName, sidebar.toggle); - header.dom('#button_info') .on(eventName, sidebar.toggle); - header.dom('.button_add') .on(eventName, contextMenu.add); - header.dom('#button_more') .on(eventName, function(e) { contextMenu.photoMore(photo.getID(), e) }); - header.dom('#button_move') .on(eventName, function(e) { contextMenu.move([photo.getID()], e) }); - header.dom('#hostedwith') .on(eventName, function() { window.open(lychee.website) }); - header.dom('#button_trash_album') .on(eventName, function() { album.delete([album.getID()]) }); - header.dom('#button_trash') .on(eventName, function() { photo.delete([photo.getID()]) }); - header.dom('#button_archive') .on(eventName, function() { album.getArchive(album.getID()) }); - header.dom('#button_star') .on(eventName, function() { photo.setStar([photo.getID()]) }); - header.dom('#button_back_home') .on(eventName, function() { lychee.goto('') }); - header.dom('#button_back') .on(eventName, function() { lychee.goto(album.getID()) }); + if (album.json.public==='1') contextMenu.shareAlbum(album.getID(), e) + else album.setPublic(album.getID(), true, e) + }) + header.dom('#button_signin') .on(eventName, lychee.loginDialog) + header.dom('#button_settings') .on(eventName, contextMenu.settings) + header.dom('#button_info_album') .on(eventName, sidebar.toggle) + header.dom('#button_info') .on(eventName, sidebar.toggle) + header.dom('.button_add') .on(eventName, contextMenu.add) + header.dom('#button_more') .on(eventName, function(e) { contextMenu.photoMore(photo.getID(), e) }) + header.dom('#button_move') .on(eventName, function(e) { contextMenu.move([photo.getID()], e) }) + header.dom('#hostedwith') .on(eventName, function() { window.open(lychee.website) }) + header.dom('#button_trash_album') .on(eventName, function() { album.delete([album.getID()]) }) + header.dom('#button_trash') .on(eventName, function() { photo.delete([photo.getID()]) }) + header.dom('#button_archive') .on(eventName, function() { album.getArchive(album.getID()) }) + header.dom('#button_star') .on(eventName, function() { photo.setStar([photo.getID()]) }) + header.dom('#button_back_home') .on(eventName, function() { lychee.goto('') }) + header.dom('#button_back') .on(eventName, function() { lychee.goto(album.getID()) }) /* Search */ - header.dom('#search').on('keyup click', function() { search.find($(this).val()) }); + header.dom('#search').on('keyup click', function() { search.find($(this).val()) }) header.dom('#clearSearch').on(eventName, function () { - header.dom('#search').focus(); - search.reset(); - }); + header.dom('#search').focus() + search.reset() + }) - return true; + return true } header.show = function() { - var newMargin = -1*($('#imageview #image').height()/2)+20; + let newMargin = (-1 * ($('#imageview #image').height()/2) + 20) - clearTimeout($(window).data('timeout')); + clearTimeout($(window).data('timeout')) - lychee.imageview.removeClass('full'); - header.dom().removeClass('hidden'); + lychee.imageview.removeClass('full') + header.dom().removeClass('hidden') // Adjust position or size of photo - if ($('#imageview #image.small').length>0) $('#imageview #image').css('margin-top', newMargin); - else $('#imageview #image').removeClass('full'); + if ($('#imageview #image.small').length>0) $('#imageview #image').css('margin-top', newMargin) + else $('#imageview #image').removeClass('full') - return true; + return true } header.hide = function(e, delay = 500) { - if (visible.photo()&&!visible.sidebar()&&!visible.contextMenu()&&!visible.message()) { + if (visible.photo() && !visible.sidebar() && !visible.contextMenu() && !visible.message()) { - var newMargin = -1*($('#imageview #image').height()/2); - - clearTimeout($(window).data('timeout')); + clearTimeout($(window).data('timeout')) $(window).data('timeout', setTimeout(function() { - lychee.imageview.addClass('full'); - header.dom().addClass('hidden'); + let newMargin = (-1 * ($('#imageview #image').height()/2)) + + lychee.imageview.addClass('full') + header.dom().addClass('hidden') // Adjust position or size of photo - if ($('#imageview #image.small').length>0) $('#imageview #image').css('margin-top', newMargin); - else $('#imageview #image').addClass('full'); + if ($('#imageview #image.small').length>0) $('#imageview #image').css('margin-top', newMargin) + else $('#imageview #image').addClass('full') - }, delay)); + }, delay)) - return true; + return true } - return false; + return false } header.setTitle = function(title = 'Untitled') { - var $title = header.dom('#title'); + let $title = header.dom('#title') - $title.html(title + build.iconic('caret-bottom')); + $title.html(title + build.iconic('caret-bottom')) - return true; + return true } header.setMode = function(mode) { - var albumID = album.getID(); + let albumID = album.getID() switch (mode) { case 'albums': - header.dom().removeClass('view'); - $('#tools_album, #tools_photo').hide(); - $('#tools_albums').show(); + header.dom().removeClass('view') + $('#tools_album, #tools_photo').hide() + $('#tools_albums').show() - return true; - break; + return true + break case 'album': - header.dom().removeClass('view'); - $('#tools_albums, #tools_photo').hide(); - $('#tools_album').show(); + header.dom().removeClass('view') + $('#tools_albums, #tools_photo').hide() + $('#tools_album').show() // Hide download button when album empty - album.json.content === false ? $('#button_archive').hide() : $('#button_archive').show(); + album.json.content === false ? $('#button_archive').hide() : $('#button_archive').show() // Hide download button when not logged in and album not downloadable - if (lychee.publicMode===true&&album.json.downloadable==='0') $('#button_archive').hide(); + if (lychee.publicMode===true && album.json.downloadable==='0') $('#button_archive').hide() - if (albumID==='s'||albumID==='f'||albumID==='r') { - $('#button_info_album, #button_trash_album, #button_share_album').hide(); + if (albumID==='s' || albumID==='f' || albumID==='r') { + $('#button_info_album, #button_trash_album, #button_share_album').hide() } else if (albumID==='0') { - $('#button_info_album, #button_share_album').hide(); - $('#button_trash_album').show(); + $('#button_info_album, #button_share_album').hide() + $('#button_trash_album').show() } else { - $('#button_info_album, #button_trash_album, #button_share_album').show(); + $('#button_info_album, #button_trash_album, #button_share_album').show() } - return true; - break; + return true + break case 'photo': - header.dom().addClass('view'); - $('#tools_albums, #tools_album').hide(); - $('#tools_photo').show(); + header.dom().addClass('view') + $('#tools_albums, #tools_album').hide() + $('#tools_photo').show() - return true; - break; + return true + break } - return false; + return false } header.setEditable = function(editable) { - var $title = header.dom('#title'); + let $title = header.dom('#title') // Hide editable icon when not logged in - if (lychee.publicMode===true) editable = false; + if (lychee.publicMode===true) editable = false - if (editable) $title.addClass('editable'); - else $title.removeClass('editable'); + if (editable) $title.addClass('editable') + else $title.removeClass('editable') - return true; + return true } \ No newline at end of file