Skip to content

Commit

Permalink
Replaced window.alert with console.error to avoid death lock popu…
Browse files Browse the repository at this point in the history
…ps for audio blocks.

Fixed formatting of some .css styles.
  • Loading branch information
MarkusBordihn committed Apr 27, 2024
1 parent 0bc8548 commit 104e4cb
Show file tree
Hide file tree
Showing 9 changed files with 162 additions and 334 deletions.
462 changes: 143 additions & 319 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "coding-with-chrome",
"version": "10.7.1",
"version": "10.7.2",
"description": "Educational Coding Development Environment",
"repository": {
"type": "git",
Expand Down
9 changes: 5 additions & 4 deletions src/components/Assets/style.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@
* limitations under the License.
*/

.contentWrapper {
.contentWrapper {
position: relative;
height: calc(100% - 35px);
padding: 10px;
overflow: hidden;
}

.dragZone, .dragZoneActive {
border: 2px dashed #aaa;
height: 100%;
.dragZone,
.dragZoneActive {
border: 2px dashed #aaa;
height: 100%;
}

.dragZoneActive {
Expand Down
4 changes: 3 additions & 1 deletion src/components/BlockEditor/style.global.css
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@
.blocklyTreeRow {
padding: 4px 10px 4px 0px !important;
background-color: #fafafa;
box-shadow: 0 4px 1px 0 rgba(0, 0, 0, 0.14), 0 1px 1px 0 rgba(0, 0, 0, 0.12),
box-shadow:
0 4px 1px 0 rgba(0, 0, 0, 0.14),
0 1px 1px 0 rgba(0, 0, 0, 0.12),
0 2px 1px 1px rgba(0, 0, 0, 0.2);
border-radius: 0 22px 22px 0;
border-left-width: 28px !important;
Expand Down
2 changes: 1 addition & 1 deletion src/components/CodeEditor/style.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
height: 26px;
background: #f5f5f5;
border-top: 1px solid #e5e5e5;
box-shadow: 0 2px 4px rgba(0,0,0,.1);
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
8 changes: 5 additions & 3 deletions src/components/Desktop/Launcher/style.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

.launcher {
background-color: rgba(255,255,255,0.9) !important;
background-color: rgba(255, 255, 255, 0.9) !important;
width: 65px;
margin: 0;
position: absolute;
Expand Down Expand Up @@ -58,8 +58,10 @@
.expandArea {
background: #eee;
border-radius: 0 4px 4px 0;
box-shadow: 0px 3px 3px -2px rgba(0, 0, 0, 0.2),
0px 3px 4px 0px rgba(0, 0, 0, 0.14), 0px 1px 8px 0px rgba(0, 0, 0, 0.12);
box-shadow:
0px 3px 3px -2px rgba(0, 0, 0, 0.2),
0px 3px 4px 0px rgba(0, 0, 0, 0.14),
0px 1px 8px 0px rgba(0, 0, 0, 0.12);
cursor: pointer;
height: 100%;
position: absolute;
Expand Down
1 change: 0 additions & 1 deletion src/components/Desktop/style.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@
}

.menuBar {

}
4 changes: 2 additions & 2 deletions src/components/GameEditor/blocks/AudioBlocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ javascriptGenerator.forBlock['phaser_audio_add_bgm'] = function (block) {
});
${variable}.play();
} catch (e) {
window.alert(e);
console.error(e);
}
`;
};
Expand Down Expand Up @@ -140,7 +140,7 @@ javascriptGenerator.forBlock['phaser_audio_add'] = function (block) {
volume: ${numberVolume / 100}, loop: ${dropdownLoop}
});
} catch (e) {
window.alert(e);
console.error(e);
}
`;
};
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<!-- Copyright 2020 The Coding with Chrome Authors.
Author: [email protected] (Markus Bordihn)
Expand All @@ -20,7 +20,7 @@
<link rel="icon" type="image/png" sizes="32x32" href="favicon/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="favicon/favicon-16x16.png" />
<link rel="mask-icon" href="favicon/safari-pinned-tab.svg" color="#00baef" />
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-title" content="Coding with Chrome" />
<meta name="application-name" content="Coding with Chrome" />
<meta name="msapplication-TileColor" content="#da532c" />
Expand Down

0 comments on commit 104e4cb

Please sign in to comment.