diff options
| author | Scott Ostler <sostler@deathmachine.local> | 2010-04-02 17:06:57 -0400 |
|---|---|---|
| committer | Scott Ostler <sostler@deathmachine.local> | 2010-04-02 17:06:57 -0400 |
| commit | 0447dc0cbea30537eeb55604cad19e265d305585 (patch) | |
| tree | 9b9f78666824b0daa102d26be4c93e24195e79ad /static/webcam | |
| parent | bd3925a4a19dd3b2c65abad579887b108d8f8546 (diff) | |
| parent | aa3165c303d8feb2a34329539c67bd71863c9eb4 (diff) | |
Resolved PROD merge
Diffstat (limited to 'static/webcam')
| -rw-r--r-- | static/webcam/webcam.js | 3 | ||||
| -rw-r--r-- | static/webcam/webcam.swf | bin | 6932 -> 18933 bytes |
2 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() }, diff --git a/static/webcam/webcam.swf b/static/webcam/webcam.swf Binary files differindex 9285dc9..ce7b114 100644 --- a/static/webcam/webcam.swf +++ b/static/webcam/webcam.swf |