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

Renamed visible to hidden #27

Browse Source
This commit is contained in:
Tobias Reich 2016-03-13 00:27:17 +01:00
parent 976635254e
commit 63d6ad2c66
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/scripts/album.js
View File

@ -391,11 +391,11 @@ album.setPublic = function(albumID, modal, e) {
<form>
<div class='choice'>
<label>
<input type='checkbox' name='visible'>
<input type='checkbox' name='hidden'>
<span class='checkbox'>${ build.iconic('check') }</span>
<span class='label'>Visible</span>
<span class='label'>Hidden</span>
</label>
<p>Listed to visitors of your Lychee.</p>
<p>Only people with the direct link can view the album.</p>
</div>
<div class='choice'>
<label>
@ -411,7 +411,7 @@ album.setPublic = function(albumID, modal, e) {
<span class='checkbox'>${ build.iconic('check') }</span>
<span class='label'>Password protected</span>
</label>
<p>Only accessible with a valid password.</p>
<p>Album only accessible with a valid password.</p>
<input class='text' name='passwordtext' type='password' placeholder='password' value=''>
</div>
</form>
@ -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()

12
src/scripts/sidebar.js
View File

@ -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 }
]

6
src/scripts/view.js
View File

@ -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')
},