Merge branch 'release-1.1.0'

CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+## 1.1.0 — 2016.03.24
+
+### New features
+* Allow notes to be sustained. [#12](https://github.com/sunyatasattva/overtones/issues/12)  
+* Sound details show intervals between sustained notes.
+* Allows decimals in frequency input. [#35](https://github.com/sunyatasattva/overtones/issues/35)  
+* Added frequency input shortcuts: <kbd>ARROW UP/DOWN</kbd> changes the frequency in increments of one; doing so while holding <kbd>SHIFT</kbd>, changes the frequency in increments of 10, holding <kbd>ALT</kbd> in increments of 0.1. [#33](https://github.com/sunyatasattva/overtones/issues/33)  
+* Adds a secret Easter Egg. :see_no_evil: 
+
+### Changes
+* Changed the way notes name appear in the detail section. [#30](https://github.com/sunyatasattva/overtones/issues/30)  
+* Changed *"Issue"* text with *"Feedback"*.
+
+### Fixes
+* Correct accidental symbols (showing ♯ and♭instead of # and b). [#32](https://github.com/sunyatasattva/overtones/issues/32) 
+* Enforces frequency input validation. [#26](https://github.com/sunyatasattva/overtones/issues/26) 
+
+### Behind the hood
+* Support for ES6
+* Functions to calculate Equal Temperament notes given any reference note and any kind of ET. As such, removed hard coded ET frequency data. [#16](https://github.com/sunyatasattva/overtones/issues/16) 
+* Refactored octave reduction function to allow for independent calculations
+
+### [Full changelog](https://github.com/sunyatasattva/overtones/compare/1.0.0...1.1.0)

assets/js/analytics.js

@@ -15,5 +15,8 @@ module.exports = function($){
 		e.idx = e.idx || null;
 
 		window.dataLayer.push({ event: e.type, idx: e.idx, action: action, target: target });
-  	});
+  	})
+	.on('overtones:play:all overtones:easteregg:share', function(e){
+		window.dataLayer.push({ event: e.type });
+	});
 };

assets/js/easter-egg.js

@@ -0,0 +1,63 @@
+var $     = require("jquery");
+var once  = require("./lib/once");
+var Tones = require("./lib/tones");
+
+function secretMusic(){
+	var opts = {
+		attack: 75,
+		decay: 100
+	};
+
+	// Equal temperament 
+	Tones.playFrequency(780, opts)
+	.then( ()=>Tones.playFrequency(739, opts) )
+	.then( ()=>Tones.playFrequency(622, opts) )
+	.then( ()=>Tones.playFrequency(440, opts) )
+	.then( ()=>Tones.playFrequency(415, opts) )
+	.then( ()=>Tones.playFrequency(659, opts) )
+	.then( ()=>Tones.playFrequency(830, opts) )
+	.then( ()=>Tones.playFrequency(1046, opts) )
+
+	// Just intonation
+	Tones.playFrequency(780, opts)
+	.then( ()=>Tones.playFrequency(731.25, opts) )
+	.then( ()=>Tones.playFrequency(624, opts) )
+	.then( ()=>Tones.playFrequency(438, opts) )
+	.then( ()=>Tones.playFrequency(416, opts) )
+	.then( ()=>Tones.playFrequency(650, opts) )
+	.then( ()=>Tones.playFrequency(832, opts) )
+	.then( ()=>Tones.playFrequency(1040, opts) )
+}
+
+module.exports = {
+	init: function() {
+		$(".easter-egg-announcement .shepherd-cancel-link").on("click", function(e){
+			e.preventDefault();
+
+			$(this).closest(".easter-egg-announcement").removeClass("show");
+		});
+
+		$(document).on("overtones:play:all", function(){
+			once(function(){ $(".easter-egg-announcement").addClass("show"); }, 'easterEggFound');
+
+			$("body").addClass("easter-egg");
+			secretMusic();
+
+			$(".share-easter-egg").on("click", function(e){
+				e.preventDefault();
+				try {
+					FB.ui({
+					  method:  "share",
+					  href:    "http://www.suonoterapia.org/overtones"
+					}, function(response){
+						console.log(response);
+						$(".easter-egg-announcement").removeClass("shepherd-open");
+
+						$(document).trigger("overtones:easteregg:share")
+					});
+				}
+				catch(e){ $(".easter-egg-announcement").removeClass("shepherd-open"); }
+			});
+		});
+	}
+}