diff options
| author | timb <timb@mb.home> | 2010-04-01 00:40:42 -0700 |
|---|---|---|
| committer | timb <timb@mb.home> | 2010-04-01 00:40:42 -0700 |
| commit | 70d8c1992f97286a63babcf7ebd996ab74ec7eac (patch) | |
| tree | 0be94521405b982e8b97f4234a02d4d3c28fc8ce /static/webcam/webcam.js | |
| parent | 8d0e1e9aa4505ccaf0c77583fc2654806d17e8df (diff) | |
| parent | aa3165c303d8feb2a34329539c67bd71863c9eb4 (diff) | |
fixing conflicts >:|
Diffstat (limited to 'static/webcam/webcam.js')
| -rw-r--r-- | static/webcam/webcam.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js index 42af499..f2e287b 100644 --- a/static/webcam/webcam.js +++ b/static/webcam/webcam.js @@ -56,12 +56,15 @@ window.webcam = { $("body").append(camHtml) $("#webcam-button-upload").addClass("invisible") $("#webcam-button-snap").removeClass("invisible") + $("#effects-msg").removeClass("invisible").fadeOut(70000) + blinkStart() }, hide: function() { $("#webcam-button-snap").addClass("invisible") $("#webcam-button-upload").removeClass("invisible") + $("#effects-msg").addClass("invisible") blinkStop() $("#webcam-preview").remove() }, |