From 63d6ad2c6639832fba89a57bf567024cbdcbcadf Mon Sep 17 00:00:00 2001 From: Tobias Reich Date: Sun, 13 Mar 2016 00:27:17 +0100 Subject: [PATCH] Renamed visible to hidden #27 --- src/scripts/album.js | 21 ++++++++++----------- src/scripts/sidebar.js | 12 ++++++------ src/scripts/view.js | 6 +++--- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/scripts/album.js b/src/scripts/album.js index 60c503a..78be78d 100644 --- a/src/scripts/album.js +++ b/src/scripts/album.js @@ -391,11 +391,11 @@ album.setPublic = function(albumID, modal, e) {
-

Listed to visitors of your Lychee.

+

Only people with the direct link can view the album.

-

Only accessible with a valid password.

+

Album only accessible with a valid password.

@@ -431,9 +431,8 @@ album.setPublic = function(albumID, modal, e) { } }) - // Active visible by default (public = 0) - if ((album.json.public==='1' && album.json.visible==='1') || (album.json.public==='0')) $('.basicModal .choice input[name="visible"]').click() - if (album.json.downloadable==='1') $('.basicModal .choice input[name="downloadable"]').click() + if (album.json.public==='1' && album.json.visible==='0') $('.basicModal .choice input[name="hidden"]').click() + if (album.json.downloadable==='1') $('.basicModal .choice input[name="downloadable"]').click() $('.basicModal .choice input[name="password"]').on('change', function() { @@ -453,8 +452,8 @@ album.setPublic = function(albumID, modal, e) { album.json.public = '1' // Set visible - if ($('.basicModal .choice input[name="visible"]:checked').length===1) album.json.visible = '1' - else album.json.visible = '0' + if ($('.basicModal .choice input[name="hidden"]:checked').length===1) album.json.visible = '0' + else album.json.visible = '1' // Set downloadable if ($('.basicModal .choice input[name="downloadable"]:checked').length===1) album.json.downloadable = '1' @@ -482,12 +481,12 @@ album.setPublic = function(albumID, modal, e) { // Set data and refresh view if (visible.album()) { - album.json.visible = (album.json.public==='0') ? '0' : album.json.visible + album.json.visible = (album.json.public==='0') ? '1' : album.json.visible album.json.downloadable = (album.json.public==='0') ? '0' : album.json.downloadable album.json.password = (album.json.public==='0') ? '0' : album.json.password view.album.public() - view.album.visible() + view.album.hidden() view.album.downloadable() view.album.password() diff --git a/src/scripts/sidebar.js b/src/scripts/sidebar.js index 8f1770b..48fb2a9 100644 --- a/src/scripts/sidebar.js +++ b/src/scripts/sidebar.js @@ -223,7 +223,7 @@ sidebar.createStructure.album = function(data) { let editable = false let structure = {} let _public = '' - let visible = '' + let hidden = '' let downloadable = '' let password = '' @@ -242,14 +242,14 @@ sidebar.createStructure.album = function(data) { } - // Set value for visible + // Set value for hidden switch (data.visible) { - case '0' : visible = 'No' + case '0' : hidden = 'Yes' break - case '1' : visible = 'Yes' + case '1' : hidden = 'No' break - default : visible = '-' + default : hidden = '-' break } @@ -301,7 +301,7 @@ sidebar.createStructure.album = function(data) { type : sidebar.types.DEFAULT, rows : [ { title: 'Public', value: _public }, - { title: 'Visible', value: visible }, + { title: 'Hidden', value: hidden }, { title: 'Downloadable', value: downloadable }, { title: 'Password', value: password } ] diff --git a/src/scripts/view.js b/src/scripts/view.js index 02cc498..198a4fd 100644 --- a/src/scripts/view.js +++ b/src/scripts/view.js @@ -246,10 +246,10 @@ view.album = { }, - visible: function() { + hidden: function() { - if (album.json.visible==='1') sidebar.changeAttr('visible', 'Yes') - else sidebar.changeAttr('visible', 'No') + if (album.json.visible==='1') sidebar.changeAttr('hidden', 'No') + else sidebar.changeAttr('hidden', 'Yes') },