scratch – Diff between revs 76 and 79

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 76 Rev 79
Line 13... Line 13...
13   13  
14 <!-- Bootstrap core CSS --> 14 <!-- Bootstrap core CSS -->
15 <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> 15 <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
16 <!-- Font Awesome --> 16 <!-- Font Awesome -->
-   17 <link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-   18 <!-- Bootstrap Toggle -->
Line 17... Line 19...
17 <link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet"> 19 <link href="bower_components/bootstrap-toggle/css/bootstrap-toggle.min.css" rel="stylesheet">
18 20
19 <!-- Site-wide style CCS --> 21 <!-- Site-wide style CCS -->
Line 28... Line 30...
28 <h1>scratch copy</h1> 30 <h1>scratch copy</h1>
29 <p class="quote">the asset sharer</p> 31 <p class="quote">the asset sharer</p>
30 </div> 32 </div>
Line 31... Line 33...
31 33
-   34 <div class="container">
-   35 <div class="pull-right">
-   36 <input id="toggle-sound" type="checkbox">
32 <div class="container"> 37 </div>
33 38
34 <ul class="nav nav-tabs"> 39 <ul class="nav nav-tabs">
35 <li class="active"><a href="#">Home</a></li> 40 <li class="active"><a href="#">Home</a></li>
36 <li><a href="file.html">File</a></li> 41 <li><a href="file.html">File</a></li>
37 <li><a href="text.html">Text</a></li> 42 <li><a href="text.html">Text</a></li>
Line 102... Line 107...
102 <script src="bower_components/jquery/dist/jquery.min.js"></script> 107 <script src="bower_components/jquery/dist/jquery.min.js"></script>
103 <!-- Angular JS --> 108 <!-- Angular JS -->
104 <script src="bower_components/angular/angular.min.js"></script> 109 <script src="bower_components/angular/angular.min.js"></script>
105 <!-- BootStrap --> 110 <!-- BootStrap -->
106 <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> 111 <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
-   112 <!-- BootStrap Toggle -->
-   113 <script src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
107 <!-- SoundJS --> 114 <!-- SoundJS -->
108 <script src="bower_components/SoundJS/lib/soundjs-NEXT.combined.js"></script> 115 <script src="bower_components/SoundJS/lib/soundjs-NEXT.combined.js"></script>
109 <!-- YAML --> 116 <!-- YAML -->
110 <script src="bower_components/yaml.js/dist/yaml.min.js"></script> 117 <script src="bower_components/yaml.js/dist/yaml.min.js"></script>
-   118 <!-- js-cookie -->
-   119 <script src="bower_components/js-cookie/src/js.cookie.js"></script>
111 <script> 120 <script>
112 var app = angular.module('scratch', []); 121 var app = angular.module('scratch', []);
113 app.controller('scratch-control', function($scope, $http) { 122 app.controller('scratch-control', function($scope, $http) {
114 $http.get('config.yaml').then((response) => { 123 $http.get('config.yaml').then((response) => {
115 var doc = YAML.parse(response.data); 124 var doc = YAML.parse(response.data);
Line 130... Line 139...
130 parallax(); 139 parallax();
131 }); 140 });
132 </script> 141 </script>
133 <!-- Hiss sounds --> 142 <!-- Hiss sounds -->
134 <script> 143 <script>
135 $(document).ready(() => { 144 $(document).ready(() => {
136 if (!createjs.Sound.initializeDefaultPlugins() || -  
137 createjs.BrowserDetect.isIOS || 145 // Get the sound cookie.
138 createjs.BrowserDetect.isAndroid || -  
139 createjs.BrowserDetect.isBlackberry) -  
140 return; -  
141 -  
142 const hiss = [ 146 var play = (Cookies
143 "snd/hisses/hiss_1.mp3", -  
144 "snd/hisses/hiss_2.mp3", -  
145 "snd/hisses/hiss_3.mp3", -  
146 "snd/hisses/hiss_4.mp3", -  
147 "snd/hisses/hiss_5.mp3", -  
148 "snd/hisses/hiss_6.mp3", -  
149 "snd/hisses/hiss_7.mp3", -  
150 "snd/hisses/hiss_8.mp3", -  
151 "snd/hisses/hiss_9.mp3", -  
152 "snd/hisses/hiss_10.mp3", -  
153 ]; -  
154   -  
155 createjs.Sound.onLoadComplete = -  
156 (event) => createjs.Sound.play(event.src); -  
157 createjs.Sound.addEventListener("fileload", -  
158 (event) => createjs.Sound.play(event.src)); -  
159 createjs.Sound.registerSound( 147 .get('sound') == 'true'
160 hiss[~~(Math.random() * hiss.length)] -  
161 ); 148 );
-   149 // Play the sounds.
-   150 if(play) {
-   151 if (!createjs.Sound.initializeDefaultPlugins() ||
-   152 createjs.BrowserDetect.isIOS ||
-   153 createjs.BrowserDetect.isAndroid ||
-   154 createjs.BrowserDetect.isBlackberry)
-   155 return;
-   156
-   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",
-   168 ];
-   169  
-   170 createjs.Sound.onLoadComplete =
-   171 (event) => createjs.Sound.play(event.src);
-   172 createjs.Sound.addEventListener("fileload",
-   173 (event) => createjs.Sound.play(event.src));
-   174 createjs.Sound.registerSound(
-   175 hiss[~~(Math.random() * hiss.length)]
-   176 );
-   177 }
-   178
-   179 // Load the toggle.
-   180 $('#toggle-sound').bootstrapToggle({
-   181 on: 'Annoy Kitty',
-   182 off: 'Pat Kitty',
-   183 onstyle: "success",
-   184 offstyle: "danger"
-   185 }).change(() => {
-   186 Cookies.set('sound',
-   187 !$('#toggle-sound')
-   188 .is(":checked")
-   189 );
-   190 })
-   191 .prop('checked', !play)
-   192 .change()
162 }); 193 });
163 </script> 194 </script>
164 </body> 195 </body>
165 </html> 196 </html>