Skip to content

Commit 9a9577c

Browse files
author
Lanny McNie
committed
Changed path order in demos to get around Firefox issues.
Signed-off-by: Lanny McNie <[email protected]>
1 parent af65660 commit 9a9577c

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

‎examples/Game.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ <h1>Sorry!</h1>
138138
// begin loading content (only sounds to load)
139139
var assetsPath = "assets/";
140140
manifest = [
141-
{id:"begin", src:"Game-Spawn.mp3|Game-Spawn.ogg"},
142-
{id:"break", src:"Game-Break.mp3|Game-Break.ogg", data:6},
143-
{id:"death", src:"Game-Death.mp3|Game-Death.ogg"},
144-
{id:"laser", src:"Game-Shot.mp3|Game-Shot.ogg", data:6},
145-
{id:"music", src:"18-machinae_supremacy-lord_krutors_dominion.mp3|18-machinae_supremacy-lord_krutors_dominion.ogg"}
141+
{id:"begin", src:"Game-Spawn.ogg|Game-Spawn.mp3"},
142+
{id:"break", src:"Game-Break.ogg|Game-Break.mp3", data:6},
143+
{id:"death", src:"Game-Death.ogg|Game-Death.mp3"},
144+
{id:"laser", src:"Game-Shot.ogg|Game-Shot.mp3", data:6},
145+
{id:"music", src:"18-machinae_supremacy-lord_krutors_dominion.ogg|18-machinae_supremacy-lord_krutors_dominion.mp3"}
146146
];
147147

148148
preload = new createjs.LoadQueue();

‎examples/JustPlay.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ <h1>Sorry!</h1>
7272

7373
// Create a single item to load.
7474
var assetsPath = "assets/";
75-
src = assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg";
75+
src = assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3";
7676
// NOTE the "|" character is used by Sound to separate source into distinct files, which allows you to provide multiple extensions for wider browser support
7777

7878
//createjs.Sound.onLoadComplete = playSound; // add a callback for when load is completed

‎examples/MediaPlayer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ <h1>Sorry!</h1>
156156

157157
document.getElementById("loader").className = "loader";
158158
var assetPath = "assets/";
159-
var src = assetPath+"M-GameBG.mp3|"+assetPath+"M-GameBG.ogg";
159+
var src = assetPath+"M-GameBG.ogg|"+assetPath+"M-GameBG.mp3";
160160

161161
createjs.Sound.addEventListener("fileload", createjs.proxy(handleLoadComplete,this)); // add an event listener for when load is completed
162162
createjs.Sound.registerSound(src, "music");

‎examples/MobileSafe.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ <h1>Sorry!</h1>
9595

9696
// Create a single item to load.
9797
var assetsPath = "assets/";
98-
this.src = assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg";
98+
this.src = assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3";
9999
// NOTE the "|" character is used by Sound to separate source into distinct files, which allows you to provide multiple extensions for wider browser support
100100

101101
this.displayStatus.innerHTML = "Waiting for load to complete."; // let the user know what's happening

‎examples/PreloadAndPlay.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ <h1>Sorry!</h1>
109109

