Browse Source

hide qr code scan btn if device check failed

all-modes
pbca26 8 years ago
parent
commit
b17b4cf8d4
  1. 2
      react/src/components/dashboard/qrModal/qrModal.js
  2. 16
      react/src/components/dashboard/qrModal/qrModal.render.js
  3. 6
      react/src/components/dashboard/qrModal/qrModal.scss

2
react/src/components/dashboard/qrModal/qrModal.js

@ -14,6 +14,7 @@ class QRModal extends React.Component {
this.state = { this.state = {
modalIsOpen: false, modalIsOpen: false,
error: null, error: null,
errorShown: false,
}; };
this.openModal = this.openModal.bind(this); this.openModal = this.openModal.bind(this);
this.closeModal = this.closeModal.bind(this); this.closeModal = this.closeModal.bind(this);
@ -65,6 +66,7 @@ class QRModal extends React.Component {
closeModal() { closeModal() {
this.setState({ this.setState({
modalIsOpen: false, modalIsOpen: false,
errorShown: this.state.error ? true : false,
}); });
} }

16
react/src/components/dashboard/qrModal/qrModal.render.js

@ -2,7 +2,7 @@ import React from 'react';
import { translate } from '../../../translate/translate'; import { translate } from '../../../translate/translate';
import QRCode from 'qrcode.react'; import QRCode from 'qrcode.react';
export const QRModalRender = function () { export const QRModalRender = function() {
return ( return (
<span> <span>
<span className="label label-default margin-left-10 action" <span className="label label-default margin-left-10 action"
@ -41,7 +41,8 @@ export const QRModalRender = function () {
); );
}; };
export const QRModalReaderRender = function () { export const QRModalReaderRender = function() {
if (!this.state.errorShown) {
return ( return (
<span> <span>
<button type="button" <button type="button"
@ -66,13 +67,7 @@ export const QRModalReaderRender = function () {
</div> </div>
<div className="modal-body"> <div className="modal-body">
<div className="animsition vertical-align fade-in"> <div className="animsition vertical-align fade-in">
<div <div className="page-content vertical-align-middle webcam-frame">
className="page-content vertical-align-middle"
style={{
width: '100%',
textAlign: 'center',
fontSize: '16px'
}}>
<div id="webcam"> <div id="webcam">
{ this.state.error } { this.state.error }
</div> </div>
@ -85,4 +80,7 @@ export const QRModalReaderRender = function () {
<div className={ 'modal-backdrop ' + (this.state.modalIsOpen ? 'show in' : 'fade hide') }></div> <div className={ 'modal-backdrop ' + (this.state.modalIsOpen ? 'show in' : 'fade hide') }></div>
</span> </span>
); );
} else {
return null;
}
}; };

6
react/src/components/dashboard/qrModal/qrModal.scss

@ -3,3 +3,9 @@
top: 15px; top: 15px;
right: 30px; right: 30px;
} }
.webcam-frame {
width: 100%;
text-align: center;
font-size: 16px;
}
Loading…
Cancel
Save