Commit 37777828 authored by Neil Fraser's avatar Neil Fraser

Fix disconnect sound in FF.

parent f23702f2
This diff is collapsed.
...@@ -75,9 +75,11 @@ class Gen_uncompressed(threading.Thread): ...@@ -75,9 +75,11 @@ class Gen_uncompressed(threading.Thread):
self.search_paths = search_paths self.search_paths = search_paths
def run(self): def run(self):
target_filename = "blockly_uncompressed.js"
add_dependency = [] add_dependency = []
base_path = calcdeps.FindClosureBasePath(self.search_paths) 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.append(calcdeps.GetDepsLine(dep, base_path))
add_dependency = "\n".join(add_dependency) add_dependency = "\n".join(add_dependency)
# Find the Blockly directory name and replace it with a JS variable. # Find the Blockly directory name and replace it with a JS variable.
...@@ -88,12 +90,11 @@ class Gen_uncompressed(threading.Thread): ...@@ -88,12 +90,11 @@ class Gen_uncompressed(threading.Thread):
"([\\/]core[\\/])", '\\1" + dir + "\\2', add_dependency) "([\\/]core[\\/])", '\\1" + dir + "\\2', add_dependency)
provides = [] provides = []
for dep in calcdeps.BuildDependenciesFromFiles(self.search_paths): for dep in deps:
if not dep.filename.startswith(os.pardir + os.sep): # "../" if not dep.filename.startswith(os.pardir + os.sep): # "../"
provides.extend(dep.provides) provides.extend(dep.provides)
provides.sort() provides.sort()
target_filename = "blockly_uncompressed.js"
f = open(target_filename, "w") f = open(target_filename, "w")
f.write(HEADER) f.write(HEADER)
f.write(""" f.write("""
......
...@@ -511,9 +511,9 @@ Blockly.init_ = function(mainWorkspace) { ...@@ -511,9 +511,9 @@ Blockly.init_ = function(mainWorkspace) {
options.pathToMedia + 'click.wav', options.pathToMedia + 'click.wav',
options.pathToMedia + 'click.ogg'], 'click'); options.pathToMedia + 'click.ogg'], 'click');
mainWorkspace.loadAudio_( mainWorkspace.loadAudio_(
[options.pathToMedia + 'disconnect.mp3', [options.pathToMedia + 'disconnect.wav',
options.pathToMedia + 'disconnect.ogg', options.pathToMedia + 'disconnect.mp3',
options.pathToMedia + 'disconnect.wav'], 'disconnect'); options.pathToMedia + 'disconnect.ogg'], 'disconnect');
mainWorkspace.loadAudio_( mainWorkspace.loadAudio_(
[options.pathToMedia + 'delete.mp3', [options.pathToMedia + 'delete.mp3',
options.pathToMedia + 'delete.ogg', options.pathToMedia + 'delete.ogg',
......
No preview for this file type
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment