Skip to content

Commit cf70c0d

Browse files
authored
Merge branch 'develop' into shreyash/fix-folders_auto-expand_on_save
2 parents 54744a5 + 9e463df commit cf70c0d

21 files changed

+183
-4
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import About from './About';
2+
3+
export default {
4+
title: 'IDE/About',
5+
component: About
6+
};
7+
8+
export const Default = {};
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import AssetPreview from './AssetPreview';
2+
3+
export default {
4+
title: 'IDE/AssetPreview',
5+
component: AssetPreview
6+
};
7+
8+
export const Default = {
9+
args: {
10+
url: 'https://p5js.org/assets/img/p5js.svg',
11+
name: 'P5 Logo'
12+
}
13+
};
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import AssetSize from './AssetSize';
2+
3+
export default {
4+
title: 'IDE/AssetSize',
5+
component: AssetSize
6+
};
7+
8+
export const Default = {
9+
args: {
10+
totalSize: 123
11+
}
12+
};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import Console from './Console';
2+
3+
export default {
4+
title: 'IDE/Console',
5+
component: Console
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import ConsoleInput from './ConsoleInput';
2+
3+
export default {
4+
title: 'IDE/ConsoleInput',
5+
component: ConsoleInput
6+
};
7+
8+
export const Default = {};
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import CopyableInput from './CopyableInput';
2+
3+
export default {
4+
title: 'IDE/CopyableInput',
5+
component: CopyableInput
6+
};
7+
8+
export const Default = {
9+
args: {
10+
value: 'Lorem Ipsum'
11+
}
12+
};
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import EditableInput from './EditableInput';
2+
3+
export default {
4+
title: 'IDE/EditableInput',
5+
component: EditableInput
6+
};
7+
8+
export const Default = {
9+
args: {
10+
value: 'an@email.com',
11+
label: 'Example'
12+
}
13+
};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import Feedback from './Feedback';
2+
3+
export default {
4+
title: 'IDE/Feedback',
5+
component: Feedback
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import FileUploader from './FileUploader';
2+
3+
export default {
4+
title: 'IDE/FileUploader',
5+
component: FileUploader
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import FloatingActionButton from './FloatingActionButton';
2+
3+
export default {
4+
title: 'IDE/FloatingActionButton',
5+
component: FloatingActionButton
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import KeyboardShortcutModal from './KeyboardShortcutModal';
2+
3+
export default {
4+
title: 'IDE/KeyboardShortcutModal',
5+
component: KeyboardShortcutModal
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import NewFileForm from './NewFileForm';
2+
3+
export default {
4+
title: 'IDE/NewFileForm',
5+
component: NewFileForm
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import NewFileModal from './NewFileModal';
2+
3+
export default {
4+
title: 'IDE/NewFileModal',
5+
component: NewFileModal
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import NewFolderForm from './NewFolderForm';
2+
3+
export default {
4+
title: 'IDE/NewFolderForm',
5+
component: NewFolderForm
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import NewFolderModal from './NewFolderModal';
2+
3+
export default {
4+
title: 'IDE/NewFolderModal',
5+
component: NewFolderModal
6+
};
7+
8+
export const Default = {};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import ShareModal from './ShareModal';
2+
3+
export default {
4+
title: 'IDE/ShareModal',
5+
component: ShareModal
6+
};
7+
8+
export const Default = {};
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import SketchList from './SketchList';
2+
3+
export default {
4+
title: 'IDE/SketchList',
5+
component: SketchList
6+
};
7+
8+
export const Default = {
9+
args: {
10+
user: {
11+
username: 'Joe Blogs',
12+
authenticated: true
13+
},
14+
username: 'Joe Blogs',
15+
loading: false,
16+
sketches: [
17+
{
18+
id: '1',
19+
name: 'Play Sketch',
20+
createdAt: Date.now().toString(),
21+
updatedAt: Date.now().toString()
22+
}
23+
]
24+
}
25+
};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import UploadFileModal from './UploadFileModal';
2+
3+
export default {
4+
title: 'IDE/UploadFileModal',
5+
component: UploadFileModal
6+
};
7+
8+
export const Default = {};

client/modules/Preview/EmbedFrame.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ function injectLocalFiles(files, htmlFile, options) {
252252
'PREVIEW_SCRIPTS_URL'
253253
)}`;
254254
previewScripts.setAttribute('crossorigin', '');
255-
sketchDoc.body.appendChild(previewScripts);
255+
sketchDoc.head.appendChild(previewScripts);
256256

257257
const sketchDocString = `<!DOCTYPE HTML>\n${sketchDoc.documentElement.outerHTML}`;
258258
scriptOffs = getAllScriptOffsets(sketchDocString);

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "p5.js-web-editor",
3-
"version": "2.9.0",
3+
"version": "2.9.1",
44
"description": "The web editor for p5.js.",
55
"scripts": {
66
"clean": "rimraf dist",

0 commit comments

Comments
 (0)