Skip to content

Commit 104e4cb

Browse files
committed
Replaced window.alert with console.error to avoid death lock popups for audio blocks.
Fixed formatting of some .css styles.
1 parent 0bc8548 commit 104e4cb

File tree

9 files changed

+162
-334
lines changed

9 files changed

+162
-334
lines changed

package-lock.json

Lines changed: 143 additions & 319 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": "coding-with-chrome",
3-
"version": "10.7.1",
3+
"version": "10.7.2",
44
"description": "Educational Coding Development Environment",
55
"repository": {
66
"type": "git",

src/components/Assets/style.module.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17-
.contentWrapper {
17+
.contentWrapper {
1818
position: relative;
1919
height: calc(100% - 35px);
2020
padding: 10px;
2121
overflow: hidden;
2222
}
2323

24-
.dragZone, .dragZoneActive {
25-
border: 2px dashed #aaa;
26-
height: 100%;
24+
.dragZone,
25+
.dragZoneActive {
26+
border: 2px dashed #aaa;
27+
height: 100%;
2728
}
2829

2930
.dragZoneActive {

src/components/BlockEditor/style.global.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@
176176
.blocklyTreeRow {
177177
padding: 4px 10px 4px 0px !important;
178178
background-color: #fafafa;
179-
box-shadow: 0 4px 1px 0 rgba(0, 0, 0, 0.14), 0 1px 1px 0 rgba(0, 0, 0, 0.12),
179+
box-shadow:
180+
0 4px 1px 0 rgba(0, 0, 0, 0.14),
181+
0 1px 1px 0 rgba(0, 0, 0, 0.12),
180182
0 2px 1px 1px rgba(0, 0, 0, 0.2);
181183
border-radius: 0 22px 22px 0;
182184
border-left-width: 28px !important;

src/components/CodeEditor/style.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
height: 26px;
3434
background: #f5f5f5;
3535
border-top: 1px solid #e5e5e5;
36-
box-shadow: 0 2px 4px rgba(0,0,0,.1);
36+
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
3737
}

src/components/Desktop/Launcher/style.module.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
.launcher {
18-
background-color: rgba(255,255,255,0.9) !important;
18+
background-color: rgba(255, 255, 255, 0.9) !important;
1919
width: 65px;
2020
margin: 0;
2121
position: absolute;
@@ -58,8 +58,10 @@
5858
.expandArea {
5959
background: #eee;
6060
border-radius: 0 4px 4px 0;
61-
box-shadow: 0px 3px 3px -2px rgba(0, 0, 0, 0.2),
62-
0px 3px 4px 0px rgba(0, 0, 0, 0.14), 0px 1px 8px 0px rgba(0, 0, 0, 0.12);
61+
box-shadow:
62+
0px 3px 3px -2px rgba(0, 0, 0, 0.2),
63+
0px 3px 4px 0px rgba(0, 0, 0, 0.14),
64+
0px 1px 8px 0px rgba(0, 0, 0, 0.12);
6365
cursor: pointer;
6466
height: 100%;
6567
position: absolute;

src/components/Desktop/style.module.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@
2121
}
2222

2323
.menuBar {
24-
2524
}

src/components/GameEditor/blocks/AudioBlocks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ javascriptGenerator.forBlock['phaser_audio_add_bgm'] = function (block) {
8282
});
8383
${variable}.play();
8484
} catch (e) {
85-
window.alert(e);
85+
console.error(e);
8686
}
8787
`;
8888
};
@@ -140,7 +140,7 @@ javascriptGenerator.forBlock['phaser_audio_add'] = function (block) {
140140
volume: ${numberVolume / 100}, loop: ${dropdownLoop}
141141
});
142142
} catch (e) {
143-
window.alert(e);
143+
console.error(e);
144144
}
145145
`;
146146
};

src/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<!-- Copyright 2020 The Coding with Chrome Authors.
44
Author: [email protected] (Markus Bordihn)
@@ -20,7 +20,7 @@
2020
<link rel="icon" type="image/png" sizes="32x32" href="favicon/favicon-32x32.png" />
2121
<link rel="icon" type="image/png" sizes="16x16" href="favicon/favicon-16x16.png" />
2222
<link rel="mask-icon" href="favicon/safari-pinned-tab.svg" color="#00baef" />
23-
<meta name="apple-mobile-web-app-capable" content="yes">
23+
<meta name="apple-mobile-web-app-capable" content="yes" />
2424
<meta name="apple-mobile-web-app-title" content="Coding with Chrome" />
2525
<meta name="application-name" content="Coding with Chrome" />
2626
<meta name="msapplication-TileColor" content="#da532c" />

0 commit comments

Comments
 (0)