summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules <jules@asdf.us>2014-02-08 00:09:53 -0500
committerJules <jules@asdf.us>2014-02-08 00:09:53 -0500
commitfa3e56f0e4316a20fff33bc9887aa3b3e1fe8c32 (patch)
treeea2c657f4e46a0121cc6424b4964d8042226831d
parentccf2e063fd63180b1ea65576310cf35002f9449c (diff)
export background from index
-rw-r--r--index.html16
-rw-r--r--js/save.js12
2 files changed, 21 insertions, 7 deletions
diff --git a/index.html b/index.html
index 5fb7c30..7a82b45 100644
--- a/index.html
+++ b/index.html
@@ -21,6 +21,9 @@ h1 { font-size: 26px; font-weight: normal }
<div id="body">
<img src="img/palette.gif" id="palette">
<button id="dice">&#9883;</button>
+<button id="upload">&rarr;</button>
+<input type="text" id="uploaded-url">
+<span id="status"></span>
<h1>dither</h1>
<a target="_blank" href="dither-picker.html"><button>dither-picker</button></a>
@@ -58,7 +61,11 @@ h1 { font-size: 26px; font-weight: normal }
<script type="text/javascript" src="js/vendor/canvasquery.js"></script>
<script type="text/javascript" src="js/vendor/jquery/jquery.min.js"></script>
-<script type="text/javascript" src="http://asdf.us/neighbor/neighbor.js"></script>
+<script type="text/javascript" src="js/vendor/dataUriToBlob.js"></script>
+<script type="text/javascript" src="js/vendor/FileSaver/FileSaver.js"></script>
+<script type="text/javascript" src="js/user.js"></script>
+<script type="text/javascript" src="js/image.js"></script>
+<script type="text/javascript" src="js/save.js"></script>
<script type="text/javascript">
//
@@ -190,10 +197,12 @@ if (palette.complete) load()
function load(){
console.log("hello");
+ user.init()
var offset = $("#palette").offset();
var paletteImg = $("#palette")[0];
var palette = cq(paletteImg);
var pattern, mask;
+ var patternURI;
var color = new Color( 0, 0, 0 );
// $("body").append(palette.canvas);
@@ -239,6 +248,11 @@ function load(){
}
$("#dice").click(dice)
dice()
+ $("#upload").click(function(){
+ if (patternURI) {
+ upload(patternURI, (+ new Date()) + "-" + user.username + "-dither.png")
+ }
+ })
}
$("#dice").focus()
$(window).focus(function(){ $("#dice").focus() })
diff --git a/js/save.js b/js/save.js
index f54f7d1..40c1838 100644
--- a/js/save.js
+++ b/js/save.js
@@ -24,14 +24,14 @@ function saveJSON (data, filename) {
saveAs(blob, filename);
}
-function upload(){
- var filename = get_filename()
- var username = user.username
- var blob = dataUriToBlob(lastGif)
+function upload(uri, filename){
+ filename = filename || get_filename()
+ uri = uri || lastGif
+ var blob = dataUriToBlob(uri)
uploadImage({
blob: blob,
filename: filename,
- username: username,
+ username: user.username,
success: function(data){
// data.url
@@ -39,9 +39,9 @@ function upload(){
// data.success
console.log(data);
- status("uploaded");
$("#uploaded-url").show().focus().val(data.url)
$("#uploaded-url + br").show()
+ status && status("uploaded");
},
error: function(data){
console.log(data)