Skip to content
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

Jump to bottom

fix: upgrade cross tab copy paste to use new clipboard API #1845

Merged
merged 2 commits into from
Aug 16, 2023
Merged

fix: upgrade cross tab copy paste to use new clipboard API #1845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e28b39c
fix: upgrade cross tab copy paste to use new clipboard API
BeksOmega Aug 3, 2023
db4845c
chore: update to beta
BeksOmega Aug 14, 2023
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
16 changes: 8 additions & 8 deletions plugins/cross-tab-copy-paste/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions plugins/cross-tab-copy-paste/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
"devDependencies": {
"@blockly/dev-scripts": "^2.0.1",
"@blockly/dev-tools": "^7.0.2",
"blockly": "^10.0.0"
"blockly": "^10.2.0-beta.0"
},
"peerDependencies": {
"blockly": "^10.0.0"
"blockly": "^10.2.0-beta.0"
},
"publishConfig": {
"access": "public",
Expand Down
32 changes: 15 additions & 17 deletions plugins/cross-tab-copy-paste/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

import * as Blockly from 'blockly/core';
import {convertBlockToSaveInfo} from './utility';


/**
Expand Down Expand Up @@ -75,9 +74,8 @@ export class CrossTabCopyPaste {
},
callback: function(
/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
const blockText = JSON.stringify(
convertBlockToSaveInfo(scope.block));
localStorage.setItem('blocklyStash', blockText);
localStorage.setItem(
'blocklyStash', JSON.stringify(scope.block.toCopyData()));
},
scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
id: 'blockCopyToStorage',
Expand Down Expand Up @@ -111,10 +109,9 @@ export class CrossTabCopyPaste {
},
callback: function(
/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
const blockText = localStorage.getItem('blocklyStash');
const saveInfo = JSON.parse(blockText);
const copyData = JSON.parse(localStorage.getItem('blocklyStash'));
try {
scope.workspace.paste(saveInfo['saveInfo']);
Blockly.clipboard.paste(copyData, scope.workspace);
} catch (e) {
if (e instanceof TypeError && typeErrorCallback) {
typeErrorCallback();
Expand Down Expand Up @@ -151,10 +148,11 @@ export class CrossTabCopyPaste {
// which may beep or otherwise indicate
// an error due to the lack of a selection.
e.preventDefault();
const block = Blockly.getSelected();
if (!block || !Blockly.isCopyable(block)) return false;
workspace.hideChaff();
const blockText = JSON.stringify(
convertBlockToSaveInfo(Blockly.getSelected()));
localStorage.setItem('blocklyStash', blockText);
localStorage.setItem(
'blocklyStash', JSON.stringify(block.toCopyData()));
return true;
},
};
Expand Down Expand Up @@ -195,11 +193,12 @@ export class CrossTabCopyPaste {
// which may beep or otherwise indicate
// an error due to the lack of a selection.
e.preventDefault();
const blockText = JSON.stringify(
convertBlockToSaveInfo(Blockly.getSelected()));
localStorage.setItem('blocklyStash', blockText);
const block = /** @type {Blockly.BlockSvg} */ (Blockly.getSelected());
if (!block || !Blockly.isCopyable(block)) return false;
localStorage.setItem(
'blocklyStash', JSON.stringify(block.toCopyData()));
Blockly.Events.setGroup(true);
Blockly.getSelected().dispose(true);
block.dispose(true);
Blockly.Events.setGroup(false);
return true;
},
Expand Down Expand Up @@ -243,10 +242,9 @@ export class CrossTabCopyPaste {
// which may beep or otherwise indicate
// an error due to the lack of a selection.
e.preventDefault();
const blockText = localStorage.getItem('blocklyStash');
const saveInfo = JSON.parse(blockText);
const copyData = JSON.parse(localStorage.getItem('blocklyStash'));
try {
workspace.paste(saveInfo['saveInfo']);
Blockly.clipboard.paste(copyData, workspace);
} catch (e) {
if (e instanceof TypeError && typeErrorCallback) {
typeErrorCallback();
Expand Down
19 changes: 0 additions & 19 deletions plugins/cross-tab-copy-paste/src/utility.js
View file
Open in desktop

This file was deleted.

Loading