Fixed a copy bug for firefox
This commit is contained in:
+2
-2
@@ -1,7 +1,7 @@
|
||||
version: '3'
|
||||
services:
|
||||
frontend:
|
||||
#build: ./frontend
|
||||
build: ./frontend
|
||||
image: ghcr.io/frikky/shuffle-frontend:nightly
|
||||
container_name: shuffle-frontend
|
||||
hostname: shuffle-frontend
|
||||
@@ -16,7 +16,7 @@ services:
|
||||
depends_on:
|
||||
- backend
|
||||
backend:
|
||||
build: ./backend
|
||||
#build: ./backend
|
||||
image: ghcr.io/frikky/shuffle-backend:nightly
|
||||
container_name: shuffle-backend
|
||||
hostname: ${BACKEND_HOSTNAME}
|
||||
|
||||
@@ -1764,16 +1764,14 @@ const Admin = (props) => {
|
||||
run2FASetup(userdata);
|
||||
}}
|
||||
disabled={
|
||||
(selectedUser.role === "admin" &&
|
||||
selectedUser.username !== userdata.username) ||
|
||||
selectedUser.active === false
|
||||
(selectedUser.role === "admin" && selectedUser.username !== userdata.username)
|
||||
}
|
||||
variant="outlined"
|
||||
color="primary"
|
||||
>
|
||||
{selectedUser.mfa_info !== undefined &&
|
||||
selectedUser.mfa_info !== null &&
|
||||
selectedUser.mfa_info.active === true
|
||||
{ selectedUser.mfa_info !== undefined &&
|
||||
selectedUser.mfa_info !== null &&
|
||||
selectedUser.mfa_info.active === true
|
||||
? "Disable 2FA"
|
||||
: "Enable 2FA"}
|
||||
</Button>
|
||||
|
||||
@@ -2983,6 +2983,16 @@ const AngularWorkflow = (props) => {
|
||||
}
|
||||
}
|
||||
|
||||
if (
|
||||
event.target !== undefined &&
|
||||
event.target !== null
|
||||
) {
|
||||
if (event.target.localName !== "body") {
|
||||
console.log("Skipping because body is not targeted")
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
console.log("CTRL+C");
|
||||
if (cy !== undefined) {
|
||||
var cydata = cy.$(":selected").jsons();
|
||||
@@ -3051,18 +3061,30 @@ const AngularWorkflow = (props) => {
|
||||
};
|
||||
|
||||
const handlePaste = (event) => {
|
||||
//console.log(event)
|
||||
//console.log("EV: ", event)
|
||||
if (
|
||||
event.path !== undefined &&
|
||||
event.path !== null &&
|
||||
event.path.length > 0
|
||||
) {
|
||||
//console.log(event.path[0])
|
||||
console.log("PATH: ", event.path[0])
|
||||
if (event.path[0].localName !== "body") {
|
||||
//console.log("Skipping because body is not targeted")
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
console.log("PATH2: ", event.target)
|
||||
if (
|
||||
event.target !== undefined &&
|
||||
event.target !== null
|
||||
) {
|
||||
if (event.target.localName !== "body") {
|
||||
//console.log("Skipping because body is not targeted")
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
event.preventDefault();
|
||||
const clipboard = (event.originalEvent || event).clipboardData.getData(
|
||||
@@ -3078,6 +3100,7 @@ const AngularWorkflow = (props) => {
|
||||
for (var key in parsedjson) {
|
||||
const item = parsedjson[key];
|
||||
console.log("Adding: ", item);
|
||||
item.data.id = uuidv4()
|
||||
|
||||
cy.add({
|
||||
group: item.group,
|
||||
@@ -5025,7 +5048,7 @@ const AngularWorkflow = (props) => {
|
||||
</div>
|
||||
</Zoom>
|
||||
:
|
||||
<div>
|
||||
<div key={index}>
|
||||
{extraMessage}
|
||||
<ParsedAppPaper key={index} app={app} />
|
||||
</div>
|
||||
@@ -10571,7 +10594,9 @@ const AngularWorkflow = (props) => {
|
||||
executionData.completed_at !== null &&
|
||||
executionData.completed_at > 0 ? (
|
||||
<div style={{ display: "flex" }}>
|
||||
<Typography variant="body1">
|
||||
<Typography variant="body1" onClick={() => {
|
||||
console.log(executionData)
|
||||
}}>
|
||||
<b>Finished </b>
|
||||
</Typography>
|
||||
<Typography variant="body1" color="textSecondary">
|
||||
|
||||
@@ -72,13 +72,14 @@ const Docs = (props) => {
|
||||
position: "relative",
|
||||
padding: 30,
|
||||
paddingTop: 15,
|
||||
height: "80vh",
|
||||
marginTop: 15,
|
||||
minHeight: "50vh",
|
||||
//height: "50vh",
|
||||
};
|
||||
|
||||
const SideBar = {
|
||||
maxWidth: 250,
|
||||
flex: "1",
|
||||
flex: 1,
|
||||
position: "fixed",
|
||||
};
|
||||
|
||||
@@ -649,8 +650,9 @@ const Docs = (props) => {
|
||||
// </Dialog>
|
||||
// {imageModal}
|
||||
|
||||
// Padding and zIndex etc set because of footer in cloud.
|
||||
const loadedCheck = (
|
||||
<div>
|
||||
<div style={{minHeight: 1000, paddingBottom: 150, zIndex: 50000, }}>
|
||||
<BrowserView>{postDataBrowser}</BrowserView>
|
||||
<MobileView>{postDataMobile}</MobileView>
|
||||
</div>
|
||||
|
||||
@@ -384,12 +384,12 @@ const Settings = (props) => {
|
||||
<Grid item xs={4} style={{ borderRadius: theme.palette.borderRadius }}>
|
||||
<Paper style={innerPaperStyle}>
|
||||
<img
|
||||
src={data.image_thumbnail_url}
|
||||
src={data.image}
|
||||
alt={data.name}
|
||||
style={{ width: "100%", marginBottom: 10 }}
|
||||
/>
|
||||
<Typography variant="body2" color="textSecondary">
|
||||
{data.collection.name}
|
||||
{data.collection}
|
||||
</Typography>
|
||||
<Typography variant="body2">{data.name}</Typography>
|
||||
</Paper>
|
||||
@@ -746,7 +746,7 @@ const Settings = (props) => {
|
||||
>
|
||||
<Typography>
|
||||
<img
|
||||
src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Ethereum-icon-purple.svg/480px-Ethereum-icon-purple.svg.png"
|
||||
src="/images/social/ethereum.png"
|
||||
alt="ethereum-icon"
|
||||
style={{ height: 30 }}
|
||||
/>
|
||||
|
||||
@@ -2521,8 +2521,8 @@ const Workflows = (props) => {
|
||||
<Typography style={{ marginTop: 7, marginBottom: "auto" }}>
|
||||
<a
|
||||
rel="noopener noreferrer"
|
||||
href="https://shuffler.io/docs/workflows"
|
||||
target="_blank"
|
||||
href="https://shuffler.io/docs/workflows"
|
||||
style={{ textDecoration: "none", color: "#f85a3e" }}
|
||||
>
|
||||
Learn more about Workflows
|
||||
|
||||
Reference in New Issue
Block a user