110110
// Create a single item to load.
111111
var assetsPath = "assets/";
112-
var item = {src:assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg", id:"music"};
112+
var item = {src:assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3", id:"music"};
113113
var manifest = [
114-
{id:"music", src:assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg"}
114+
{id:"music", src:assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3"}
115115
]
116116

117117
// Instantiate a queue.

‎examples/SoundExplosion.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ <h1>Sorry!</h1>
9696
// set up our manifest of assets to load
9797
var assetsPath = "assets/";
9898
var manifest = [
99-
{src:"Game-Break.mp3|Game-Break.ogg", id:"0"},
100-
{src:"Game-Spawn.mp3|Game-Spawn.ogg", id:"1"},
101-
{src:"Game-Shot.mp3|Game-Shot.ogg", id:"2"},
102-
{src:"Thunder1.mp3|Thunder1.ogg", id:"3"},
103-
{src:"Game-Death.mp3|Game-Death.ogg", id:"4"},
104-
{src:"GU-StealDaisy.mp3|GU-StealDaisy.ogg", id:"bounce", data:soundInstanceLimit}
99+
{src:"Game-Break.ogg|Game-Break.mp3", id:"0"},
100+
{src:"Game-Spawn.ogg|Game-Spawn.mp3", id:"1"},
101+
{src:"Game-Shot.ogg|Game-Shot.mp3", id:"2"},
102+
{src:"Thunder1.ogg|Thunder1.mp3", id:"3"},
103+
{src:"Game-Death.ogg|Game-Death.mp3", id:"4"},
104+
{src:"GU-StealDaisy.ogg|GU-StealDaisy.mp3", id:"bounce", data:soundInstanceLimit}
105105
]
106106

107107
// Instantiate a queue to preload our assets

‎examples/SoundGrid.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,21 @@ <h1>Sorry!</h1>
9999
document.getElementById("loader").className = "loader";
100100
var assetsPath = "assets/";
101101
var manifest = [
102-
{src:"Game-Break.mp3|Game-Break.ogg", id:1},
103-
{src:"Game-Spawn.mp3|Game-Spawn.ogg", id:2},
104-
{src:"Game-Shot.mp3|Game-Shot.ogg", id:3},
102+
{src:"Game-Break.ogg|Game-Break.mp3", id:1},
103+
{src:"Game-Spawn.ogg|Game-Spawn.mp3", id:2},
104+
{src:"Game-Shot.ogg|Game-Shot.mp3", id:3},
105105

106-
{src:"GU-StealDaisy.mp3|GU-StealDaisy.ogg", id:4},
107-
{src:"Humm.mp3|Humm.ogg", id:5},
108-
{src:"R-Damage.mp3|R-Damage.ogg", id:6},
106+
{src:"GU-StealDaisy.ogg|GU-StealDaisy.mp3", id:4},
107+
{src:"Humm.ogg|Humm.mp3", id:5},
108+
{src:"R-Damage.ogg|R-Damage.mp3", id:6},
109109

110-
{src:"Thunder1.mp3|Thunder1.ogg", id:7},
111-
{src:"S-Damage.mp3|S-Damage.ogg", id:8},
112-
{src:"U-CabinBoy3.mp3|U-CabinBoy3.ogg", id:9},
110+
{src:"Thunder1.ogg|Thunder1.mp3", id:7},
111+
{src:"S-Damage.ogg|S-Damage.mp3", id:8},
112+
{src:"U-CabinBoy3.ogg|U-CabinBoy3.mp3", id:9},
113113

114-
{src:"ToneWobble.mp3|ToneWobble.ogg", id:10},
115-
{src:"Game-Death.mp3|Game-Death.ogg", id:11},
116-
{src:"Game-Break.mp3|Game-Break.ogg", id:12} //OJR would prefer a new sound rather than a copy
114+
{src:"ToneWobble.ogg|ToneWobble.mp3", id:10},
115+
{src:"Game-Death.ogg|Game-Death.mp3", id:11},
116+
{src:"Game-Break.ogg|Game-Break.mp3", id:12} //OJR would prefer a new sound rather than a copy
117117
];
118118

119119
createjs.Sound.addEventListener("fileload", createjs.proxy(soundLoaded, this)); // add an event listener for when load is completed

‎examples/SoundTween.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ <h1>Sorry!</h1>
110110

111111
// Create a single item to load.
112112
var assetsPath = "assets/";
113-
src = assetsPath+"M-GameBG.mp3|"+assetsPath+"M-GameBG.ogg";
113+
src = assetsPath+"M-GameBG.ogg|"+assetsPath+"M-GameBG.mp3";
114114
// NOTE the "|" character is used by Sound to separate source into distinct files, which allows you to provide multiple extensions for wider browser support
115115

116116
createjs.Sound.addEventListener("fileload", playSound); // add an event listener for when load is completed

‎examples/TestSuite.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@ <h1>Sorry!</h1>
328328
{id:"Music", src:"M-GameBG.mp3", data:2},
329329
{id:"Humm (mp3)", src:"Humm.mp3"},
330330
{id:"Humm (ogg)", src:"Humm.ogg"},
331-
{id:"Thunder", src:"Thunder1.mp3|Thunder1.ogg", data:3},
332-
{id:"Tone wobble", src:"ToneWobble.mp3|ToneWobble.ogg", type:"sound", data:1},
331+
{id:"Thunder", src:"Thunder1.ogg|Thunder1.mp3", data:3},
332+
{id:"Tone wobble", src:"ToneWobble.ogg|ToneWobble.mp3", type:"sound", data:1},
333333
{id:"Rat Damage", src:"R-Damage.mp3", type:"sound"},
334334
{id:"Seagull Damage", src:"S-Damage.mp3", type:"sound"},
335335
{id:"Cabin Boy", src:"U-CabinBoy3.mp3", type:"sound", data:1}

0 commit comments

Comments
 (0)