Skip to content

undo click-to-copy changes #1263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tpetr merged 1 commit into from
Sep 2, 2016
Merged

undo click-to-copy changes #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions SingularityUI/app/components/deployDetail/DeployDetail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Clipboard from 'clipboard';

import Utils from '../../utils';
import { Link } from 'react-router';
import { OverlayTrigger, Popover, Glyphicon } from 'react-bootstrap';
import { Glyphicon } from 'react-bootstrap';
import {
FetchTaskHistory,
FetchActiveTasksForDeploy,
Expand Down Expand Up @@ -87,11 +87,6 @@ class DeployDetail extends React.Component {
);
}
}
const copyLinkPopover = (
<Popover id="popover-trigger-focus">
Click to copy
</Popover>
);
const breadcrumbs = [
{
label: 'Request',
Expand Down Expand Up @@ -122,9 +117,7 @@ class DeployDetail extends React.Component {
<div className="row">
<div className="col-md-8">
<h1>
<OverlayTrigger trigger={['hover', 'focus', 'click']} placement="top" overlay={copyLinkPopover}>
<span className="copy-btn" data-clipboard-text={this.props.params.deployId}>{this.props.params.deployId}</span>
</OverlayTrigger>
<span>{deploy.deploy.id}</span>
<DeployState state={deploy.deployResult && deploy.deployResult.deployState || 'PENDING'} />
</h1>
</div>
Expand Down
11 changes: 1 addition & 10 deletions SingularityUI/app/components/requestDetail/header/RequestTitle.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { PropTypes } from 'react';
import { connect } from 'react-redux';
import { OverlayTrigger, Popover } from 'react-bootstrap';

import Utils from '../../../utils';

Expand Down Expand Up @@ -42,21 +41,13 @@ const RequestTitle = ({requestId, requestAPI, deleted}) => {
);
}

const copyLinkPopover = (
<Popover id="popover-trigger-focus">
Click to copy
</Popover>
);

return (
<div>
<h4>
{maybeInfo}
</h4>
<h2>
<OverlayTrigger trigger={['hover', 'focus', 'click']} placement="top" overlay={copyLinkPopover}>
<span className="copy-btn" data-clipboard-text={requestId}>{requestId}</span>
</OverlayTrigger>
{Utils.maybe(requestAPI, ['data', 'request', 'id']) || requestId}
</h2>
</div>
);
Expand Down