diff options
| author | pepperpepperpepper <pepper@scannerjammer.com> | 2015-11-27 23:54:26 -0800 |
|---|---|---|
| committer | pepperpepperpepper <pepper@scannerjammer.com> | 2015-11-27 23:54:26 -0800 |
| commit | 4fd71a291f52267e435ecaebe6b0c4f97c918883 (patch) | |
| tree | cc01bd840701166e86029a89758d3b1988c45307 /share | |
| parent | 11a45143e555fbb5e651f5538a82d046661882a4 (diff) | |
great, rewrote gallery
Diffstat (limited to 'share')
| -rw-r--r-- | share/frontend/gallery-static/alternate.css (renamed from share/frontend/gallery/alternate.css) | 0 | ||||
| -rwxr-xr-x | share/frontend/gallery-static/gallery_style.css (renamed from share/frontend/gallery/gallery_style.css) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/ZeroClipboard.js (renamed from share/frontend/gallery/js/ZeroClipboard.js) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/gallery_isotope_config.js (renamed from share/frontend/gallery/js/gallery_isotope_config.js) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/jquery.isotope.min.js (renamed from share/frontend/gallery/js/jquery.isotope.min.js) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/jquery.js (renamed from share/frontend/gallery/js/jquery.js) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/main.js (renamed from share/frontend/gallery/js/main.js) | 32 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/pbembed.js (renamed from share/frontend/gallery/js/pbembed.js) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/querystring.js (renamed from share/frontend/gallery/js/querystring.js) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/title.js (renamed from share/frontend/gallery/js/title.js) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery-static/main.css (renamed from share/frontend/gallery/main.css) | 2 | ||||
| -rw-r--r-- | share/frontend/gallery-static/style.css (renamed from share/frontend/gallery/style.css) | 0 | ||||
| -rw-r--r-- | share/frontend/gallery/index.html | 108 |
13 files changed, 15 insertions, 127 deletions
diff --git a/share/frontend/gallery/alternate.css b/share/frontend/gallery-static/alternate.css index baa2643..baa2643 100644 --- a/share/frontend/gallery/alternate.css +++ b/share/frontend/gallery-static/alternate.css diff --git a/share/frontend/gallery/gallery_style.css b/share/frontend/gallery-static/gallery_style.css index 2d78a0e..2d78a0e 100755 --- a/share/frontend/gallery/gallery_style.css +++ b/share/frontend/gallery-static/gallery_style.css diff --git a/share/frontend/gallery/js/ZeroClipboard.js b/share/frontend/gallery-static/js/ZeroClipboard.js index 648a5b6..648a5b6 100644 --- a/share/frontend/gallery/js/ZeroClipboard.js +++ b/share/frontend/gallery-static/js/ZeroClipboard.js diff --git a/share/frontend/gallery/js/gallery_isotope_config.js b/share/frontend/gallery-static/js/gallery_isotope_config.js index b2be5d4..b2be5d4 100644 --- a/share/frontend/gallery/js/gallery_isotope_config.js +++ b/share/frontend/gallery-static/js/gallery_isotope_config.js diff --git a/share/frontend/gallery/js/jquery.isotope.min.js b/share/frontend/gallery-static/js/jquery.isotope.min.js index ea4afad..ea4afad 100644 --- a/share/frontend/gallery/js/jquery.isotope.min.js +++ b/share/frontend/gallery-static/js/jquery.isotope.min.js diff --git a/share/frontend/gallery/js/jquery.js b/share/frontend/gallery-static/js/jquery.js index 16ad06c..16ad06c 100644 --- a/share/frontend/gallery/js/jquery.js +++ b/share/frontend/gallery-static/js/jquery.js diff --git a/share/frontend/gallery/js/main.js b/share/frontend/gallery-static/js/main.js index 28f053c..3db8785 100644 --- a/share/frontend/gallery/js/main.js +++ b/share/frontend/gallery-static/js/main.js @@ -1,4 +1,18 @@ $(function(){ + for (var i=0; i< (imagedata.length - 1); i++){ + var newDiv = document.createElement("div"); + var newImage = document.createElement("img"); + newImage.src = imagedata[i][0]; + newImage.className = "pb"; + newDiv.appendChild(newImage); +// consider calling something like isotope add here...and ONLY APPENDING the image to the parent div once it has loaded +// $(newImage).load(function(){ +// }) + $("#images").append(newDiv); + } +}); + +$(function(){ $("b").addClass("pulsate_and_grow"); $(".sorting-options").click(function(){ @@ -54,11 +68,9 @@ var Dump = { }, showNewer: function() { - window.location.href = '?"""+newer_QS+"""' }, showOlder: function() { - window.location.href = '?"""+back_QS+"""' } } @@ -78,7 +90,6 @@ var Main = editing: false, kp: function (event) { - console.log(event.keyCode); switch (event.keyCode) { // BS @@ -140,21 +151,6 @@ var Main = -$(function(){ -var imagedata = [ ] //needs a synchronous call here - for (var i=0; i< (imagedata.length - 1); i++){ - var newDiv = document.createElement("div"); - var newImage = document.createElement("img"); - newImage.src = imagedata[i][0]; - newImage.className = "pb"; - newDiv.appendChild(newImage); -// consider calling something like isotope add here...and ONLY APPENDING the image to the parent div once it has loaded -// $(newImage).load(function(){ -// console.log("like a true playa"); -// }) - $("#images").append(newDiv); - } -}); $(function(){ //get params from the query string, and create diff --git a/share/frontend/gallery/js/pbembed.js b/share/frontend/gallery-static/js/pbembed.js index 97fa667..97fa667 100644 --- a/share/frontend/gallery/js/pbembed.js +++ b/share/frontend/gallery-static/js/pbembed.js diff --git a/share/frontend/gallery/js/querystring.js b/share/frontend/gallery-static/js/querystring.js index 79c2a4d..79c2a4d 100644 --- a/share/frontend/gallery/js/querystring.js +++ b/share/frontend/gallery-static/js/querystring.js diff --git a/share/frontend/gallery/js/title.js b/share/frontend/gallery-static/js/title.js index a9ac584..a9ac584 100644 --- a/share/frontend/gallery/js/title.js +++ b/share/frontend/gallery-static/js/title.js diff --git a/share/frontend/gallery/main.css b/share/frontend/gallery-static/main.css index b5a1af7..1201689 100644 --- a/share/frontend/gallery/main.css +++ b/share/frontend/gallery-static/main.css @@ -16,7 +16,7 @@ div img { } #images img { cursor: pointer; - display: none; +// display: none; } #dump { position: fixed; diff --git a/share/frontend/gallery/style.css b/share/frontend/gallery-static/style.css index 2d78a0e..2d78a0e 100644 --- a/share/frontend/gallery/style.css +++ b/share/frontend/gallery-static/style.css diff --git a/share/frontend/gallery/index.html b/share/frontend/gallery/index.html deleted file mode 100644 index 4e56f76..0000000 --- a/share/frontend/gallery/index.html +++ /dev/null @@ -1,108 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> -<head> -<script type="text/javascript" src="js/jquery.js"></script> -<!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>--> -<meta http-equiv="cache-control" content="max-age=0" /> -<meta http-equiv="cache-control" content="no-cache" /> -<meta http-equiv="expires" content="0" /> -<meta http-equiv="pragma" content="no-cache" /> -<link href="main.css" rel="stylesheet" type="text/css" /> - -<script type="text/javascript" src="js/querystring.js"></script> -<script type="text/javascript" src="js/title.js"> </script> -<script type="text/javascript" src="js/jquery.isotope.min.js"></script> -<script type="text/javascript" src="js/gallery_isotope_config.js?v=3"></script> -<script type="text/javascript" src="/js/ZeroClipboard.js"></script> -<script type="text/javascript" src="http://asdf.us/js/pbembed.js"></script> -<script type="text/javascript" src="js/main.js"> </script> - -<link href="style.css" type="text/css" rel="stylesheet" /> -</head> -<body> -<div id='nextpage'> - <a href='/im/'>editor</a> | - <a id="newer">← newer</a> | - <a href='?random=1'>random</a> | - <a id="older">older →</a> -</div> -<div id="help"> - <b>key controls</b> - <div id="keys"> - <br/> - <div class="small"><i>when composer is launched...</i></div> - <div>ESC toggle</div> - <div>C clear</div> - <div>R reverse</div> - <br/> - <div class="small"><i>in the gallery...</i></div> - <div>BACKSPACE delete</div> - <div>LEFT ARROW newer</div> - <div>RIGHT ARROW older</div> - </div> -</div> -<div id="actions"> - <b>sort</b> - <div id="sorting-optionsContainer"> - <div class="sorting-options" id="date">date</div> - <div class="sorting-options" id="username">username</div> - <div class="sorting-options" id="height">height</div> - <div class="sorting-options" id="width">width</div> - <div class="sorting-options" id="gif">gif</div> - <div class="sorting-options" id="shuffle">shuffle</div> - <div class="sorting-options" id="lombada">lombada</div> - </div> -</div> -<div id="tags"> - <b>tags</b> - <div id="tag-optionsContainer"> - <div class="tag-clear"><i>remove tag</i></div> - <div class="tag-options" id="transparent">transparent</div> - <div class="tag-options" id="break">break</div> - <div class="tag-options" id="gradient">gradient</div> - <div class="tag-options" id="grid">grid</div> - <div class="tag-options" id="pattern">pattern</div> - <div class="tag-options" id="landscape">landscape</div> - <div class="tag-options" id="shader">shader</div> - <div class="tag-options" id="ascii">ascii</div> - <div class="tag-options" id="Over">Over</div> - <div class="tag-options" id="ATop">ATop</div> - <div class="tag-options" id="Dst_Over">Dst_Over</div> - <div class="tag-options" id="Dst_In">Dst_In</div> - <div class="tag-options" id="Dst_Out">Dst_Out</div> - <div class="tag-options" id="Multiply">Multiply</div> - <div class="tag-options" id="Screen">Screen</div> - <div class="tag-options" id="Divide">Divide</div> - <div class="tag-options" id="Plus">Plus</div> - <div class="tag-options" id="Difference">Difference</div> - <div class="tag-options" id="Exclusion">Exclusion</div> - <div class="tag-options" id="Lighten">Lighten</div> - <div class="tag-options" id="Darken">Darken</div> - <div class="tag-options" id="Overlay">Overlay</div> - <div class="tag-options" id="Hard_Light">Hard_Light</div> - <div class="tag-options" id="Soft_Light">Soft_Light</div> - <div class="tag-options" id="Pegtop_Light">Pegtop_Light</div> - <div class="tag-options" id="Linear_Light">Linear_Light</div> - <div class="tag-options" id="Vivid_Light">Vivid_Light</div> - <div class="tag-options" id="Pin_Light">Pin_Light</div> - <div class="tag-options" id="Linear_Dodge">Linear_Dodge</div> - <div class="tag-options" id="Linear_Burn">Linear_Burn</div> - <div class="tag-options" id="Color_Dodge">Color_Dodge</div> - <div class="tag-options" id="Color_Burn">Color_Burn</div> - </div> -</div> -<div id="dump"> - <div id="rebus"></div> - <input id="urlz" type="text" /> - <div id="d_clip_container" style="position:relative"> - <div id="d_clip_button">copy</div> - </div> - <button id="clear">clear</button> -</div> -<div id="images"> -</div> - -<script> - -</script> -</html> |
