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

Fixed indention #245

Browse Source
This commit is contained in:
Tobias Reich 2014-11-19 23:40:47 +01:00
parent aad919c96f
commit 8624b38171
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/scripts/photo.js
View File

@ -5,8 +5,8 @@
photo = {} photo = {}
photo.json = null; photo.json = null;
photo.cache = null; photo.cache = null;
photo.getID = function() { photo.getID = function() {
@ -175,24 +175,24 @@ photo.delete = function(photoIDs) {
if (photoIDs.length===1) { if (photoIDs.length===1) {
// Get title if only one photo is selected // Get title if only one photo is selected
if (visible.photo()) photoTitle = photo.json.title; if (visible.photo()) photoTitle = photo.json.title;
else photoTitle = album.json.content[photoIDs].title; else photoTitle = album.json.content[photoIDs].title;
if (photoTitle==='') photoTitle = 'Untitled'; if (photoTitle==='') photoTitle = 'Untitled';
} }
buttons = [ buttons = [
['', function() { ['', function() {
var nextPhoto = '', var nextPhoto = '',
previousPhoto = ''; previousPhoto = '';
photoIDs.forEach(function(id, index, array) { photoIDs.forEach(function(id, index, array) {
// Change reference for the next and previous photo // Change reference for the next and previous photo
if (album.json.content[id].nextPhoto!==''||album.json.content[id].previousPhoto!=='') { if (album.json.content[id].nextPhoto!==''||album.json.content[id].previousPhoto!=='') {
nextPhoto = album.json.content[id].nextPhoto; nextPhoto = album.json.content[id].nextPhoto;
previousPhoto = album.json.content[id].previousPhoto; previousPhoto = album.json.content[id].previousPhoto;
album.json.content[previousPhoto].nextPhoto = nextPhoto; album.json.content[previousPhoto].nextPhoto = nextPhoto;
album.json.content[nextPhoto].previousPhoto = previousPhoto; album.json.content[nextPhoto].previousPhoto = previousPhoto;
@ -252,8 +252,8 @@ photo.setTitle = function(photoIDs) {
if (photoIDs.length===1) { if (photoIDs.length===1) {
// Get old title if only one photo is selected // Get old title if only one photo is selected
if (photo.json) oldTitle = photo.json.title; if (photo.json) oldTitle = photo.json.title;
else if (album.json) oldTitle = album.json.content[photoIDs].title; else if (album.json) oldTitle = album.json.content[photoIDs].title;
oldTitle = oldTitle.replace("'", '''); oldTitle = oldTitle.replace("'", ''');
} }
@ -307,8 +307,8 @@ photo.setAlbum = function(photoIDs, albumID) {
// Change reference for the next and previous photo // Change reference for the next and previous photo
if (album.json.content[id].nextPhoto!==''||album.json.content[id].previousPhoto!=='') { if (album.json.content[id].nextPhoto!==''||album.json.content[id].previousPhoto!=='') {
nextPhoto = album.json.content[id].nextPhoto; nextPhoto = album.json.content[id].nextPhoto;
previousPhoto = album.json.content[id].previousPhoto; previousPhoto = album.json.content[id].previousPhoto;
album.json.content[previousPhoto].nextPhoto = nextPhoto; album.json.content[previousPhoto].nextPhoto = nextPhoto;
album.json.content[nextPhoto].previousPhoto = previousPhoto; album.json.content[nextPhoto].previousPhoto = previousPhoto;
@ -428,8 +428,8 @@ photo.setDescription = function(photoID) {
photo.editTags = function(photoIDs) { photo.editTags = function(photoIDs) {
var oldTags = '', var oldTags = '',
tags = '', tags = '',
buttons; buttons;
if (!photoIDs) return false; if (!photoIDs) return false;
@ -514,9 +514,9 @@ photo.deleteTag = function(photoID, index) {
photo.share = function(photoID, service) { photo.share = function(photoID, service) {
var link = '', var link = '',
url = photo.getViewLink(photoID), url = photo.getViewLink(photoID),
filename = 'unknown'; filename = 'unknown';
switch (service) { switch (service) {
case 0: case 0:
@ -548,10 +548,10 @@ photo.getSize = function() {
// Size can be 'big', 'medium' or 'small' // Size can be 'big', 'medium' or 'small'
// Default is big // Default is big
// Small is centered in the middle of the screen // Small is centered in the middle of the screen
var size = 'big', var size = 'big',
scaled = false, scaled = false,
hasMedium = photo.json.medium!=='', hasMedium = photo.json.medium!=='',
pixelRatio = window.devicePixelRatio, pixelRatio = window.devicePixelRatio,
view = { view = {
width: $(window).width()-60, width: $(window).width()-60,
height: $(window).height()-100 height: $(window).height()-100
@ -564,8 +564,8 @@ photo.getSize = function() {
// Calculate pixel ratio of screen // Calculate pixel ratio of screen
if (pixelRatio!==undefined&&pixelRatio>1) { if (pixelRatio!==undefined&&pixelRatio>1) {
view.width = view.width * pixelRatio; view.width = view.width * pixelRatio;
view.height = view.height * pixelRatio; view.height = view.height * pixelRatio;
} }
// Medium available and // Medium available and