Skip to content

Commit feb4b74

Browse files
Powell-v2Powell-v2
committed
Always show share button + warn about potential errors
1 parent fa1a79c commit feb4b74

File tree

6 files changed

+142
-91
lines changed

6 files changed

+142
-91
lines changed

‎web/blocks.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
<a id="newButton" class="cw-button red">
4444
<i class="mdi mdi-18px mdi-plus"></i>&nbsp; New
4545
</a>
46-
<a id="saveButton" class="cw-button blue" style="display: none;">
46+
<a id="saveButton" class="cw-button blue" style="display: none">
4747
<i class="mdi mdi-18px mdi-cloud-upload"></i>&nbsp; Save
4848
</a>
4949
<a id="saveAsButton" class="cw-button blue">
5050
<i class="mdi mdi-18px mdi-dots-horizontal"></i>&nbsp; Save As
5151
</a>
52-
<a id="deleteButton" class="cw-button red" style="display: none;">
52+
<a id="deleteButton" class="cw-button red" style="display: none">
5353
<i class="mdi mdi-18px mdi-delete"></i>&nbsp; Delete
5454
</a>
5555
</div>
@@ -59,10 +59,10 @@
5959
<div
6060
class="dropbox ui-layout-center"
6161
id="blocklyDiv"
62-
style="height: 84%; width: 100%;"
62+
style="height: 84%; width: 100%"
6363
></div>
6464

65-
<div id="result" style="display: none;" class="ui-layout-east">
65+
<div id="result" style="display: none" class="ui-layout-east">
6666
<div
6767
id="obsolete-code-alert"
6868
class="obsolete-code-alert-fadeout"
@@ -72,19 +72,19 @@
7272
class="dropbox"
7373
width="500"
7474
height="500"
75-
style="display: none;"
75+
style="display: none"
7676
></iframe>
7777

7878
<pre
7979
id="message"
8080
class="dropbox"
81-
style="width: 100%; min-height: 100px; padding: 5px; display: none;"
81+
style="width: 100%; min-height: 100px; padding: 5px; display: none"
8282
></pre>
8383

8484
<span
8585
><a
8686
type="button"
87-
style="margin-top: 5px;"
87+
style="margin-top: 5px"
8888
id="editButton"
8989
target="_blank"
9090
class="cw-button blue"
@@ -95,7 +95,7 @@
9595
<pre
9696
id="genCode"
9797
class="dropbox cm-s-default CodeMirror"
98-
style="width: 100%; height: 100%; padding: 10px;"
98+
style="width: 100%; height: 100%; padding: 10px"
9999
></pre>
100100
</div>
101101
</div>
@@ -105,13 +105,13 @@
105105
id="navButton"
106106
class="cw-button blue"
107107
onclick="window.mainLayout.toggle('west')"
108-
style="display: none;"
108+
style="display: none"
109109
><i class="mdi mdi-18px mdi-menu"></i
110110
></a>
111111
<a id="signin" class="cw-button blue"
112112
><i class="mdi mdi-18px mdi-login"></i>&nbsp; Sign In</a
113113
>
114-
<a id="signout" class="cw-button blue" style="display: none;"
114+
<a id="signout" class="cw-button blue" style="display: none"
115115
><i class="mdi mdi-18px mdi-logout"></i>&nbsp; Sign Out</a
116116
>
117117
<a id="docButton" class="cw-button blue"
@@ -130,11 +130,11 @@
130130
<a
131131
id="shareFolderButton"
132132
class="cw-button yellow"
133-
style="display: none;"
133+
style="display: none"
134134
><i class="mdi mdi-18px mdi-folder-outline"></i>&nbsp; Share
135135
Folder</a
136136
>
137-
<a id="shareButton" class="cw-button yellow" style="display: none;"
137+
<a id="shareButton" class="cw-button yellow"
138138
><i class="mdi mdi-18px mdi-share"></i>&nbsp; Share</a
139139
>
140140
<a id="btnStop" class="cw-button red"
@@ -233,7 +233,7 @@
233233
src="mirrored/cdn.jsdelivr.net/npm/[email protected]/dist/promise.min.js"
234234
></script>
235235

236-
<xml id="toolbox" style="display: none;">
236+
<xml id="toolbox" style="display: none">
237237
<category name="Programs">
238238
<block type="cwDrawingOf"></block>
239239
<block type="cwActivityOf"></block>

‎web/css/codeworld.css‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ body {
259259
}
260260

