From CoffeeScript to JS (ES6)

This commit is contained in:
Tobias Reich 2015-01-31 22:29:31 +01:00
parent 8c4f4e925f
commit b3323c74c3
7 changed files with 510 additions and 411 deletions

BIN
dist/main.css vendored

Binary file not shown.

BIN
dist/main.js vendored

Binary file not shown.

BIN
dist/view.js vendored

Binary file not shown.

View File

@ -16,15 +16,12 @@ var catchError = function(err) {
paths.view = {
js: [
'../src/scripts/_gup.js',
'../src/scripts/build.js',
'../src/scripts/view/main.js'
],
coffee: [
'../src/scripts/build.coffee'
],
scripts: [
'bower_components/jQuery/dist/jquery.min.js',
'../dist/_view--javascript.js',
'../dist/_view--coffee.js'
'../dist/_view--javascript.js'
]
}
@ -41,20 +38,7 @@ gulp.task('view--js', function() {
});
gulp.task('view--coffee', function() {
var stream =
gulp.src(paths.view.coffee)
.pipe(plugins.coffee({bare: true}))
.on('error', catchError)
.pipe(plugins.concat('_view--coffee.js', {newLine: "\n"}))
.pipe(gulp.dest('../dist/'));
return stream;
});
gulp.task('view--scripts', ['view--js', 'view--coffee'], function() {
gulp.task('view--scripts', ['view--js'], function() {
var stream =
gulp.src(paths.view.scripts)
@ -73,9 +57,6 @@ paths.main = {
js: [
'../src/scripts/*.js'
],
coffee: [
'../src/scripts/*.coffee'
],
scripts: [
'bower_components/jQuery/dist/jquery.min.js',
'bower_components/js-md5/js/md5.min.js',
@ -83,8 +64,7 @@ paths.main = {
'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js',
'bower_components/basicContext/dist/basicContext.min.js',
'bower_components/basicModal/dist/basicModal.min.js',
'../dist/_main--javascript.js',
'../dist/_main--coffee.js'
'../dist/_main--javascript.js'
],
scss: [
'../src/styles/*.scss'
@ -109,20 +89,7 @@ gulp.task('main--js', function() {
});
gulp.task('main--coffee', function() {
var stream =
gulp.src(paths.main.coffee)
.pipe(plugins.coffee({bare: true}))
.on('error', catchError)
.pipe(plugins.concat('_main--coffee.js', {newLine: "\n"}))
.pipe(gulp.dest('../dist/'));
return stream;
});
gulp.task('main--scripts', ['main--js', 'main--coffee'], function() {
gulp.task('main--scripts', ['main--js'], function() {
var stream =
gulp.src(paths.main.scripts)
@ -174,10 +141,8 @@ gulp.task('default', ['view--scripts', 'main--scripts', 'main--styles'], functio
gulp.task('watch', ['default'], function() {
gulp.watch(paths.view.js, ['view--scripts']);
gulp.watch(paths.view.coffee, ['view--scripts']);
gulp.watch(paths.main.js, ['main--scripts']);
gulp.watch(paths.main.coffee, ['main--scripts']);
gulp.watch(paths.main.scss, ['main--styles']);
});

View File

@ -13,7 +13,6 @@
"gulp": "^3.8.10",
"gulp-6to5": "^3.0.0",
"gulp-autoprefixer": "2.1.0",
"gulp-coffee": "^2.2.0",
"gulp-concat": "^2.4.3",
"gulp-load-plugins": "^0.8.0",
"gulp-minify-css": "^0.4.3",

View File

@ -1,370 +0,0 @@
###
# @description This module is used to generate HTML-Code.
# @copyright 2014 by Tobias Reich
###
window.build = {}
build.iconic = (icon, classes, path) ->
path = path || 'src/images/iconic.svg'
classes = classes || ''
"<svg viewBox='0 0 8 8' class='iconic #{ classes }'><use xlink:href='#{ path }##{ icon }'></use></svg>"
build.divider = (title) ->
"<div class='divider fadeIn'><h1>#{ title }</h1></div>"
build.editIcon = (id) ->
"<div id='#{ id }' class='edit'>#{ build.iconic('pencil') }</div>"
build.multiselect = (top, left) ->
"<div id='multiselect' style='top: #{ top }px; left: #{ left }px;'></div>"
build.album = (data) ->
return '' if not data?
title = data.title
longTitle = ''
typeThumb = ''
if title? and title.length > 18
title = data.title.substr(0, 18) + '...'
longTitle = data.title
if data.thumb0.split('.').pop() is 'svg' then typeThumb = 'nonretina'
html = """
<div class='album' data-id='#{ data.id }' data-password='#{ data.password }'>
<img src='#{ data.thumb2 }' width='200' height='200' alt='thumb' data-type='nonretina'>
<img src='#{ data.thumb1 }' width='200' height='200' alt='thumb' data-type='nonretina'>
<img src='#{ data.thumb0 }' width='200' height='200' alt='thumb' data-type='#{ typeThumb }'>
<div class='overlay'>
"""
if data.password and lychee.publicMode is false
html += "<h1 title='#{ longTitle }'><span class='icon-lock'></span> #{ title }</h1>";
else
html += "<h1 title='#{ longTitle }'>#{ title }</h1>"
html += """
<a>#{ data.sysdate }</a>
</div>
"""
if lychee.publicMode is false
if data.star is '1' then html += "<a class='badge icn-star'>#{ build.iconic('star') }</a>"
if data.public is '1' then html += "<a class='badge icn-share'>#{ build.iconic('eye') }</a>"
if data.unsorted is '1' then html += "<a class='badge'>#{ build.iconic('list') }</a>"
if data.recent is '1' then html += "<a class='badge'>#{ build.iconic('clock') }</a>"
html += "</div>"
return html
build.photo = (data) ->
return '' if not data?
title = data.title
longTitle = ''
if title? and title.length > 18
title = data.title.substr(0, 18) + '...'
longTitle = data.title
html = """
<div class='photo' data-album-id='#{ data.album }' data-id='#{ data.id }'>
<img src='#{ data.thumbUrl }' width='200' height='200' alt='thumb'>
<div class='overlay'>
<h1 title='#{ longTitle }'>#{ title }</h1>
"""
if data.cameraDate is 1
html += "<a><span class='icon-camera' title='Photo Date'></span>#{ data.sysdate }</a>"
else
html += "<a>#{ data.sysdate }</a>"
html += "</div>"
if data.star is '1' then html += "<a class='badge iconic-star'>#{ build.iconic('star') }</a>"
if lychee.publicMode is false and data.public is '1' and album.json.public isnt '1' then html += "<a class='badge iconic-share'>#{ build.iconic('eye') }</a>"
html += "</div>"
return html
build.imageview = (data, size, visibleControls) ->
return '' if not data?
html = """
<div class='arrow_wrapper arrow_wrapper--previous'><a id='previous'>#{ build.iconic('caret-left') }</a></div>
<div class='arrow_wrapper arrow_wrapper--next'><a id='next'>#{ build.iconic('caret-right') }</a></div>
"""
if size is 'big'
if visibleControls is true
html += "<div id='image' style='background-image: url(#{ data.url })'></div>"
else
html += "<div id='image' style='background-image: url(#{ data.url });' class='full'></div>"
else if size is 'medium'
if visibleControls is true
html += "<div id='image' style='background-image: url(#{ data.medium })'></div>"
else
html += "<div id='image' style='background-image: url(#{ data.medium });' class='full'></div>"
else if size is 'small'
if visibleControls is true
html += "<div id='image' class='small' style='background-image: url(#{ data.url }); width: #{ data.width }px; height: #{ data.height }px; margin-top: -#{ parseInt(data.height/2-20) }px; margin-left: -#{ data.width/2 }px;'></div>"
else
html += "<div id='image' class='small' style='background-image: url(#{ data.url }); width: #{ data.width }px; height: #{ data.height }px; margin-top: -#{ parseInt(data.height/2) }px; margin-left: -#{ data.width/2 }px;'></div>"
return html
build.no_content = (typ) ->
html = """
<div class='no_content fadeIn'>
<a class='icon icon-#{ typ }'></a>
"""
switch typ
when 'search' then html += "<p>No results</p>"
when 'share' then html += "<p>No public albums</p>"
when 'cog' then html += "<p>No configuration</p>"
html += "</div>"
return html
build.uploadModal = (title, files) ->
html = """
<h1>#{ title }</h1>
<div class='rows'>
"""
i = 0
file = null
while i < files.length
file = files[i]
if file.name.length > 40
file.name = file.name.substr(0, 17) + '...' + file.name.substr(file.name.length-20, 20)
html += """
<div class='row'>
<a class='name'>#{ lychee.escapeHTML(file.name) }</a>
"""
if file.supported is true then html += "<a class='status'></a>"
else html += "<a class='status error'>Not supported</a>"
html += """
<p class='notice'></p>
</div>
"""
i++
html += """
</div>
"""
return html
build.tags = (tags, forView) ->
html = ''
if forView is true or lychee.publicMode is true then editTagsHTML = ''
else editTagsHTML = ' ' + build.editIcon('edit_tags')
if tags isnt ''
tags = tags.split ','
tags.forEach (tag, index, array) ->
html += "<a class='tag'>#{ tag }<span class='icon-remove' data-index='#{ index }'></span></a>"
html += editTagsHTML
else
html = "<div class='empty'>No Tags#{ editTagsHTML }</div>"
return html
build.infoboxPhoto = (data, forView) ->
html = ""
switch data.public
when '0' then visible = 'No'
when '1' then visible = 'Yes'
when '2' then visible = 'Yes (Album)'
else visible = '-'
if forView is true or lychee.publicMode is true then editTitleHTML = ''
else editTitleHTML = ' ' + build.editIcon('edit_title')
if forView is true or lychee.publicMode is true then editDescriptionHTML = ''
else editDescriptionHTML = ' ' + build.editIcon('edit_description')
infos = [
['', 'Basics']
['Title', data.title + editTitleHTML]
['Uploaded', data.sysdate]
['Description', data.description + editDescriptionHTML]
['', 'Image']
['Size', data.size]
['Format', data.type]
['Resolution', data.width + ' x ' + data.height]
['Tags', build.tags(data.tags, forView)]
]
exifHash = data.takestamp+data.make+data.model+data.shutter+data.aperture+data.focal+data.iso
if exifHash isnt '0' or exifHash isnt '0'
infos = infos.concat [
['', 'Camera']
['Captured', data.takedate]
['Make', data.make]
['Type/Model', data.model]
['Shutter Speed', data.shutter]
['Aperture', data.aperture]
['Focal Length', data.focal]
['ISO', data.iso]
]
infos = infos.concat [
['', 'Share']
['Public', visible]
]
infos.forEach (info, i, items) ->
if info[1] is '' or
not info[1]?
info[1] = '-'
switch info[0]
when ''
# Divider
html += """
</table>
<div class='divider'><h1>#{ info[1] }</h1></div>
<table>
"""
when 'Tags'
# Tags
if forView isnt true and lychee.publicMode is false
html += """
</table>
<div class='divider'><h1>#{ info[0] }</h1></div>
<div id='tags'>#{ info[1] }</div>
"""
else
# Item
html += """
<tr>
<td>#{ info[0] }</td>
<td class='attr_#{ info[0].toLowerCase() }'>#{ info[1] }</td>
</tr>
"""
html += """
</table>
<div class='bumper'></div>
"""
return html
build.infoboxAlbum = (data, forView) ->
html = ""
switch data.public
when '0' then visible = 'No'
when '1' then visible = 'Yes'
else visible = '-'
switch data.password
when false then password = 'No'
when true then password = 'Yes'
else password = '-'
switch data.downloadable
when '0' then downloadable = 'No'
when '1' then downloadable = 'Yes'
else downloadable = '-'
if forView is true or lychee.publicMode is true then editTitleHTML = ''
else editTitleHTML = ' ' + build.editIcon('edit_title_album')
if forView is true or lychee.publicMode is true then editDescriptionHTML = ''
else editDescriptionHTML = ' ' + build.editIcon('edit_description_album')
infos = [
['', 'Basics']
['Title', data.title + editTitleHTML]
['Description', data.description + editDescriptionHTML]
['', 'Album']
['Created', data.sysdate]
['Images', data.num]
['', 'Share']
['Public', visible]
['Downloadable', downloadable]
['Password', password]
]
infos.forEach (info, i, items) ->
if info[0] is ''
# Divider
html += """
</table>
<div class='divider'><h1>#{ info[1] }</h1></div>
<table id='infos'>
"""
else
# Item
html += """
<tr>
<td>#{ info[0] }</td>
<td class='attr_#{ info[0].toLowerCase() }'>#{ info[1] }</td>
</tr>
"""
html += """
</table>
<div class='bumper'></div>
"""
return html

505
src/scripts/build.js Normal file
View File

@ -0,0 +1,505 @@
/**
* @description This module is used to generate HTML-Code.
* @copyright 2014 by Tobias Reich
*/
window.build = {}
build.iconic = function(icon, classes, path) {
var html = '';
path = path || 'src/images/iconic.svg';
classes = classes || '';
html = `
<svg viewBox='0 0 8 8' class='iconic ${ classes }'>
<use xlink:href='${ path }#${ icon }' />
</svg>
`
return html;
}
build.divider = function(title) {
var html = '';
html = `
<div class='divider fadeIn'>
<h1>${ title }</h1>
</div>
`
return html;
}
build.editIcon = function(id) {
var html = '';
html = `<div id='${ id }' class='edit'>${ build.iconic('pencil') }</div>`
return html;
}
build.multiselect = function(top, left) {
var html = '';
html = `<div id='multiselect' style='top: ${ top }px; left: ${ left }px;'></div>`
return html;
}
build.album = function(data) {
if (data===null||data===undefined) return '';
var html = '',
title = data.title,
longTitle = '',
typeThumb = '';
if (title!==null&&title.length>18) {
title = data.title.substr(0, 18) + '...';
longTitle = data.title;
}
if (data.thumb0.split('.').pop()==='svg') typeThumb = 'nonretina';
html = `
<div class='album' data-id='${ data.id }' data-password='${ data.password }'>
<img src='${ data.thumb2 }' width='200' height='200' alt='thumb' data-type='nonretina'>
<img src='${ data.thumb1 }' width='200' height='200' alt='thumb' data-type='nonretina'>
<img src='${ data.thumb0 }' width='200' height='200' alt='thumb' data-type='${ typeThumb }'>
<div class='overlay'>
`
if (data.password&&lychee.publicMode===false) {
html += `
<h1 title='${ longTitle }'>
<span class='icon-lock'></span> ${ title }
</h1>
`
} else {
html += `<h1 title='${ longTitle }'>${ title }</h1>`
}
html += `
<a>${ data.sysdate }</a>
</div>
`
if (lychee.publicMode===false) {
if (data.star==='1') html += `<a class='badge icn-star'>${ build.iconic('star') }</a>`;
if (data.public==='1') html += `<a class='badge icn-share'>${ build.iconic('eye') }</a>`;
if (data.unsorted==='1') html += `<a class='badge'>${ build.iconic('list') }</a>`;
if (data.recent==='1') html += `<a class='badge'>${ build.iconic('clock') }</a>`;
}
html += '</div>'
return html;
}
build.photo = function(data) {
if (data===null||data===undefined) return '';
var html = '',
title = data.title,
longTitle = '';
if (title!==null&&title.length>18) {
title = data.title.substr(0, 18) + '...';
longTitle = data.title;
}
html = `
<div class='photo' data-album-id='${ data.album }' data-id='${ data.id }'>
<img src='${ data.thumbUrl }' width='200' height='200' alt='thumb'>
<div class='overlay'>
<h1 title='${ longTitle }'>${ title }</h1>
`
if (data.cameraDate===1) html += `<a><span class='icon-camera' title='Photo Date'></span>${ data.sysdate }</a>`;
else html += `<a>${ data.sysdate }</a>`;
html += '</div>';
if (data.star==='1')
html += `<a class='badge iconic-star'>${ build.iconic('star') }</a>`;
if (lychee.publicMode===false&&data.public==='1'&&album.json.public!=='1')
html += `<a class='badge iconic-share'>${ build.iconic('eye') }</a>`;
html += '</div>';
return html
}
build.imageview = function(data, size, visibleControls) {
if (data===null||data===undefined) return '';
var html = '';
html = `
<div class='arrow_wrapper arrow_wrapper--previous'><a id='previous'>${ build.iconic('caret-left') }</a></div>
<div class='arrow_wrapper arrow_wrapper--next'><a id='next'>${ build.iconic('caret-right') }</a></div>
`
if (size==='big') {
if (visibleControls===true)
html += `<div id='image' style='background-image: url(${ data.url })'></div>`;
else
html += `<div id='image' style='background-image: url(${ data.url });' class='full'></div>`;
} else if (size==='medium') {
if (visibleControls===true)
html += `<div id='image' style='background-image: url(${ data.medium })'></div>`;
else
html += `<div id='image' style='background-image: url(${ data.medium });' class='full'></div>`;
} else if (size==='small') {
if (visibleControls===true)
html += `<div id='image' class='small' style='background-image: url(${ data.url }); width: ${ data.width }px; height: ${ data.height }px; margin-top: -${ parseInt(data.height/2-20) }px; margin-left: -${ data.width/2 }px;'></div>`;
else
html += `<div id='image' class='small' style='background-image: url(${ data.url }); width: ${ data.width }px; height: ${ data.height }px; margin-top: -${ parseInt(data.height/2) }px; margin-left: -${ data.width/2 }px;'></div>`;
}
return html;
}
build.no_content = function(typ) {
var html;
html = `
<div class='no_content fadeIn'>
<a class='icon icon-${ typ }'></a>
`
switch (typ) {
case 'search': html += '<p>No results</p>';
break;
case 'share': html += '<p>No public albums</p>';
break;
case 'cog': html += '<p>No configuration</p>';
break;
}
html += '</div>';
return html;
}
build.uploadModal = function(title, files) {
var html = '',
i = 0,
file = null;
html = `
<h1>${ title }</h1>
<div class='rows'>
`
while (i<files.length) {
file = files[i];
if (file.name.length>40) file.name = file.name.substr(0, 17) + '...' + file.name.substr(file.name.length-20, 20);
html += `
<div class='row'>
<a class='name'>${ lychee.escapeHTML(file.name) }</a>
`
if (file.supported===true) html += `<a class='status'></a>`;
else html += `<a class='status error'>Not supported</a>`;
html += `
<p class='notice'></p>
</div>
`
i++;
}
html += '</div>';
return html;
}
build.tags = function(tags, forView) {
var html = '',
editTagsHTML = '';
if (forView!==true&&lychee.publicMode!==true) editTagsHTML = ' ' + build.editIcon('edit_tags');
if (tags!=='') {
tags = tags.split(',');
tags.forEach(function(tag, index, array) {
html += `<a class='tag'>${ tag }<span class='icon-remove' data-index='${ index }'></span></a>`
});
html += editTagsHTML;
} else {
html = `<div class='empty'>No Tags${ editTagsHTML }</div>`;
}
return html;
}
build.infoboxPhoto = function(data, forView) {
var html = '',
visible = '',
editTitleHTML = '',
editDescriptionHTML = '',
exifHash = '',
info = [];
switch (data.public) {
case '0': visible = 'No';
break;
case '1': visible = 'Yes';
break;
case '2': visible = 'Yes (Album)';
break;
default: visible = '-';
break;
}
if (forView!==true&&lychee.publicMode!==true) {
editTitleHTML = ' ' + build.editIcon('edit_title');
editDescriptionHTML = ' ' + build.editIcon('edit_description');
}
infos = [
['', 'Basics'],
['Title', data.title + editTitleHTML],
['Uploaded', data.sysdate],
['Description', data.description + editDescriptionHTML],
['', 'Image'],
['Size', data.size],
['Format', data.type],
['Resolution', data.width + ' x ' + data.height],
['Tags', build.tags(data.tags, forView)]
]
exifHash = data.takestamp+data.make+data.model+data.shutter+data.aperture+data.focal+data.iso;
if (exifHash!=='0') {
infos = infos.concat([
['', 'Camera'],
['Captured', data.takedate],
['Make', data.make],
['Type/Model', data.model],
['Shutter Speed', data.shutter],
['Aperture', data.aperture],
['Focal Length', data.focal],
['ISO', data.iso]
]);
}
infos = infos.concat([
['', 'Share'],
['Public', visible]
]);
infos.forEach(function(info, i, items) {
if (info[1]===''||info[1]===null||info[1]===undefined) info[1] = '-';
switch (info[0]) {
case '':
// Divider
html += `
</table>
<div class='divider'>
<h1>${ info[1] }</h1>
</div>
<table>
`
break;
case 'Tags':
// Tags
if (forView!==true&&lychee.publicMode===false) {
html += `
</table>
<div class='divider'>
<h1>${ info[0] }</h1>
</div>
<div id='tags'>${ info[1] }</div>
`
}
break;
default:
// Item
html += `
<tr>
<td>${ info[0] }</td>
<td class='attr_${ info[0].toLowerCase() }'>${ info[1] }</td>
</tr>
`
break;
}
});
html += `
</table>
<div class='bumper'></div>
`
return html;
}
build.infoboxAlbum = function(data, forView) {
var html = '',
visible = '',
password = '',
downloadable = '',
editTitleHTML = '',
editDescriptionHTML = '',
infos = [];
switch (data.public) {
case '0': visible = 'No';
break;
case '1': visible = 'Yes';
break;
default: visible = '-';
break;
}
switch (data.password) {
case false: password = 'No';
break;
case true: password = 'Yes';
break;
default: password = '-';
break;
}
switch (data.downloadable) {
case '0': downloadable = 'No';
break;
case '1': downloadable = 'Yes';
break;
default: downloadable = '-';
break;
}
if (forView!==true&&lychee.publicMode!==true) {
editTitleHTML = ' ' + build.editIcon('edit_title_album');
editDescriptionHTML = ' ' + build.editIcon('edit_description_album');
}
infos = [
['', 'Basics'],
['Title', data.title + editTitleHTML],
['Description', data.description + editDescriptionHTML],
['', 'Album'],
['Created', data.sysdate],
['Images', data.num],
['', 'Share'],
['Public', visible],
['Downloadable', downloadable],
['Password', password]
]
infos.forEach(function(info, i, items) {
if (info[0]==='') {
// Divider
html += `
</table>
<div class='divider'>
<h1>${ info[1] }</h1>
</div>
<table id='infos'>
`
} else {
// Item
html += `
<tr>
<td>${ info[0] }</td>
<td class='attr_${ info[0].toLowerCase() }'>${ info[1] }</td>
</tr>
`
}
});
html += `
</table>
<div class='bumper'></div>
`
return html;
}