").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r
-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);
/* Timer */
jQuery.timer = function(time,func,callback){
var a = {timer:setTimeout(func,time),callback:null}
@@ -19,6 +17,7 @@ this[d](i,k)[d](e,f)}return this};c.fn.tipsy.defaults={className:null,delayIn:0,
};c.fn.tipsy.autoBounds=function(e,d){return function(){var f={ns:d[0],ew:(d.length>1?d[1]:false)},i=c(document).scrollTop()+e,g=c(document).scrollLeft()+e,h=c(this);if(h.offset().top Make Private", "setPhotoPublic()"],
[" Twitter", "loadSharePhoto(0, " + photoID + ")"],
@@ -327,7 +329,7 @@ function showContextMenuShare(photoID, mouse_x, mouse_y) {
[" Copy Link", "loadSharePhoto(5, " + photoID + ")"],
[" Copy Shortlink", "loadSharePhoto(6, " + photoID + ")"]
];
-
+
closeContextMenu();
$("body").css("overflow", "hidden");
$(".photo[data-id='" + photoID + "']").addClass("active");
@@ -336,7 +338,7 @@ function showContextMenuShare(photoID, mouse_x, mouse_y) {
"top": mouse_y,
"left": mouse_x
});
-
+
}
function closeContextMenu() {
$(".contextmenu_bg, .contextmenu").remove();
@@ -393,7 +395,7 @@ function isPhotoSmall(photo) {
if (photo.width<$(window).width()-60) size["width"] = true;
if (photo.height<$(window).height()-100) size["height"] = true;
-
+
if (size["width"]&&size["height"]) return true;
else return false;
@@ -407,9 +409,9 @@ function isPhotoSmall(photo) {
function key(e) {
code = (e.keyCode ? e.keyCode : e.which);
-
+
if (code==13||code==37||code==39||code==32||code==27) e.preventDefault();
-
+
if (code==13&&$(".message .button.active").length) $(".message .button.active").addClass("pressed").click();
if (code==37&&visibleImageview()) loadPreviousPhoto();
if (code==39&&visibleImageview()) loadNextPhoto();
@@ -483,13 +485,13 @@ function renameAlbum() {
function renamePhoto(photoID) {
if (photoID==undefined) {
-
+
// Function called from ImageViewer
oldTitle = headerTitle.html();
photoID = image_view.attr("data-id");
-
+
} else oldTitle = "";
-
+
newTitle = prompt("Please enter a new title for this photo:", oldTitle);
if (photoID!=null&&photoID!=undefined&&newTitle.length<31) {
@@ -518,15 +520,15 @@ function loadAlbums() {
loadingFadeIn("loading");
$(".album, .photo").removeClass("contentZoomIn").addClass("contentZoomOut");
-
+
startTime = new Date().getTime();
params = "function=getAlbums";
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
-
+
durationTime = (new Date().getTime() - startTime);
if (durationTime>300) waitTime = 0; else waitTime = 300 - durationTime;
-
+
$.timer(waitTime,function(){
$("#tools_album, #tools_photo").hide();
@@ -561,16 +563,16 @@ function loadAlbums() {
albums = "";
$.each(data, function() { albums += buildAlbum(this); });
content.append(buildDivider("Albums") + albums);
-
+
$(".album, .photo").removeClass("contentZoomOut").addClass("contentZoomIn");
-
+
}
document.title = "Lychee";
headerTitle.html("Albums").removeClass("editable");
loadSmartAlbums();
-
+
});
}, error: ajaxError });
@@ -581,24 +583,24 @@ function loadSmartAlbums() {
params = "function=getSmartInfo";
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
-
+
$(".album[data-id='0'] img:nth-child(1)").attr("src", data.unsortThumb2);
$(".album[data-id='0'] img:nth-child(2)").attr("src", data.unsortThumb1);
$(".album[data-id='0'] img:nth-child(3)").attr("src", data.unsortThumb0);
$(".album[data-id='0'] .overlay a").html(data.unsortNum + " photos");
-
+
$(".album[data-id='s'] img:nth-child(1)").attr("src", data.publicThumb2);
$(".album[data-id='s'] img:nth-child(2)").attr("src", data.publicThumb1);
$(".album[data-id='s'] img:nth-child(3)").attr("src", data.publicThumb0);
$(".album[data-id='s'] .overlay a").html(data.publicNum + " photos");
-
+
$(".album[data-id='f'] img:nth-child(1)").attr("src", data.starredThumb2);
$(".album[data-id='f'] img:nth-child(2)").attr("src", data.starredThumb1);
$(".album[data-id='f'] img:nth-child(3)").attr("src", data.starredThumb0);
$(".album[data-id='f'] .overlay a").html(data.starredNum + " photos");
-
+
loadingFadeOut();
-
+
}, error: ajaxError });
}
@@ -613,15 +615,15 @@ function loadPhotos(albumID, refresh) {
$(".album, .photo").removeClass("contentZoomIn").addClass("contentZoomOut");
$(".divider").removeClass("fadeIn").addClass("fadeOut");
}
-
+
startTime = new Date().getTime();
-
+
params = "function=getPhotos&albumID=" + albumID;
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
-
+
durationTime = (new Date().getTime() - startTime);
if (durationTime>300) waitTime = 0; else if (refresh) waitTime = 0; else waitTime = 300 - durationTime;
-
+
$.timer(waitTime,function(){
content.attr("data-id", albumID);
@@ -639,7 +641,7 @@ function loadPhotos(albumID, refresh) {
loadAlbumInfo(albumID);
}
-
+
});
}, error: ajaxError });
@@ -649,10 +651,10 @@ function loadPhotos(albumID, refresh) {
function loadAlbumInfo(albumID) {
if (albumID=="f"||albumID=="s"||albumID==0) {
-
+
params = "function=getSmartInfo";
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
-
+
switch (albumID) {
case "f":
document.title = "Lychee - Starred";
@@ -662,7 +664,7 @@ function loadAlbumInfo(albumID) {
case "s":
document.title = "Lychee - Public";
headerTitle.html("Public - " + data.publicNum + " photos");
- $("#button_edit_album, #button_trash_album .button_divider").hide();
+ $("#button_edit_album, #button_trash_album, .button_divider").hide();
break;
case "0":
document.title = "Lychee - Unsorted";
@@ -671,27 +673,27 @@ function loadAlbumInfo(albumID) {
$("#button_trash_album, .button_divider").show();
break;
}
-
+
loadingFadeOut();
-
+
}, error: ajaxError });
-
+
} else {
-
+
params = "function=getAlbumInfo&albumID=" + albumID;
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
-
+
$("#button_edit_album, #button_trash_album, .button_divider").show();
-
+
if (!data.title) data.title = "Untitled";
document.title = "Lychee - " + data.title;
headerTitle.html(data.title + " - " + data.num + " photos").addClass("editable");
-
+
loadingFadeOut();
-
+
}, error: ajaxError });
-
- }
+
+ }
}
@@ -730,13 +732,13 @@ function loadPhotoInfo(photoID) {
else if (isPhotoSmall(data)) image_view.html("").append("");
else image_view.html("").append("");
image_view.removeClass("fadeOut").addClass("fadeIn").show();
-
+
if (!visibleControls()) hideControls(true);
-
+
infobox.html(buildInfobox(data)).show();
-
+
$.timer(300,function(){ content.show(); });
-
+
loadingFadeOut();
}, error: ajaxError });
@@ -801,12 +803,12 @@ function setPhotoPublic(e) {
}
function setPhotoDescription() {
-
+
description = prompt("Please enter a description for this photo:", "");
photoID = image_view.attr("data-id");
-
+
if (description.length>0&&description.length<160) {
-
+
loadingFadeIn("loading");
params = "function=setPhotoDescription&photoID=" + photoID + "&description=" + escape(description);
@@ -859,7 +861,7 @@ function loadSharePhoto(service, photoID) {
params = "function=sharePhoto&photoID=" + photoID + "&url=" + getViewLink(photoID);
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
-
+
switch (service) {
case 0:
link = data.twitter;
@@ -898,7 +900,7 @@ function loadSharePhoto(service, photoID) {
location.href = link;
loadingFadeOut();
} else loadingFadeIn("error");
-
+
}, error: ajaxError });
}
@@ -937,12 +939,12 @@ function loadPreviousPhoto() {
albumID = content.attr("data-id");
photoID = image_view.attr("data-id");
-
+
params = "function=previousPhoto&photoID=" + photoID + "&albumID=" + albumID;
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
-
+
if (data!=false) setURL("a" + albumID + "p" + data.id);
-
+
}, error: ajaxError });
}
@@ -951,7 +953,7 @@ function loadNextPhoto() {
albumID = content.attr("data-id");
photoID = image_view.attr("data-id");
-
+
params = "function=nextPhoto&photoID=" + photoID + "&albumID=" + albumID;
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
@@ -977,19 +979,19 @@ function search(term) {
clearTimeout($(window).data("timeout"));
$(window).data("timeout", setTimeout(function() {
-
+
if ($("#search").val().length<=2) {
-
+
$(".divider").removeClass("fadeIn").addClass("fadeOut");
loadAlbums();
-
+
} else {
-
+
$(".album, .photo").removeClass("contentZoomIn").addClass("contentZoomOut");
$(".divider").removeClass("fadeIn").addClass("fadeOut");
-
+
startTime = new Date().getTime();
-
+
params = "function=search&term=" + term;
$.ajax({type: "POST", url: api_path, data: params, dataType: "json", success: function(data) {
console.log(data);
@@ -998,12 +1000,12 @@ function search(term) {
photos = "";
if (data.photos!=undefined&&data.photos!=null) $.each(data.photos, function() { photos += buildPhoto(this); });
-
+
durationTime = (new Date().getTime() - startTime);
if (durationTime>300) waitTime = 0; else waitTime = 300 - durationTime;
-
+
$.timer(waitTime,function(){
-
+
if (albums==""&&photos=="") code = "";
else if (albums=="") code = buildDivider("Photos")+photos;
else if (photos=="") code = buildDivider("Albums")+albums;
@@ -1012,13 +1014,13 @@ function search(term) {
content.html("").append(code);
$(".album, .photo").removeClass("contentZoomOut").addClass("contentZoomIn");
-
+
});
-
+
}, error: ajaxError });
-
+
}
-
+
}, 250));
}
diff --git a/js/main.js b/js/main.js
index 690a421..8d96d1a 100755
--- a/js/main.js
+++ b/js/main.js
@@ -12,70 +12,74 @@ var header = $("header"),
loading = $("#loading"),
infobox = $("#infobox"),
api_path = "php/api.php",
- version = "1.0.1";
+ version = "1.0.2";
$(document).ready(function(){
+ /* Event Name */
+ if (mobileBrowser()) event_name = "touchend";
+ else event_name = "click";
+
/* Login */
$("#password").live("keyup", function() {
if ($(this).val().length>0) $(this).removeClass("error");
});
/* Add Dialog */
- $(".button_add").live("click", function() { $("body").append(buildAddModal) });
- $("#add_album").live("click", addAlbum);
- $("#add_photo").live("click", function() { $("#auswahl").html(""); $("#upload_files").click() });
+ $(".button_add").live(event_name, function() { $("body").append(buildAddModal) });
+ $("#add_album").live(event_name, addAlbum);
+ $("#add_photo").live(event_name, function() { $("#auswahl").html(""); $("#upload_files").click() });
/* Toolbar Buttons */
- $("#button_signout").live("click", function() {
+ $("#button_signout").live(event_name, function() {
modal = buildModal("Sign Out", "Are you sure you want to leave and log out?", ["Sign out", "Stay here"], ["logout();", ""]);
$("body").append(modal);
});
- $("#button_download").live("click", function() {
+ $("#button_download").live(event_name, function() {
link = $("#image_view #image").css("background-image").replace(/"/g,"").replace(/url\(|\)$/ig, "");
window.open(link,"_newtab");
});
- $("#button_move").live("click", function(e) {
+ $("#button_move").live(event_name, function(e) {
showContextMenuMove(image_view.attr("data-id"), e.pageX, e.pageY);
});
- $("#button_trash_album").live("click", function() {
+ $("#button_trash_album").live(event_name, function() {
if (content.attr("data-id")=="0") deleteUnsorted();
else deleteAlbum();
});
- $("#button_trash").live("click", function() { deletePhoto() });
- $("#button_edit_album").live("click", function() { renameAlbum() });
- $("#button_edit").live("click", function() { renamePhoto() });
- $("#button_info").live("click", function() { showInfobox() });
- $("#button_archive").live("click", function() { getAlbumArchive() });
- $("#button_sync").live("click", function() { syncFolder() });
+ $("#button_trash").live(event_name, function() { deletePhoto() });
+ $("#button_edit_album").live(event_name, function() { renameAlbum() });
+ $("#button_edit").live(event_name, function() { renamePhoto() });
+ $("#button_info").live(event_name, function() { showInfobox() });
+ $("#button_archive").live(event_name, function() { getAlbumArchive() });
+ $("#button_sync").live(event_name, function() { syncFolder() });
/* Rename Album/Photo via Titlebar */
- $("#title.editable").live("click", function() {
+ $("#title.editable").live(event_name, function() {
if (visibleImageview()) renamePhoto(); else renameAlbum();
});
-
+
/* Context Menu */
$(".photo").live("contextmenu", function(e) {
e.preventDefault();
showContextMenuPhoto($(this).attr("data-id"), e.pageX, e.pageY);
});
- $(".contextmenu_bg").live("click", closeContextMenu);
+ $(".contextmenu_bg").live(event_name, closeContextMenu);
/* Star/Share Photo */
- $("#button_star").live("click", setPhotoStar);
- $("#button_share").live("click", function(e) {
+ $("#button_star").live(event_name, setPhotoStar);
+ $("#button_share").live(event_name, function(e) {
if ($("#button_share a.active").length) showContextMenuShare(image_view.attr("data-id"), e.pageX, e.pageY);
else setPhotoPublic(e);
});
- $(".copylink").live("click", function() { $(this).select() });
-
+ $(".copylink").live(event_name, function() { $(this).select() });
+
/* Upload */
$("#upload_files").live("change", function() {
closeModal();
handleFiles(this.files);
$("#upload_button").click();
});
-
+
/* Search */
$("#search").live("keyup", function() { search($(this).val()) });
@@ -84,32 +88,32 @@ $(document).ready(function(){
$(".photo").live("click", function() { setURL("a" + content.attr("data-id") + "p" + $(this).attr("data-id")) });
/* Nav Back */
- $("#button_back_home").live("click", function() { setURL("") });
- $("#button_back").live("click", function() { setURL("a" + content.attr("data-id")) });
+ $("#button_back_home").live(event_name, function() { setURL("") });
+ $("#button_back").live(event_name, function() { setURL("a" + content.attr("data-id")) });
/* Close Modal */
- $(".message a.close").live("click", closeModal);
+ $(".message a.close").live(event_name, closeModal);
/* Image View */
- $("#image_view a#previous").live("click", loadPreviousPhoto);
- $("#image_view a#next").live("click", loadNextPhoto);
-
+ $("#image_view a#previous").live(event_name, loadPreviousPhoto);
+ $("#image_view a#next").live(event_name, loadNextPhoto);
+
/* Infobox */
- $("#infobox_overlay, #infobox .header a").live("click", function() { hideInfobox() });
- $("#edit_description").live("click", function() { setPhotoDescription() });
-
+ $("#infobox_overlay, #infobox .header a").live(event_name, function() { hideInfobox() });
+ $("#edit_description").live(event_name, function() { setPhotoDescription() });
+
/* Window */
$(window).keydown(key);
$(window).bind("popstate", getURL);
$(window).bind("mouseleave", hideControls);
$(window).bind("mouseenter", showControls);
-
+
/* Init */
- if ((BrowserDetect.browser=="Explorer")||(BrowserDetect.browser=="Safari"&&BrowserDetect.version<5)||(BrowserDetect.browser=="Chrome"&&BrowserDetect.version<18)||(BrowserDetect.browser=="Firefox"&&BrowserDetect.version<14)) {
-
+ if ((BrowserDetect.browser=="Explorer")||(BrowserDetect.browser=="Safari"&&BrowserDetect.version<5)||(BrowserDetect.browser=="Chrome"&&BrowserDetect.version<18)||(BrowserDetect.browser=="Firefox"&&BrowserDetect.version<15)) {
+
modal = buildModal("Browser not supported", "You are currently using an outdated or unsupported Browser. This site might not work properly. Please consider to update your Browser!", ["Leave"], ["location.href = 'http://browsehappy.com';"]);
$("body").append(modal);
-
+
} else init();
-
+
});
\ No newline at end of file
diff --git a/js/upload.js b/js/upload.js
old mode 100644
new mode 100755
index c75cc65..7266721
--- a/js/upload.js
+++ b/js/upload.js
@@ -16,23 +16,23 @@ function handleFiles(files) {
var fileList = files;
for(i = 0; i < fileList.length; i++) {
- var img = document.createElement("img");
+ var img = document.createElement("img");
img.height = 0;
img.file = fileList[i];
img.name = 'pic_'+ i;
img.classList.add("obj");
- auswahl_div.appendChild(img);
+ auswahl_div.appendChild(img);
}
-
+
}
function sendFiles(){
imgs = document.querySelectorAll(".obj");
-
+
$(".upload_overlay").remove();
$("body").append(buildUploadModal());
-
+
global_progress = new Array();
last_final_progress = 0;
@@ -40,38 +40,38 @@ function sendFiles(){
global_progress[i] = 0;
new FileUpload(i, imgs[i], imgs[i].file);
}
-
+
}
function changeProgress(i, progress) {
global_progress[i] = progress;
final_progress = 0;
-
+
for(i = 0; i < global_progress.length; i++) {
final_progress += global_progress[i];
}
-
+
if (Math.round(final_progress/document.querySelectorAll(".obj").length)%2==0&&Math.round(last_final_progress/document.querySelectorAll(".obj").length)=100) {
-
+
$(".progressbar div").css("width", "100%");
-
+
$.timer(1000,function(){
-
+
$(".upload_overlay").removeClass("fadeIn").css("opacity", 0);
$.timer(300,function(){ $(".upload_overlay").remove() });
-
+
if (content.attr("data-id")=="") setURL("a0");
else loadPhotos(content.attr("data-id"));
-
+
});
-
+
}
}
@@ -82,7 +82,7 @@ function FileUpload(i, img, file) {
xhr = new XMLHttpRequest(),
fd = new FormData,
percent = 0;
-
+
this.xhr = xhr;
this.xhr.upload.addEventListener("progress", function(e) {
@@ -94,9 +94,9 @@ function FileUpload(i, img, file) {
fd.append("function", "upload");
if (content.attr("data-id")=="") fd.append("albumID", 0);
else fd.append("albumID", content.attr("data-id"));
-
+
xhr.open("POST", "php/api.php", true);
xhr.overrideMimeType('text/plain; charset=x-user-defined-binary');
xhr.send(fd);
-
+
}
\ No newline at end of file
diff --git a/js/view.js b/js/view.js
index c3d9112..0d13c48 100755
--- a/js/view.js
+++ b/js/view.js
@@ -10,7 +10,7 @@ var header = $("header"),
image_view = $("#image_view"),
api_path = "php/api.php",
infobox = $("#infobox");
-
+
$(document).ready(function(){
/* Window */
@@ -25,9 +25,9 @@ $(document).ready(function(){
link = $("#image_view #image").css("background-image").replace(/"/g,"").replace(/url\(|\)$/ig, "");
window.open(link,"_newtab");
});
-
+
loadPhotoInfo(gup("p"));
-
+
});
function key(e) {
@@ -41,7 +41,7 @@ function visibleInfobox() {
if (parseInt(infobox.css("right").replace("px", ""))<0) return false;
else return true;
-
+
}
function isPhotoSmall(photo) {
@@ -53,7 +53,7 @@ function isPhotoSmall(photo) {
if (photo.width<$(window).width()-60) size["width"] = true;
if (photo.height<$(window).height()-100) size["height"] = true;
-
+
if (size["width"]&&size["height"]) return true;
else return false;
@@ -63,14 +63,14 @@ function showInfobox() {
$("body").append("");
infobox.css("right", "0px");
-
+
}
function hideInfobox() {
$("#infobox_overlay").remove();
infobox.css("right", "-320px");
-
+
}
function loadPhotoInfo(photoID) {
@@ -86,7 +86,7 @@ function loadPhotoInfo(photoID) {
if (isPhotoSmall(data)) image_view.html("").append("");
else image_view.html("").append("");
image_view.removeClass("fadeOut").addClass("fadeIn").show();
-
+
infobox.html(buildInfobox(data)).show();
}, error: ajaxError });
@@ -98,5 +98,5 @@ function ajaxError(jqXHR, textStatus, errorThrown) {
console.log(jqXHR);
console.log(textStatus);
console.log(errorThrown);
-
+
}
\ No newline at end of file
diff --git a/php/api.php b/php/api.php
old mode 100644
new mode 100755
index 4ee1cae..ab5493d
--- a/php/api.php
+++ b/php/api.php
@@ -1,10 +1,10 @@
-".$exif['DateTimeOriginal'];
-
+
// Camera Information
if(isset($exif['ISOSpeedRatings'])){$return['iso']="ISO-".$exif['ISOSpeedRatings'];}
if(isset($exif['COMPUTED']['ApertureFNumber'])){$return['aperture']=$exif['COMPUTED']['ApertureFNumber'];}
@@ -274,7 +274,7 @@ function getSmartInfo() {
$i++;
}
$return['unsortNum'] = $i;
-
+
$query2 = "SELECT * FROM photos WHERE public = 1 ORDER BY id DESC;";
$result2 = mysql_query($query2);
$i = 0;
@@ -283,7 +283,7 @@ function getSmartInfo() {
$i++;
}
$return['publicNum'] = $i;
-
+
$query3 = "SELECT * FROM photos WHERE star = 1 ORDER BY id DESC;";
$result3 = mysql_query($query3);
$i = 0;
@@ -293,7 +293,7 @@ function getSmartInfo() {
}
$return['starredNum'] = $i;
return $return;
-
+
}
function getAlbumInfo($albumID) {
$return = array();
@@ -365,26 +365,26 @@ function getAlbumArchive($albumID) {
$row = mysql_fetch_object($result);
if($albumID!=0&&is_numeric($albumID))$zipTitle = $row->title;
$filename = "./".$zipTitle.".zip";
-
+
$zip = new ZipArchive();
-
+
if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) {
return false;
}
-
+
foreach($files AS $zipFile) {
$newFile = explode("/",$zipFile);
$newFile = array_reverse($newFile);
$zip->addFile($zipFile, $zipTitle."/".$newFile[0]);
}
-
+
$zip->close();
-
+
header("Content-Type: application/zip");
header("Content-Disposition: attachment; filename=\"$zipTitle.zip\"");
readfile($filename);
unlink($filename);
-
+
return true;
}
@@ -417,15 +417,15 @@ function downloadPhoto($photoID) {
$query = "SELECT * FROM photos WHERE id = '$photoID';";
$result = mysql_query($query);
$row = mysql_fetch_object($result);
-
+
$photo = "../".$row->url;
$title = $row->title;
$type = "appcication/zip";
$filename = "./imageDownload.zip";
-
+
$zip = new ZipArchive();
if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) return false;
-
+
$newFile = explode("/",$photo);
$newFile = array_reverse($newFile);
$zip->addFile($photo, $title.$newFile[0]);
@@ -454,7 +454,7 @@ function setPhotoPublic($photoID, $url) {
$shortlink = "";
}else{
if($row->shortlink==""){
- $shortlink = urlShortner($url);
+ $shortlink = urlShortner($url);
}else{
$shortlink = $row->shortlink;
}
@@ -497,7 +497,7 @@ function nextPhoto($photoID, $albumID) {
$result = mysql_query($query);
$return = mysql_fetch_array($result);
}
- return $return;
+ return $return;
}
function previousPhoto($photoID, $albumID) {
switch($albumID) {
@@ -564,9 +564,9 @@ function urlShortner($url) {
if($bitlyUsername==""||$bitlyApi=="") return false;
$url = urlencode($url);
$bitlyAPI = "http://api.bit.ly/shorten?version=2.0.1&format=xml&longUrl=$url&login=$bitlyUsername&apiKey=$bitlyApi";
-
+
$data = file_get_contents($bitlyAPI);
-
+
$xml = simplexml_load_string($data);
$shortlink = $xml->results->nodeKeyVal->shortUrl;
return $shortlink;
@@ -575,18 +575,18 @@ function sharePhoto($photoID, $url) {
$query = "SELECT * FROM photos WHERE id = '$photoID'";
$result = mysql_query($query);
$row = mysql_fetch_object($result);
-
+
$thumb = "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']."/../../".$row->thumbUrl;
$title = $row->title;
$description = $row->description;
$shortlink = $row->shortlink;
-
+
$twitterUrl = "https://twitter.com/share?url=".urlencode("$url");
$facebookUrl = "http://www.facebook.com/sharer.php?u=".urlencode("$url")."&t=".urlencode($title);
$tumblrUrl = "http://www.tumblr.com/share/link?url=".urlencode("$url")."&name=". urlencode($title)."&description=".urlencode($description);
$pinterestUrl = "http://pinterest.com/pin/create/button/?url=".urlencode("$url")."&media=".urlencode($thumb);
$mailUrl = "mailto:?subject=".rawurlencode($title)."&body=".rawurlencode("Hey guy! Check this out: $url");
-
+
$share = array();
$share['twitter'] = $twitterUrl;
$share['facebook'] = $facebookUrl;
@@ -594,7 +594,7 @@ function sharePhoto($photoID, $url) {
$share['pinterest'] = $pinterestUrl;
$share['mail'] = $mailUrl;
$share['shortlink'] = $shortlink;
-
+
return $share;
}
function facebookHeader($photoID) {
@@ -603,14 +603,14 @@ function facebookHeader($photoID) {
$query = "SELECT * FROM photos WHERE id = '$photoID';";
$result = mysql_query($query);
$row = mysql_fetch_object($result);
-
+
$parseUrl = parse_url("http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
$thumb = $parseUrl['scheme']."://".$parseUrl['host'].$parseUrl['path']."/../".$row->thumbUrl;
-
+
$return = '';
$return .= '';
$return .= '';
-
+
return $return;
}
function isPhotoPublic($photoID) {
@@ -624,19 +624,19 @@ function isPhotoPublic($photoID) {
// Search Function
function search($term) {
$term = mysql_real_escape_string($term);
-
+
$query = "SELECT * FROM photos WHERE title like '%$term%' OR description like '%$term%';";
$result = mysql_query($query);
while($row = mysql_fetch_array($result)) {
$return['photos'][] = $row;
}
-
+
$query = "SELECT * FROM albums WHERE title like '%$term%';";
$result = mysql_query($query);
$i=0;
while($row = mysql_fetch_array($result)) {
$return['albums'][$i] = $row;
-
+
$query = "SELECT thumbUrl FROM photos WHERE album = '".$row['id']."' ORDER BY id DESC LIMIT 0, 3;";
$result2 = mysql_query($query);
$k = 0;
@@ -644,7 +644,7 @@ function search($term) {
$return['albums'][$i]["thumb$k"] = $row2->thumbUrl;
$k++;
}
-
+
}
return $return;
}
diff --git a/readme.md b/readme.md
index 8693bc8..046f871 100755
--- a/readme.md
+++ b/readme.md
@@ -2,8 +2,8 @@
#### A great looking and easy-to-use Photo-Management-System.
-
-
+
+
Lychee is a free, easy to use and great looking photo-management-system you can run on your server to manage and share photos. Just download the source and follow the instructions to install Lychee wherever you want.
diff --git a/uploads/big/empty.md b/uploads/big/empty.md
new file mode 100755
index 0000000..e69de29
diff --git a/uploads/thumb/empty.md b/uploads/thumb/empty.md
new file mode 100755
index 0000000..e69de29
diff --git a/view.php b/view.php
old mode 100644
new mode 100755
index 0ca6f7a..4c57cbe
--- a/view.php
+++ b/view.php
@@ -16,17 +16,17 @@
-
+
-
+
-
+
-
+
-
+
-
+