diff options
| -rw-r--r-- | index.html | 16 | ||||
| -rw-r--r-- | js/save.js | 12 |
2 files changed, 21 insertions, 7 deletions
@@ -21,6 +21,9 @@ h1 { font-size: 26px; font-weight: normal } <div id="body"> <img src="img/palette.gif" id="palette"> <button id="dice">⚛</button> +<button id="upload">→</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() }) @@ -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) |