From 729974013a242216570536938fb52f74de4387f9 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 24 Aug 2015 16:17:53 -0500 Subject: [PATCH] * VRFS-3428 - fix button text --- web/app/assets/javascripts/webcam_viewer.js.coffee | 2 ++ web/app/views/clients/_webcam.html.slim | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/webcam_viewer.js.coffee b/web/app/assets/javascripts/webcam_viewer.js.coffee index 40a80c4cd..ad5dae90f 100644 --- a/web/app/assets/javascripts/webcam_viewer.js.coffee +++ b/web/app/assets/javascripts/webcam_viewer.js.coffee @@ -161,3 +161,5 @@ context.JK.WebcamViewer = class WebcamViewer if @resolution != null and @resolution != '' selectControl.val(@resolution) + else + selectControl.val(BackendToFrontend["WHD (1280X720)"]) diff --git a/web/app/views/clients/_webcam.html.slim b/web/app/views/clients/_webcam.html.slim index a156c8a1a..22725aea3 100644 --- a/web/app/views/clients/_webcam.html.slim +++ b/web/app/views/clients/_webcam.html.slim @@ -9,5 +9,5 @@ form.video .configure-webcam.wizard_control a.button-grey-toggle.webcam-test-btn Test Webcam .hidden.configure-webcam.wizard_control - a.hidden.button-grey-toggle.webcam-settings-btn Webcam Settings + a.hidden.button-grey-toggle.webcam-settings-btn WEBCAM SETTINGS em.no-webcam-msg.hidden No webcam detected. If using an external webcam, please make sure it is plugged in to your computer.