Skip to content

Commit

Permalink
Merge branch 'hotfix'
Browse files Browse the repository at this point in the history
* hotfix:
  Fixing problem with setter in webkit-audiocontext-patch. Fixes #44.
  Fixes overtone circle scaling coordinates issue. Fixes #43.
  Fixing some dependencies issues.
  • Loading branch information
sunyatasattva committed Jul 16, 2017
2 parents e793c7b + 0b2c96f commit e7e9240
Show file tree
Hide file tree
Showing 6 changed files with 8,245 additions and 78 deletions.
4 changes: 2 additions & 2 deletions assets/js/lib/webkit-audiocontext-patch.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ module.exports = function(){

Object.defineProperty(OscillatorNode.prototype, "type", {
get: function() {
return ["sine", "square", "sawtooth", "triangle", "custom"][this.type];
return ["sine", "square", "sawtooth", "triangle", "custom"][this._type];
},
set: function(type) {
this.type = OscillatorNode.prototype[type.toUpperCase()] || type;
this._type = OscillatorNode.prototype[type.toUpperCase()] || type;
}
});
}
Expand Down
21 changes: 0 additions & 21 deletions assets/styles/_browsers.scss
Original file line number Diff line number Diff line change
@@ -1,21 +0,0 @@
/*
* Slightly degrading Firefox users experience.
*
* Firefox defaults the `transform-box` property of SVGs to the viewport
* instead of `fill-box`. The CSS cannot be modified in the release without
* setting a pref. So, for the time being, we are changing the experience of
* the user in this case.
*
* @see https://bugzilla.mozilla.org/show_bug.cgi?id=1208550
*/

.firefox {
.overtone { opacity: 0.9; }

.overtone:hover,
.overtone:active,
.overtone.active {
opacity: 1;
transform: scale(1);
}
}
1 change: 1 addition & 0 deletions assets/styles/_components/_overtone-spiral.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

.overtone {
transform: scale(1);
transform-box: fill-box;
transform-origin: 50% 50%;
transition: all 0.2s ease-in-out;

Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h2>Options</h2>

<footer>
<button href="#" id="help">?</button>
<p class="credits">Designed and crafted with joy by <a href="https://facebook.com/sunyatasattva">Marco Lucio Giannotta</a> and <a href="https://www.facebook.com/skye.lofvander">Skye Løfvander</a>. <span class="version">Version <a href="https://github.com/sunyatasattva/overtones/releases/">1.1.2</a></span></p>
<p class="credits">Designed and crafted with joy by <a href="https://facebook.com/sunyatasattva">Marco Lucio Giannotta</a> and <a href="https://www.facebook.com/skye.lofvander">Skye Løfvander</a>. <span class="version">Version <a href="https://github.com/sunyatasattva/overtones/releases/">1.1.3</a></span></p>
<div class="social">
<!--=include components/_facebook.html -->
<!--=include components/_twitter.html -->
Expand Down
Loading

0 comments on commit e7e9240

Please sign in to comment.