261261
.cw-button {
262+
display: grid;
263+
grid-auto-flow: column;
264+
align-items: center;
265+
justify-content: left;
262266
border-radius: 4px;
263267
cursor: pointer;
264268
text-align: left;
@@ -268,13 +272,18 @@ body {
268272
margin: 3px 3px 0px 3px;
269273
padding: 6px 6px 6px 6px;
270274
text-decoration: none;
271-
display: inline-block;
272275
font-weight: bold;
273276
color: var(--cw-button-color);
274277
white-space: nowrap;
275278
overflow: hidden;
276279
}
277280

281+
.cw-button.cw-button--disabled {
282+
color: rgba(255, 255, 255, 0.8);
283+
background-color: rgba(0, 0, 0, 0.3) !important;
284+
pointer-events: none;
285+
}
286+
278287
#toolbar .cw-button {
279288
margin-bottom: 3px;
280289
margin-top: 0px;

‎web/env.html‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,16 @@
5151
<a id="newButton" class="cw-button red">
5252
<i class="mdi mdi-18px mdi-plus"></i>&nbsp; New
5353
</a>
54-
<a id="saveButton" class="cw-button blue" style="display: none;">
54+
<a id="saveButton" class="cw-button blue" style="display: none">
5555
<i class="mdi mdi-18px mdi-cloud-upload"></i>&nbsp; Save
5656
</a>
5757
<a id="saveAsButton" class="cw-button blue">
5858
<i class="mdi mdi-18px mdi-dots-horizontal"></i>&nbsp; Save As
5959
</a>
60-
<a id="deleteButton" class="cw-button red" style="display: none;">
60+
<a id="deleteButton" class="cw-button red" style="display: none">
6161
<i class="mdi mdi-18px mdi-delete"></i>&nbsp; Delete
6262
</a>
63-
<a
64-
id="downloadButton"
65-
class="cw-button blue"
66-
style="display: none;"
67-
>
63+
<a id="downloadButton" class="cw-button blue" style="display: none">
6864
<i class="mdi mdi-18px mdi-download"></i>&nbsp; Download
6965
</a>
7066
</div>
@@ -75,7 +71,7 @@
7571
<textarea id="editor" placeholder="Type your code here..."></textarea>
7672
</form>
7773

78-
<div id="result" style="display: none;" class="ui-layout-east">
74+
<div id="result" style="display: none" class="ui-layout-east">
7975
<div class="runner-box">
8076
<div id="obsolete-code-alert" class="obsolete-code-alert-fadeout">
8177
Changes detected. Press 'Run' button to compile your current code.
@@ -95,13 +91,13 @@
9591
id="navButton"
9692
class="cw-button blue"
9793
onclick="window.mainLayout.toggle('west')"
98-
style="display: none;"
94+
style="display: none"
9995
><i class="mdi mdi-18px mdi-menu"></i
10096
></a>
10197
<a id="signin" class="cw-button blue"
10298
><i class="mdi mdi-18px mdi-login"></i>&nbsp; Sign In</a
10399
>
104-
<a id="signout" class="cw-button blue" style="display: none;"
100+
<a id="signout" class="cw-button blue" style="display: none"
105101
><i class="mdi mdi-18px mdi-logout"></i>&nbsp; Sign Out</a
106102
>
107103
<a id="docButton" class="cw-button blue"
@@ -127,32 +123,32 @@
127123
<a
128124
id="shareFolderButton"
129125
class="cw-button yellow"
130-
style="display: none;"
126+
style="display: none"
131127
><i class="mdi mdi-18px mdi-folder-outline"></i>&nbsp; Share
132128
Folder</a
133129
>
134130
<span
135131
><i
136132
class="mdi mdi-24px mdi-record"
137-
style="display: none;"
133+
style="display: none"
138134
id="recordIcon"
139135
>
140136
<!--Recording Icon--></i
141137
></span
142138
>
143-
<a id="startRecButton" style="display: none;" class="cw-button red"
139+
<a id="startRecButton" style="display: none" class="cw-button red"
144140
><i class="mdi mdi-18px mdi-record"></i>&nbsp; Start Recording</a
145141
>
146-
<a id="stopRecButton" style="display: none;" class="cw-button yellow"
142+
<a id="stopRecButton" style="display: none" class="cw-button yellow"
147143
><i class="mdi mdi-18px mdi-stop"></i>&nbsp; Stop Recording</a
148144
>
149-
<a id="shareButton" class="cw-button yellow" style="display: none;"
145+
<a id="shareButton" class="cw-button yellow cw-button--disabled"
150146
><i class="mdi mdi-18px mdi-share"></i>&nbsp; Share</a
151147
>
152148
<a
153149
id="inspectButton"
154150
class="inspect-button cw-button cyan"
155-
style="display: none;"
151+
style="display: none"
156152
><i class="mdi mdi-18px mdi-magnify"></i>&nbsp; Inspect</a
157153
>
158154
<a id="stopButton" class="cw-button red"

‎web/js/codeworld.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function attachEventListeners() {
7070

7171
$('#startRecButton').on('click', captureStart);
7272
$('#stopRecButton').on('click', stopRecording);
73-
$('#shareButton').on('click', () => share(compile));
73+
$('#shareButton').on('click', share);
7474
$('#inspectButton').on('click', inspect);
7575

7676
$('#runButton').on('click', compile);
@@ -491,6 +491,14 @@ function initCodeworld() {
491491
}
492492
window.reparseTimeoutId = setTimeout(parseSymbolsFromCurrentCode, 1500);
493493

494+
const shareButton = document.getElementById('shareButton');
495+
496+
if (doc.getValue()) {
497+
shareButton.classList.remove('cw-button--disabled');
498+
} else {
499+
shareButton.classList.add('cw-button--disabled');
500+
}
501+
494502
updateDocumentTitle(isEditorClean);
495503
updateProjectChangeMark(isEditorClean);
496504

0 commit comments

Comments
 (0)