Merge pull request #30 from torjusti/fix/update-packages

Upgrade all packages, use react-copy-to-clipboard instead of abandoned react-clipboard.js
master
Stefan Otto 2018-07-24 09:39:56 +02:00 committed by GitHub
commit c414fd5301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 926 additions and 8804 deletions

View File

@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import ReactTooltip from 'react-tooltip'; import ReactTooltip from 'react-tooltip';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classnames from 'classnames'; import classnames from 'classnames';
import ClipboardButton from 'react-clipboard.js'; import CopyToClipboard from 'react-copy-to-clipboard';
import * as appPropTypes from './appPropTypes'; import * as appPropTypes from './appPropTypes';
import * as requestActions from '../redux/requestActions'; import * as requestActions from '../redux/requestActions';
import * as stateActions from '../redux/stateActions'; import * as stateActions from '../redux/stateActions';
@ -98,32 +98,35 @@ class Room extends React.Component
})} })}
> >
<div className='room-link'> <div className='room-link'>
<ClipboardButton <CopyToClipboard
component='a' text={room.url}
className='link' onCopy={onRoomLinkCopy}
button-href={room.url}
button-target='_blank'
data-tip='Click to copy room link'
data-clipboard-text={room.url}
onSuccess={onRoomLinkCopy}
onClick={(event) =>
{
// If this is a 'Open in new window/tab' don't prevent
// click default action.
if (
event.ctrlKey || event.shiftKey || event.metaKey ||
// Middle click (IE > 9 and everyone else).
(event.button && event.button === 1)
)
{
return;
}
event.preventDefault();
}}
> >
invitation link <a
</ClipboardButton> className='link'
href={room.url}
target='_blank'
data-tip='Click to copy room link'
rel='noopener noreferrer'
onClick={(event) =>
{
// If this is a 'Open in new window/tab' don't prevent
// click default action.
if (
event.ctrlKey || event.shiftKey || event.metaKey ||
// Middle click (IE > 9 and everyone else).
(event.button && event.button === 1)
)
{
return;
}
event.preventDefault();
}}
>
invitation link
</a>
</CopyToClipboard>
</div> </div>
</div> </div>

2972
app/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,7 @@
"debug": "^3.1.0", "debug": "^3.1.0",
"domready": "^1.0.8", "domready": "^1.0.8",
"fscreen": "^1.0.2", "fscreen": "^1.0.2",
"hark": "^1.2.0", "hark": "^1.2.2",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"marked": "^0.4.0", "marked": "^0.4.0",
"mediasoup-client": "^2.1.1", "mediasoup-client": "^2.1.1",
@ -20,7 +20,7 @@
"protoo-client": "^3.0.0", "protoo-client": "^3.0.0",
"random-string": "^0.2.0", "random-string": "^0.2.0",
"react": "^16.4.1", "react": "^16.4.1",
"react-clipboard.js": "^1.1.4", "react-copy-to-clipboard": "^5.0.1",
"react-dom": "^16.4.1", "react-dom": "^16.4.1",
"react-draggable": "^3.0.5", "react-draggable": "^3.0.5",
"react-dropdown": "^1.5.0", "react-dropdown": "^1.5.0",
@ -43,11 +43,11 @@
"babel-preset-react-app": "^3.1.2", "babel-preset-react-app": "^3.1.2",
"babel-preset-stage-0": "^6.24.1", "babel-preset-stage-0": "^6.24.1",
"babelify": "^8.0.0", "babelify": "^8.0.0",
"browser-sync": "^2.24.5", "browser-sync": "^2.24.6",
"browserify": "^16.2.2", "browserify": "^16.2.2",
"del": "^3.0.0", "del": "^3.0.0",
"envify": "^4.1.0", "envify": "^4.1.0",
"eslint": "^5.1.0", "eslint": "^5.2.0",
"eslint-plugin-import": "^2.13.0", "eslint-plugin-import": "^2.13.0",
"eslint-plugin-react": "^7.10.0", "eslint-plugin-react": "^7.10.0",
"gulp": "^4.0.0", "gulp": "^4.0.0",
@ -57,7 +57,7 @@
"gulp-header": "^2.0.5", "gulp-header": "^2.0.5",
"gulp-if": "^2.0.2", "gulp-if": "^2.0.2",
"gulp-plumber": "^1.2.0", "gulp-plumber": "^1.2.0",
"gulp-rename": "^1.3.0", "gulp-rename": "^1.4.0",
"gulp-stylus": "^2.7.0", "gulp-stylus": "^2.7.0",
"gulp-touch-cmd": "0.0.1", "gulp-touch-cmd": "0.0.1",
"gulp-uglify": "^3.0.0", "gulp-uglify": "^3.0.0",

File diff suppressed because it is too large Load Diff