diff options
| author | jules <jules@okfoc.us> | 2014-01-25 23:42:19 -0500 |
|---|---|---|
| committer | jules <jules@okfoc.us> | 2014-01-25 23:42:19 -0500 |
| commit | e873e6c1b0d2f4e06b94138a22d0d4292c52a037 (patch) | |
| tree | 13df0be06b562814308e6cfec843f16c3e2fafc3 /js | |
| parent | 9433b20670a1eada77e1a4372a8f8ccad6f499c3 (diff) | |
logging, error fix, css
Diffstat (limited to 'js')
| -rw-r--r-- | js/api/set.js | 4 | ||||
| -rw-r--r-- | js/error.highlight.js | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/js/api/set.js b/js/api/set.js index 92cc071..8732c87 100644 --- a/js/api/set.js +++ b/js/api/set.js @@ -10,14 +10,17 @@ function save_shader(){ } var blob = dataUriToBlob(cc.clone().resize(200,200).canvas.toDataURL("image/png")) + status('saving..') console.log(params) $.post("http://asdf.us/cgi-bin/im/shader/save", params, function(resp){ console.log(resp); data = JSON.parse(resp) if (data.ERROR){ + status('error saving shader') alert(data.ERROR) return false } + status('uploading thumbnail') if (! shader_id_root) { shader_id_root = data.id; } @@ -40,6 +43,7 @@ function save_shader(){ contentType: false, }).done(function(resp){ console.log(resp); + status('') var data = JSON.parse(resp) if (data.success) { $shader.find("img").attr("src", data.url) diff --git a/js/error.highlight.js b/js/error.highlight.js index 0b478e2..f46d0ec 100644 --- a/js/error.highlight.js +++ b/js/error.highlight.js @@ -136,7 +136,7 @@ var init = function(){ create_el_highlight() create_el_textmeasure() scrollbar_width = calc_scrollbar_width() - textarea.addEventListener('scroll', reposition_highlight) + dom.textarea.addEventListener('scroll', reposition_highlight) } // exports |