Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
ardublockly
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
ardublockly
Commits
37777828
Commit
37777828
authored
Sep 22, 2015
by
Neil Fraser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix disconnect sound in FF.
parent
f23702f2
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
13 deletions
+14
-13
blockly_compressed.js
blockly_compressed.js
+7
-7
build.py
build.py
+4
-3
core/inject.js
core/inject.js
+3
-3
media/disconnect.wav
media/disconnect.wav
+0
-0
No files found.
blockly_compressed.js
View file @
37777828
This diff is collapsed.
Click to expand it.
build.py
View file @
37777828
...
...
@@ -75,9 +75,11 @@ class Gen_uncompressed(threading.Thread):
self
.
search_paths
=
search_paths
def
run
(
self
):
target_filename
=
"blockly_uncompressed.js"
add_dependency
=
[]
base_path
=
calcdeps
.
FindClosureBasePath
(
self
.
search_paths
)
for
dep
in
calcdeps
.
BuildDependenciesFromFiles
(
self
.
search_paths
):
deps
=
calcdeps
.
BuildDependenciesFromFiles
(
self
.
search_paths
)
for
dep
in
deps
:
add_dependency
.
append
(
calcdeps
.
GetDepsLine
(
dep
,
base_path
))
add_dependency
=
"
\n
"
.
join
(
add_dependency
)
# Find the Blockly directory name and replace it with a JS variable.
...
...
@@ -88,12 +90,11 @@ class Gen_uncompressed(threading.Thread):
"([
\\
/]core[
\\
/])"
,
'
\\
1" + dir + "
\\
2'
,
add_dependency
)
provides
=
[]
for
dep
in
calcdeps
.
BuildDependenciesFromFiles
(
self
.
search_paths
)
:
for
dep
in
deps
:
if
not
dep
.
filename
.
startswith
(
os
.
pardir
+
os
.
sep
):
# "../"
provides
.
extend
(
dep
.
provides
)
provides
.
sort
()
target_filename
=
"blockly_uncompressed.js"
f
=
open
(
target_filename
,
"w"
)
f
.
write
(
HEADER
)
f
.
write
(
"""
...
...
core/inject.js
View file @
37777828
...
...
@@ -511,9 +511,9 @@ Blockly.init_ = function(mainWorkspace) {
options
.
pathToMedia
+
'
click.wav
'
,
options
.
pathToMedia
+
'
click.ogg
'
],
'
click
'
);
mainWorkspace
.
loadAudio_
(
[
options
.
pathToMedia
+
'
disconnect.
mp3
'
,
options
.
pathToMedia
+
'
disconnect.
ogg
'
,
options
.
pathToMedia
+
'
disconnect.
wav
'
],
'
disconnect
'
);
[
options
.
pathToMedia
+
'
disconnect.
wav
'
,
options
.
pathToMedia
+
'
disconnect.
mp3
'
,
options
.
pathToMedia
+
'
disconnect.
ogg
'
],
'
disconnect
'
);
mainWorkspace
.
loadAudio_
(
[
options
.
pathToMedia
+
'
delete.mp3
'
,
options
.
pathToMedia
+
'
delete.ogg
'
,
...
...
media/disconnect.wav
View file @
37777828
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment