scratch – Diff between revs 79 and 80

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 79 Rev 80
Line 141... Line 141...
141 </script> 141 </script>
142 <!-- Hiss sounds --> 142 <!-- Hiss sounds -->
143 <script> 143 <script>
144 $(document).ready(() => { 144 $(document).ready(() => {
145 // Get the sound cookie. 145 // Get the sound cookie.
146 var play = (Cookies 146 const sound = Cookies.get('sound');
-   147
-   148 if (!createjs.Sound.initializeDefaultPlugins() ||
147 .get('sound') == 'true' 149 createjs.BrowserDetect.isIOS ||
-   150 createjs.BrowserDetect.isAndroid ||
-   151 createjs.BrowserDetect.isBlackberry)
148 ); 152 return;
-   153
149 // Play the sounds. 154 const hiss = [
-   155 "snd/hisses/hiss_1.mp3",
-   156 "snd/hisses/hiss_2.mp3",
-   157 "snd/hisses/hiss_3.mp3",
-   158 "snd/hisses/hiss_4.mp3",
-   159 "snd/hisses/hiss_5.mp3",
150 if(play) { 160 "snd/hisses/hiss_6.mp3",
151 if (!createjs.Sound.initializeDefaultPlugins() || 161 "snd/hisses/hiss_7.mp3",
152 createjs.BrowserDetect.isIOS || 162 "snd/hisses/hiss_8.mp3",
153 createjs.BrowserDetect.isAndroid || 163 "snd/hisses/hiss_9.mp3",
154 createjs.BrowserDetect.isBlackberry) 164 "snd/hisses/hiss_10.mp3",
155 return; 165 ];
Line 156... Line 166...
156 166
157 const hiss = [ -  
158 "snd/hisses/hiss_1.mp3", -  
159 "snd/hisses/hiss_2.mp3", -  
160 "snd/hisses/hiss_3.mp3", -  
161 "snd/hisses/hiss_4.mp3", -  
162 "snd/hisses/hiss_5.mp3", -  
163 "snd/hisses/hiss_6.mp3", -  
164 "snd/hisses/hiss_7.mp3", -  
165 "snd/hisses/hiss_8.mp3", -  
166 "snd/hisses/hiss_9.mp3", -  
167 "snd/hisses/hiss_10.mp3", 167 // Play the sounds.
168 ]; -  
169   168 if(sound != 'off') {
170 createjs.Sound.onLoadComplete = 169 createjs.Sound.onLoadComplete =
171 (event) => createjs.Sound.play(event.src); 170 (event) => createjs.Sound.play(event.src);
172 createjs.Sound.addEventListener("fileload", 171 createjs.Sound.addEventListener("fileload",
173 (event) => createjs.Sound.play(event.src)); 172 (event) => createjs.Sound.play(event.src));
Line 176... Line 175...
176 ); 175 );
177 } 176 }
Line 178... Line 177...
178 177
179 // Load the toggle. 178 // Load the toggle.
180 $('#toggle-sound').bootstrapToggle({ 179 $('#toggle-sound').bootstrapToggle({
181 on: 'Annoy Kitty', 180 on: 'Pet Kitty',
182 off: 'Pat Kitty', 181 off: 'Annoy Kitty',
183 onstyle: "success", 182 onstyle: "danger",
-   183 offstyle: "success"
-   184 });
-   185 $('#toggle-sound')
184 offstyle: "danger" 186 .bootstrapToggle(sound)
-   187 .change(() => {
185 }).change(() => { 188 var checked = $('#toggle-sound').is(":checked");
186 Cookies.set('sound', 189 Cookies.set('sound',
187 !$('#toggle-sound') -  
188 .is(":checked") 190 checked ? 'on' : 'off'
-   191 );
-   192 if(checked) {
-   193 createjs.Sound.onLoadComplete =
-   194 (event) => createjs.Sound.play(event.src);
-   195 createjs.Sound.addEventListener("fileload",
-   196 (event) => createjs.Sound.play(event.src));
-   197 createjs.Sound.registerSound(
189 ); 198 hiss[~~(Math.random() * hiss.length)]
190 }) 199 );
191 .prop('checked', !play) 200 }
192 .change() 201 });
193 }); 202 });
194 </script> 203 </script>
195 </body> 204 </body>