From 5a572bc0dd27aeaaaab39d9c85280e285e376741 Mon Sep 17 00:00:00 2001 From: Julia Hansbrough Date: Wed, 13 Nov 2013 20:31:49 +0000 Subject: [PATCH] Fixed bug where Flash photo taker would fail LMS-1487 --- lms/static/js/verify_student/CameraCapture.as | 22 ++++-------------- .../js/verify_student/CameraCapture.swf | Bin 2448 -> 2362 bytes 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/lms/static/js/verify_student/CameraCapture.as b/lms/static/js/verify_student/CameraCapture.as index 1d55f80b37..b75e515aa0 100644 --- a/lms/static/js/verify_student/CameraCapture.as +++ b/lms/static/js/verify_student/CameraCapture.as @@ -10,6 +10,10 @@ * assign this return value to an img's src attribute. * reset() restarts the the video. * imageDataUrl() returns the same thing as snap() -- + * + * Note that this file is merely the source code for CameraCapture.swf; to make + * changes, you must edit this file, compile it to .swf, and check in the .swf + * file separately */ package @@ -37,7 +41,6 @@ package private var camera:Camera; private var video:Video; private var b64EncodedImage:String = null; - private var permissionGiven:Boolean = false; public function CameraCapture() { @@ -47,7 +50,6 @@ package protected function init(e:Event):void { camera = Camera.getCamera(); camera.setMode(VIDEO_WIDTH, VIDEO_HEIGHT, 30); - camera.addEventListener(StatusEvent.STATUS, statusHandler); video = new Video(VIDEO_WIDTH, VIDEO_HEIGHT); video.attachCamera(camera); @@ -106,26 +108,12 @@ package } public function cameraAuthorized():Boolean { - return permissionGiven; + return !(camera.muted); } public function hasCamera():Boolean { return (Camera.names.length != 0); } - - public function statusHandler(event:StatusEvent):void { - switch (event.code) - { - case "Camera.Muted": - // User clicked Deny. - permissionGiven = false; - break; - case "Camera.Unmuted": - // "User clicked Accept. - permissionGiven = true; - break; - } - } } } diff --git a/lms/static/js/verify_student/CameraCapture.swf b/lms/static/js/verify_student/CameraCapture.swf index 5ad17e7631252c553b6942b7c8d1b3303ed93e11..0580885763f9d7b42b034df12c1789a1b282b7a0 100644 GIT binary patch delta 2087 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