diff --git a/README.md b/README.md index a2ee78b..3f7b551 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ storePassword=... pluginManager.onStop(); } -- channel.onStop = cordova.addDocumentEventHandler('stop'); from channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready'); +- channel.onStop = cordova.addDocumentEventHandler('stop'); - case 'stop': after case 'pause': -- add to Android manifest +- add to Android manifest Just search for 'pause' and add the same type of event stuff for 'stop'. This is needed for properly split screening Huegasm with other apps. diff --git a/chrome/app/pods/components/hue-controls/component.js b/chrome/app/pods/components/hue-controls/component.js index 0f20356..06c01d8 100644 --- a/chrome/app/pods/components/hue-controls/component.js +++ b/chrome/app/pods/components/hue-controls/component.js @@ -18,7 +18,7 @@ export default Component.extend({ activeLights: A(), tabList: ["Lights", "Music"], - selectedTab: 1, + selectedTab: 0, pauseLightUpdates: false, displayFailure: true, @@ -105,6 +105,7 @@ export default Component.extend({ fail(); } else if (status === 'success' && JSON.stringify(this.get('lightsData')) !== JSON.stringify(result)) { this.set('lightsData', result); + chrome.storage.local.set({ 'lightsData': result }); } }).fail(fail); } @@ -120,6 +121,7 @@ export default Component.extend({ chrome.storage.local.remove('bridgeUsername'); chrome.storage.local.remove('bridgeIp'); location.reload(); + chrome.runtime.sendMessage({ action: 'stop-listening' }); }, toggleDimmer() { this.sendAction('toggleDimmer'); @@ -130,6 +132,7 @@ export default Component.extend({ clearAllSettings() { chrome.storage.local.clear(); location.reload(); + chrome.runtime.sendMessage({ action: 'stop-listening' }); } } }); diff --git a/chrome/app/pods/components/light-group/component.js b/chrome/app/pods/components/light-group/component.js index cb2679a..b0d3e08 100644 --- a/chrome/app/pods/components/light-group/component.js +++ b/chrome/app/pods/components/light-group/component.js @@ -93,19 +93,19 @@ export default Component.extend({ this._super(...arguments); let lightsData = this.get('lightsData'), - activeLights = this.get('activeLights'); + _activeLights = this.get('activeLights'); - chrome.storage.local.get('activeLights', ({activeLightsCache}) => { - if (!isNone(activeLightsCache)) { - activeLightsCache.forEach(function (i) { + chrome.storage.local.get('activeLights', ({activeLights}) => { + if (!isNone(activeLights)) { + activeLights.forEach(function (i) { if (!isNone(lightsData) && lightsData.hasOwnProperty(i) && lightsData[i].state.reachable) { - activeLights.pushObject(i); + _activeLights.pushObject(i); } }); } else { for (let key in lightsData) { if (lightsData.hasOwnProperty(key) && lightsData[key].state.reachable) { - activeLights.pushObject(key); + _activeLights.pushObject(key); } } } diff --git a/chrome/app/pods/components/music-tab/component.js b/chrome/app/pods/components/music-tab/component.js index ca9e98a..714c7bd 100644 --- a/chrome/app/pods/components/music-tab/component.js +++ b/chrome/app/pods/components/music-tab/component.js @@ -8,7 +8,7 @@ const { isNone, $, inject: { service }, - run: { later, next, once } + run: { later, once, next } } = Ember; export default Component.extend({ @@ -101,34 +101,57 @@ export default Component.extend({ lastLightBopIndex: 0, - colorloopMode: false, - flashingTransitions: false, - songBeatPreferences: {}, usingBeatPreferences: false, oldBeatPrefCache: null, isListenining: false, + firstVisit: true, // noUiSlider connection specification filledConnect: [true, false], hueRangeConnect: [false, true, false], - onConfigItemChanged: observer('threshold', 'flashingTransitions', 'colorloopMode', 'hueRange', 'brightnessRange', 'isListenining', function (wtf, name) { + onActive: observer('active', function () { + if (this.get('active') && this.get('firstVisit')) { + chrome.storage.local.set({ firstVisit: false }); + this.set('firstVisit', false); + + next(this, () => { + this.$('#fancy-button-wrapper a').popover('show'); + + later(this, () => { + this.$('#fancy-button-wrapper a').popover('hide'); + }, 5000); + }); + } + }), + + onConfigItemChanged: observer('threshold', 'hueRange', 'brightnessRange', 'isListenining', function (wtf, name) { once(this, () => { let value = this.get(name), self = this; this.set(name, value); - if (name === 'isListenining' && value) { - chrome.runtime.sendMessage({ action: 'start-listening' }, function (response) { - if (response && response.error) { - self.get('notify').warning({ html: '' }); + if (name === 'isListenining') { + if (value) { + chrome.storage.local.get('currentlyListenining', ({currentlyListenining}) => { + if (!currentlyListenining) { + chrome.runtime.sendMessage({ action: 'start-listening' }, function (response) { + if (response && response.error) { + self.get('notify').warning({ html: '' }); - self.set('isListenining', false); - chrome.storage.local.set({ isListenining: false }); - } - }); + self.set('isListenining', false); + chrome.storage.local.set({ isListenining: false }); + } + }); + } + }); + } else { + chrome.runtime.sendMessage({ action: 'stop-listening' }); + } + + this.set('pauseLightUpdates', value); } let toSave = {}; @@ -138,13 +161,11 @@ export default Component.extend({ }), simulateKick() { - this.speakerBump(); + this.buttonBump(); let activeLights = this.get('activeLights'), lightsData = this.get('lightsData'), color = null, - - transitiontime = this.get('flashingTransitions'), stimulateLight = (light, brightness, hue) => { let options = { 'bri': brightness }; @@ -173,6 +194,7 @@ export default Component.extend({ if (activeLights.length > 0) { let lastLightBopIndex = this.get('lastLightBopIndex'), lightBopIndex, + hueRange = this.get('hueRange'), brightnessRange = this.get('brightnessRange'), light; @@ -188,15 +210,7 @@ export default Component.extend({ light = activeLights[lightBopIndex]; this.set('lastLightBopIndex', lightBopIndex); - if (!this.get('colorloopMode')) { - let hueRange = this.get('hueRange'); - - color = Math.floor(Math.random() * (hueRange[1] - hueRange[0] + 1) + hueRange[0]); - } - - if (transitiontime) { - timeToBriOff = 80; - } + color = Math.floor(Math.random() * (hueRange[1] - hueRange[0] + 1) + hueRange[0]); stimulateLight(light, brightnessRange[1], color); later(this, stimulateLight, light, brightnessRange[0], timeToBriOff); @@ -205,35 +219,28 @@ export default Component.extend({ this.set('paused', true); later(this, function () { this.set('paused', false); - }, 150); + }, 200); }, - speakerBump() { - $('#beat-speaker-center-outer').velocity({ blur: 3 }, 100).velocity({ blur: 0 }, 100); - $('#beat-speaker-center-inner').velocity({ scale: 1.05 }, 100).velocity({ scale: 1 }, 100); + buttonBump() { + $('.fancy-button').velocity({ scale: 1.05 }, 100).velocity({ scale: 1 }, 100); }, init() { this._super(...arguments); + chrome.runtime.onMessage.addListener((request, sender, sendResponse) => { + if (request.action === 'button-bump') { + this.buttonBump(); + } + }); + chrome.storage.local.get('threshold', ({threshold}) => { if (!isNone(threshold)) { this.set('threshold', threshold); } }); - chrome.storage.local.get('flashingTransitions', ({flashingTransitions}) => { - if (!isNone(flashingTransitions)) { - this.set('flashingTransitions', flashingTransitions); - } - }); - - chrome.storage.local.get('colorloopMode', ({colorloopMode}) => { - if (!isNone(colorloopMode)) { - this.set('colorloopMode', colorloopMode); - } - }); - chrome.storage.local.get('hueRange', ({hueRange}) => { if (!isNone(hueRange)) { this.set('hueRange', hueRange); @@ -251,6 +258,12 @@ export default Component.extend({ this.set('isListenining', isListenining); } }); + + chrome.storage.local.get('firstVisit', ({firstVisit}) => { + if (!isNone(firstVisit)) { + this.set('firstVisit', firstVisit); + } + }); }, didInsertElement() { @@ -264,12 +277,6 @@ export default Component.extend({ toggleListening() { this.toggleProperty('isListenining'); }, - clickSpeaker() { - this.simulateKick(); - }, - hideTooltip() { - $('.bootstrap-tooltip').tooltip('hide'); - }, toggleDimmer() { this.sendAction('toggleDimmer'); } diff --git a/chrome/app/pods/components/music-tab/template.hbs b/chrome/app/pods/components/music-tab/template.hbs index acc79a7..6f16ca3 100644 --- a/chrome/app/pods/components/music-tab/template.hbs +++ b/chrome/app/pods/components/music-tab/template.hbs @@ -1,5 +1,6 @@
- +
@@ -34,35 +35,6 @@ {{range-slider start=threshold orientation="vertical" step=beatOptions.threshold.step range=beatOptions.threshold.range on-change=(action (mut threshold)) pips=beatOptions.threshold.pips}}
- -
- - {{paper-checkbox value=flashingTransitions onChange=(action (mut flashingTransitions)) label="Flashing Transitions"}} - - - - {{paper-checkbox value=colorloopMode onChange=(action (mut colorloopMode)) label="Colorloop"}} - -
- - - -
-
-
-
-
-
-
-
-
-
- -
-
-
\ No newline at end of file diff --git a/chrome/app/styles/app.scss b/chrome/app/styles/app.scss index 8940a6f..c956e2e 100644 --- a/chrome/app/styles/app.scss +++ b/chrome/app/styles/app.scss @@ -9,7 +9,6 @@ @import 'bridge-finder'; @import 'common'; @import 'dimmer'; -@import 'fancy-speaker'; @import 'hue-controls'; @import 'light-group'; @import 'music-tab'; @@ -17,6 +16,7 @@ body { min-width: 500px; + font-size: 13px; } body > .ember-view { diff --git a/chrome/app/styles/bootstrap.scss b/chrome/app/styles/bootstrap.scss index f5e4339..75d3fa7 100644 --- a/chrome/app/styles/bootstrap.scss +++ b/chrome/app/styles/bootstrap.scss @@ -48,7 +48,7 @@ // Components w/ JavaScript //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/modals"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; -//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/popovers"; +@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/popovers"; //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/carousel"; // Utility classes diff --git a/chrome/app/styles/fancy-speaker.scss b/chrome/app/styles/fancy-speaker.scss deleted file mode 100644 index b9e1ac7..0000000 --- a/chrome/app/styles/fancy-speaker.scss +++ /dev/null @@ -1,101 +0,0 @@ -$centersize: 80px; -$center1size: 205px; -$bezelsize: 240px; - -%base { - border-radius: 100%; -} -%rivet { - position: absolute; - height: 8px; - width: 8px; - background-color: #555; - border-radius: 100%; - box-shadow: inset 0 0 3px #000, 0 0 2px #000; -} - -#beat-speaker-center-inner { - @extend %base; - height: $centersize; - width: $centersize; - position: absolute; - bottom: 47px; - right: 47px; - -webkit-filter: blur(1px); - filter: blur(1px); - background: rgb(0,0,0); - background: -moz-radial-gradient(center, ellipse cover, rgba(0,0,0,1) 0%, rgba(79,79,79,1) 0%, rgba(0,0,0,1) 100%); - background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(0,0,0,1)), color-stop(0%,rgba(79,79,79,1)), color-stop(100%,rgba(0,0,0,1))); - background: -webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,1) 0%,rgba(79,79,79,1) 0%,rgba(0,0,0,1) 100%); - background: -o-radial-gradient(center, ellipse cover, rgba(0,0,0,1) 0%,rgba(79,79,79,1) 0%,rgba(0,0,0,1) 100%); - background: -ms-radial-gradient(center, ellipse cover, rgba(0,0,0,1) 0%,rgba(79,79,79,1) 0%,rgba(0,0,0,1) 100%); - background: radial-gradient(ellipse at center, rgba(0,0,0,1) 0%,rgba(79,79,79,1) 0%,rgba(0,0,0,1) 100%); - box-shadow: 0 0 10px rgba(0, 0, 0, 1); -} - -#beat-speaker-center-outer { - @extend %base; - position: absolute; - top: 16px; - left: 16px; - height: $center1size; - width: $center1size; - border: 15px solid #333; - box-shadow: -3px -3px 15px rgba(0, 0, 0, 0.4), inset -3px -3px 15px rgba(0, 0, 0, 0.5); - background: -moz-linear-gradient(130deg, rgba(117, 117, 117, 1) 55%, rgba(220, 220, 220, 1) 100%); - background: -webkit-linear-gradient(130deg, rgba(117, 117, 117, 1) 55%, rgba(220, 220, 220, 1) 100%); - background: -o-linear-gradient(130deg, rgba(117, 117, 117, 1) 55%, rgba(220, 220, 220, 1) 100%); - background: -ms-linear-gradient(130deg, rgba(117, 117, 117, 1) 55%, rgba(220, 220, 220, 1) 100%); - background: linear-gradient(130deg, rgba(117, 117, 117, 1) 55%, rgba(220, 220, 220, 1) 100%); -} - -.bezel { - @extend %base; - margin: 0 auto; - height: $bezelsize; - width: $bezelsize; - position: relative; - background-color: #A8A8A8; - box-shadow: 0 0 10px rgba(0, 0, 0, 0.8), inset 3px 3px 10px rgba(0, 0, 0, 0.8), 0 0 2px rgba(0, 0, 0, 0.8), inset 0 0 30px -5px rgba(0, 0, 0, 0.8); -} - -.rivet1 { - @extend %rivet; - top: 6px; - left: 50%; -} -.rivet2 { - @extend %rivet; - bottom: 6px; - left: 50%; -} -.rivet3 { - @extend %rivet; - top: 50%; - left: 6px; -} -.rivet4 { - @extend %rivet; - top: 50%; - right: 6px; -} -.rivet5 { - @extend %rivet; - top: 18%; - left: 13.7%; -} -.rivet6 { - @extend %rivet; - top: 18%; - right: 13.5%; -} -.rivet7 { - @extend %rivet; - bottom: 17%; - left: 13.5%; -} -.rivet8 { - @extend %rivet; - bottom: 17%; - right: 13.5%; -} diff --git a/chrome/app/styles/hue-controls.scss b/chrome/app/styles/hue-controls.scss index 8e7e3dd..ec961c1 100644 --- a/chrome/app/styles/hue-controls.scss +++ b/chrome/app/styles/hue-controls.scss @@ -33,7 +33,7 @@ } #navigation { - padding: 10px 0 2vh; + padding: 5px 0 2vh; text-align: center; margin: auto; position: relative; @@ -48,7 +48,7 @@ } .navigation-item { - font-size: 20px; + font-size: 18px; padding: 0 10px 0 10px; &.active { font-weight: bold; @@ -102,7 +102,7 @@ @media(min-width:767px) { #lights-tab { - font-size: 20px; + font-size: 18px; .paper-icon { font-size: 24px; } diff --git a/chrome/app/styles/music-tab.scss b/chrome/app/styles/music-tab.scss index e7af8fd..7aefd98 100644 --- a/chrome/app/styles/music-tab.scss +++ b/chrome/app/styles/music-tab.scss @@ -4,28 +4,18 @@ #music-tab { padding: 0; - margin-top: 10px; - margin-bottom: 20px; + margin-top: 20px; } #beat-area { position: relative; - padding: 0; + padding: 0 0 10px; } #beat-option-button-group { margin: 20px 0 10px 0; } -#light-option { - margin-top: 20px; - display: flex; - justify-content: space-around; - .md-label { - width: auto; - } -} - .beat-option { padding: 5px 0; text-align: center; @@ -37,7 +27,7 @@ } .option-description { display: inline-flex; - font-size: 18px; + font-size: 16px; justify-content: center; flex-direction: column; padding: 10px 0; @@ -61,11 +51,6 @@ align-items: center; } -#beat-container { - display: flex; - margin-bottom: 10px; -} - #beat-area .light-group { margin: 10px 20px 0 40px; float: right; @@ -91,22 +76,18 @@ } .fancy-button { - background-image: -webkit-linear-gradient(top, #f4f1ee, #fff); - background-image: linear-gradient(top, #f4f1ee, #fff); border-radius: 50%; - box-shadow: 0px 8px 10px 0px rgba(0, 0, 0, .3), inset 0px 4px 1px 1px white, inset 0px -3px 1px 1px rgba(204,198,197,.5); + box-shadow: 0 2px 10px 2px rgba(0, 0, 0, .3), inset 0 4px 1px 1px white, inset 0 -3px 1px 1px rgba(204,198,197,.5); float:left; height: 90px; - margin: 0 30px 30px 0; position: relative; - width: 90px; - -webkit-transition: all .1s linear; + width: 90px; transition: all .1s linear; &:after { - color:#e9e6e4; + color:rgba(255, 0, 0, 0); content: ""; display: block; - font-size: 50px; + font-size: 55px; height: 30px; text-decoration: none; text-shadow: 0px -1px 1px #bdb5b4, 1px 1px 1px white; @@ -136,7 +117,7 @@ &:after{ content: "♪"; left: 32px; - top: 14px; + top: 5px; } &:hover:after { color: $secondaryThemeColor; @@ -152,9 +133,6 @@ } @media(max-width: 500px) { - #sensitivity-settings .noUi-value-vertical { - display: none; - } .option-description { height: 55px; } diff --git a/chrome/app/styles/noui-slider.scss b/chrome/app/styles/noui-slider.scss index 06c756b..ac9f2e2 100644 --- a/chrome/app/styles/noui-slider.scss +++ b/chrome/app/styles/noui-slider.scss @@ -51,6 +51,6 @@ } .noUi-vertical { - height: 200px; + height: 180px; margin: 15px auto 10px; } diff --git a/chrome/ember-cli-build.js b/chrome/ember-cli-build.js index b75f4af..81bceda 100644 --- a/chrome/ember-cli-build.js +++ b/chrome/ember-cli-build.js @@ -15,6 +15,7 @@ module.exports = function (defaults) { }); app.import('bower_components/bootstrap-sass/assets/javascripts/bootstrap/tooltip.js'); + app.import('bower_components/bootstrap-sass/assets/javascripts/bootstrap/popover.js'); app.import('bower_components/velocity/velocity.js'); return app.toTree(extraAssets); diff --git a/chrome/public/background.js b/chrome/public/background.js index 2c90e13..1d258ca 100644 --- a/chrome/public/background.js +++ b/chrome/public/background.js @@ -1,827 +1,218 @@ 'use strict'; -/* - * dancer - v0.4.0 - 2014-02-01 - * https://github.com/jsantell/dancer.js - * Copyright (c) 2014 Jordan Santell - * Licensed MIT - */ -(function () { - - var Dancer = function () { - this.audioAdapter = Dancer._getAdapter(this); - this.events = {}; - this.sections = []; - this.bind('update', update); - }; - - Dancer.version = 'X.X.X'; - Dancer.adapters = {}; - - Dancer.prototype = { - - load: function (source, micBoost, useMic) { - // Loading an Audio element - if (source instanceof HTMLElement) { - this.source = source; - // Loading an object with src, [codecs] - } else if (source instanceof EventTarget) { - this.source = source; - } else { - this.source = window.Audio ? new Audio() : {}; - this.source.src = Dancer._makeSupportedPath(source.src, source.codecs); - } - - this.useMic = useMic === true; - this.boost = micBoost ? micBoost : 1; - this.audio = this.audioAdapter.load(this.source, this.useMic, this.boost); - - return this; - }, - - /* Controls */ - play: function () { - this.audioAdapter.play(); - return this; - }, - - pause: function () { - this.audioAdapter.pause(); - return this; - }, - - setVolume: function (volume) { - this.audioAdapter.setVolume(volume); - return this; - }, - - setBoost: function (boost) { - this.audioAdapter.setBoost(boost); - return this; - }, - - /* Actions */ - createKick: function (options) { - return new Dancer.Kick(this, options); - }, - - bind: function (name, callback) { - if (!this.events[name]) { - this.events[name] = []; - } - this.events[name].push(callback); - return this; - }, - - unbind: function (name) { - if (this.events[name]) { - delete this.events[name]; - } - return this; - }, - - trigger: function (name) { - var _this = this; - if (this.events[name]) { - this.events[name].forEach(function (callback) { - callback.call(_this); - }); - } - return this; - }, - - - /* Getters */ - - getVolume: function () { - return this.audioAdapter.getVolume(); - }, - - getProgress: function () { - return this.audioAdapter.getProgress(); - }, - - getTime: function () { - return this.audioAdapter.getTime(); - }, - - // Returns the magnitude of a frequency or average over a range of frequencies - getFrequency: function (freq, endFreq) { - var sum = 0; - if (endFreq !== undefined) { - for (var i = freq; i <= endFreq; i++) { - sum += this.getSpectrum()[i]; - } - return sum / (endFreq - freq + 1); - } else { - return this.getSpectrum()[freq]; - } - }, - - getWaveform: function () { - return this.audioAdapter.getWaveform(); - }, - - getSpectrum: function () { - return this.audioAdapter.getSpectrum(); - }, - - isLoaded: function () { - return this.audioAdapter.isLoaded; - }, - - isPlaying: function () { - return this.audioAdapter.isPlaying; - }, - - - /* Sections */ - - after: function (time, callback) { - var _this = this; - this.sections.push({ - condition: function () { - return _this.getTime() > time; - }, - callback: callback - }); - return this; - }, - - before: function (time, callback) { - var _this = this; - this.sections.push({ - condition: function () { - return _this.getTime() < time; - }, - callback: callback - }); - return this; - }, - - between: function (startTime, endTime, callback) { - var _this = this; - this.sections.push({ - condition: function () { - return _this.getTime() > startTime && _this.getTime() < endTime; - }, - callback: callback - }); - return this; - }, - - onceAt: function (time, callback) { - var - _this = this, - thisSection = null; - this.sections.push({ - condition: function () { - return _this.getTime() > time && !this.called; - }, - callback: function () { - callback.call(this); - thisSection.called = true; - }, - called: false - }); - // Baking the section in the closure due to callback's this being the dancer instance - thisSection = this.sections[this.sections.length - 1]; - return this; - } - }; - - function update() { - for (var i in this.sections) { - if (this.sections[i].condition && this.sections[i].condition()) - this.sections[i].callback.call(this); - } - } - - window.Dancer = Dancer; -})(); - -(function (Dancer) { - - var CODECS = { - 'mp3': 'audio/mpeg;', - 'ogg': 'audio/ogg; codecs="vorbis"', - 'wav': 'audio/wav; codecs="1"', - 'aac': 'audio/mp4; codecs="mp4a.40.2"' - }, - audioEl = document.createElement('audio'); - - Dancer.options = {}; - - Dancer.setOptions = function (o) { - for (var option in o) { - if (o.hasOwnProperty(option)) { - Dancer.options[option] = o[option]; - } - } - }; - - Dancer.isSupported = function () { - if (!window.Float32Array || !window.Uint32Array) { - return null; - } else if (!isUnsupportedSafari() && (window.AudioContext || window.webkitAudioContext)) { - return 'webaudio'; - } else { - return ''; - } - }; - - Dancer.canPlay = function (type) { - var canPlay = audioEl.canPlayType; - return !!( - type.toLowerCase() === 'mp3' || - audioEl.canPlayType && - audioEl.canPlayType(CODECS[type.toLowerCase()]).replace(/no/, '')); - }; - - Dancer.addPlugin = function (name, fn) { - if (Dancer.prototype[name] === undefined) { - Dancer.prototype[name] = fn; - } - }; - - Dancer._makeSupportedPath = function (source, codecs) { - if (!codecs) { return source; } - - for (var i = 0; i < codecs.length; i++) { - if (Dancer.canPlay(codecs[i])) { - return source + '.' + codecs[i]; - } - } - return source; - }; - - Dancer._getAdapter = function (instance) { - switch (Dancer.isSupported()) { - case 'webaudio': - return new Dancer.adapters.webaudio(instance); - default: - return null; - } - }; - - Dancer._getMP3SrcFromAudio = function (audioEl) { - var sources = audioEl.children; - if (audioEl.src) { return audioEl.src; } - for (var i = sources.length; i--;) { - if ((sources[i].type || '').match(/audio\/mpeg/)) return sources[i].src; - } - return null; - }; - - // Browser detection is lame, but Safari 6 has Web Audio API, - // but does not support processing audio from a Media Element Source - // https://gist.github.com/3265344 - function isUnsupportedSafari() { - var - isApple = !!(navigator.vendor || '').match(/Apple/), - version = navigator.userAgent.match(/Version\/([^ ]*)/); - version = version ? parseFloat(version[1]) : 0; - return isApple && version <= 6; - } - -})(window.Dancer); - -(function (undefined) { - var Kick = function (dancer, o) { - o = o || {}; - this.dancer = dancer; - this.frequency = o.frequency !== undefined ? o.frequency : [0, 5]; - this.threshold = o.threshold !== undefined ? o.threshold : 0.3; - this.decay = o.decay !== undefined ? o.decay : 0.02; - this.onKick = o.onKick; - this.offKick = o.offKick; - this.isOn = false; - this.currentThreshold = this.threshold; - this.previousMag = 0; - this.canUseRatio = true; - this.canUseRatioHandle = null; - - var _this = this; - this.dancer.bind('update', function () { - _this.onUpdate(); - }); - }; - - Kick.prototype = { - on: function () { - this.isOn = true; - return this; - }, - off: function () { - this.isOn = false; - return this; - }, - - set: function (o) { - o = o || {}; - this.frequency = o.frequency !== undefined ? o.frequency : this.frequency; - this.threshold = o.threshold !== undefined ? o.threshold : this.threshold; - this.decay = o.decay !== undefined ? o.decay : this.decay; - this.onKick = o.onKick || this.onKick; - this.offKick = o.offKick || this.offKick; - }, - - onUpdate: function () { - if (!this.isOn) { return; } - - var magnitude = this.maxAmplitude(this.frequency); - - if (magnitude >= this.currentThreshold && magnitude >= this.threshold) { - this.currentThreshold = magnitude; - this.onKick && this.onKick.call(this.dancer, magnitude); - this.canUseRatio = false; - - if (this.canUseRatioHandle) { - clearTimeout(this.canUseRatioHandle); - this.canUseRatioHandle = null; - } - - var self = this; - this.canUseRatioHandle = setTimeout(function () { - self.canUseRatio = true; - }, 5000); - } else { - if (magnitude / this.previousMag > this.threshold * 5 && magnitude > 0.1 && this.canUseRatio) { - this.onKick && this.onKick.call(this.dancer, magnitude, magnitude / this.previousMag); - } else { - this.offKick && this.offKick.call(this.dancer, magnitude); - } - - this.currentThreshold -= this.decay; - this.previousMag = (magnitude > 0) ? magnitude : 0.0001; - } - }, - maxAmplitude: function (frequency) { - var max = 0, fft = this.dancer.getSpectrum(); - - // Sloppy array check - if (!frequency.length) { - return frequency < fft.length ? - fft[~~frequency] : - null; - } - - for (var i = frequency[0], l = frequency[1]; i <= l; i++) { - if (fft[i] > max) { max = fft[i]; } - } - return max; - } - }; - - window.Dancer.Kick = Kick; -})(); - -(function () { - var - SAMPLE_SIZE = 2048, - SAMPLE_RATE = 44100; - - var adapter = function (dancer) { - var context; - - if ('AudioContext' in window) { - context = new AudioContext(); - } else { - context = new webkitAudioContext(); - } - - this.dancer = dancer; - this.audio = new Audio(); - this.context = context; - }; - - adapter.prototype = { - - load: function (_source, useMic, boost) { - var _this = this; - this.audio = _source; - this.useMic = useMic; - this.boost = boost; - - this.isLoaded = false; - this.progress = 0; - - if (this.proc) { - this.proc.onaudioprocess = null; - delete this.proc; - } - - this.proc = this.context.createScriptProcessor(SAMPLE_SIZE / 2, 1, 1); - - this.proc.onaudioprocess = function (e) { - _this.update.call(_this, e); - }; - - this.gain = this.context.createGain(); - - this.fft = new FFT(SAMPLE_SIZE / 2, SAMPLE_RATE, this.boost); - this.signal = new Float32Array(SAMPLE_SIZE / 2); - - if (this.audio.readyState < 3) { - this.audio.addEventListener('canplay', function () { - connectContext.call(_this); - }); - } else { - connectContext.call(_this); - } - - this.audio.addEventListener('progress', function (e) { - if (e.currentTarget.duration && e.currentTarget.duration !== Infinity) { - _this.progress = e.currentTarget.seekable.end(0) / e.currentTarget.duration; - } - }); - - return this.audio; - }, - - play: function () { - this.audio.play(); - this.isPlaying = true; - }, - - pause: function () { - this.audio.pause(); - this.isPlaying = false; - }, - - setVolume: function (volume) { - this.gain.gain.value = volume; - }, - - setBoost: function (boost) { - if (this.fft) { - this.fft.setBoost(boost); - } - - this.boost = boost; - }, - - getVolume: function () { - return this.gain.gain.value; - }, - - getProgress: function () { - return this.progress; - }, - - getWaveform: function () { - return this.signal; - }, - - getSpectrum: function () { - return this.fft.spectrum; - }, - - getTime: function () { - return this.audio.currentTime; - }, - - update: function (e) { - if ((!this.isPlaying || !this.isLoaded) && this.useMic !== true) return; - - var - buffers = [], - channels = e.inputBuffer.numberOfChannels, - resolution = SAMPLE_SIZE / channels, - sum = function (prev, curr) { - return prev[i] + curr[i]; - }, i; - - for (i = channels; i--;) { - buffers.push(e.inputBuffer.getChannelData(i)); - } - - for (i = 0; i < resolution; i++) { - this.signal[i] = channels > 1 ? - buffers.reduce(sum) / channels : - buffers[0][i]; - } - - this.fft.forward(this.signal); - this.dancer.trigger('update'); - } - }; - - function connectContext() { - try { - if (this.useMic) { - this.source = this.context.createMediaStreamSource(this.audio); - } else { - this.source = this.context.createMediaElementSource(this.audio); - } - } catch (err) { - console.info('Dancer: ' + err); - return; - } - - this.source.connect(this.proc); - this.source.connect(this.gain); - this.gain.connect(this.context.destination); - this.proc.connect(this.context.destination); - - this.isLoaded = true; - this.progress = 1; - this.dancer.trigger('loaded'); - } - - Dancer.adapters.webaudio = adapter; - -})(); - - -/* - * DSP.js - a comprehensive digital signal processing library for javascript - * - * Created by Corban Brook on 2010-01-01. - * Copyright 2010 Corban Brook. All rights reserved. - * - */ - -// Fourier Transform Module used by DFT, FFT, RFFT -function FourierTransform(bufferSize, sampleRate, boost) { - this.bufferSize = bufferSize; - this.sampleRate = sampleRate; - this.bandwidth = 2 / bufferSize * sampleRate / 2; - this.boost = boost ? boost : 1; - - this.spectrum = new Float32Array(bufferSize / 2); - this.real = new Float32Array(bufferSize); - this.imag = new Float32Array(bufferSize); - - this.peakBand = 0; - this.peak = 0; - - /** - * Calculates the *middle* frequency of an FFT band. - * - * @param {Number} index The index of the FFT band. - * - * @returns The middle frequency in Hz. - */ - this.getBandFrequency = function (index) { - return this.bandwidth * index + this.bandwidth / 2; - }; - - this.setBoost = function (boost) { - this.boost = boost; - }; - - this.calculateSpectrum = function () { - var spectrum = this.spectrum, - real = this.real, - imag = this.imag, - boost = this.boost, - bSi = 2 / this.bufferSize, - sqrt = Math.sqrt, - rval, - ival, - mag; - - for (var i = 0, N = bufferSize / 2; i < N; i++) { - rval = real[i]; - ival = imag[i]; - mag = bSi * sqrt(rval * rval + ival * ival); - - if (mag > this.peak) { - this.peakBand = i; - this.peak = mag; - } - - spectrum[i] = mag * boost; - } - }; -} - -/** - * FFT is a class for calculating the Discrete Fourier Transform of a signal - * with the Fast Fourier Transform algorithm. - * - * @param {Number} bufferSize The size of the sample buffer to be computed. Must be power of 2 - * @param {Number} sampleRate The sampleRate of the buffer (eg. 44100) - * @param {Number} boost The coefficient - * - * @constructor - */ -function FFT(bufferSize, sampleRate, boost) { - FourierTransform.call(this, bufferSize, sampleRate, boost); - - this.reverseTable = new Uint32Array(bufferSize); - - var limit = 1; - var bit = bufferSize >> 1; - - var i; - - while (limit < bufferSize) { - for (i = 0; i < limit; i++) { - this.reverseTable[i + limit] = this.reverseTable[i] + bit; - } - - limit = limit << 1; - bit = bit >> 1; - } - - this.sinTable = new Float32Array(bufferSize); - this.cosTable = new Float32Array(bufferSize); - - for (i = 0; i < bufferSize; i++) { - this.sinTable[i] = Math.sin(-Math.PI / i); - this.cosTable[i] = Math.cos(-Math.PI / i); - } -} - -/** - * Performs a forward transform on the sample buffer. - * Converts a time domain signal to frequency domain spectra. - * - * @param {Array} buffer The sample buffer. Buffer Length must be power of 2 - * - * @returns The frequency spectrum array - */ -FFT.prototype.forward = function (buffer) { - // Locally scope variables for speed up - var bufferSize = this.bufferSize, - cosTable = this.cosTable, - sinTable = this.sinTable, - reverseTable = this.reverseTable, - real = this.real, - imag = this.imag, - spectrum = this.spectrum; - - var k = Math.floor(Math.log(bufferSize) / Math.LN2); - - if (Math.pow(2, k) !== bufferSize) { throw "Invalid buffer size, must be a power of 2."; } - if (bufferSize !== buffer.length) { throw "Supplied buffer is not the same size as defined FFT. FFT Size: " + bufferSize + " Buffer Size: " + buffer.length; } - - var halfSize = 1, - phaseShiftStepReal, - phaseShiftStepImag, - currentPhaseShiftReal, - currentPhaseShiftImag, - off, - tr, - ti, - tmpReal, - i; - - for (i = 0; i < bufferSize; i++) { - real[i] = buffer[reverseTable[i]]; - imag[i] = 0; - } - - while (halfSize < bufferSize) { - //phaseShiftStepReal = Math.cos(-Math.PI/halfSize); - //phaseShiftStepImag = Math.sin(-Math.PI/halfSize); - phaseShiftStepReal = cosTable[halfSize]; - phaseShiftStepImag = sinTable[halfSize]; - - currentPhaseShiftReal = 1; - currentPhaseShiftImag = 0; - - for (var fftStep = 0; fftStep < halfSize; fftStep++) { - i = fftStep; - - while (i < bufferSize) { - off = i + halfSize; - tr = (currentPhaseShiftReal * real[off]) - (currentPhaseShiftImag * imag[off]); - ti = (currentPhaseShiftReal * imag[off]) + (currentPhaseShiftImag * real[off]); - - real[off] = real[i] - tr; - imag[off] = imag[i] - ti; - real[i] += tr; - imag[i] += ti; - - i += halfSize << 1; - } - - tmpReal = currentPhaseShiftReal; - currentPhaseShiftReal = (tmpReal * phaseShiftStepReal) - (currentPhaseShiftImag * phaseShiftStepImag); - currentPhaseShiftImag = (tmpReal * phaseShiftStepImag) + (currentPhaseShiftImag * phaseShiftStepReal); - } - - halfSize = halfSize << 1; - } - - return this.calculateSpectrum(); +// utility functions +let isNone = function (obj) { + return obj === null || obj === undefined; }; +// drive the application state by listening its on its change in the storage +// the main ember app controls may change these +let state = { + activeLights: [], + threshold: 0.3, + hueRange: [0, 65535], + brightnessRange: [1, 254], + bridgeIp: null, + bridgeUsername: null, + lightsData: null, + lastLightBopIndex: 0, // background only properties below here + paused: false, + preMusicLightsDataCache: null +}; -chrome.storage.local.get('threshold', ({threshold}) => { - threshold = threshold || 0.3; +let dancer = new window.Dancer(), + stream = null, + kick; - let dancer = new window.Dancer(), - paused = false, - simulateKick = (mag, ratioKickMag) => { - console.log('mag: ' + mag + ', ratioKickMag: ' + ratioKickMag); - }, - kick = dancer.createKick({ - threshold, - onKick: (mag, ratioKickMag) => { - if (paused === false) { - simulateKick(mag, ratioKickMag); - } - } - }); - - kick.on(); - - chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) { - if (request.action === 'start-listening') { - chrome.tabCapture.capture({ - audio: true, - video: false - }, function (stream) { - let error = null; - - if (!stream) { - error = chrome.runtime.lastError.message; - } else { - // let audio = new Audio(); - // audio.src = URL.createObjectURL(stream); - // audio.crossOrigin = "anonymous"; - //dancer.load(audio, 1); - } - - sendResponse({ error }); - - return true; - }); - } - - return true; - }); +// initialze the state +chrome.storage.local.get('activeLights', ({activeLights}) => { + if (!isNone(activeLights)) { + state.activeLights = activeLights; + } }); -// simulateKick(/*mag, ratioKickMag*/) { -// let activeLights = this.get('activeLights'), -// lightsData = this.get('lightsData'), -// color = null, +chrome.storage.local.get('threshold', ({threshold}) => { + if (!isNone(threshold)) { + state.threshold = threshold; + } -// transitiontime = this.get('flashingTransitions'), -// stimulateLight = (light, brightness, hue) => { -// let options = { 'bri': brightness }; + kick = dancer.createKick({ + threshold: state.threshold, + onKick: function (mag, ratioKickMag) { + if (state.paused === false) { + simulateKick(mag, ratioKickMag); + } + } + }); -// if (transitiontime) { -// options['transitiontime'] = 0; -// } else { -// options['transitiontime'] = 1; -// } + kick.on(); +}); -// if (!isNone(hue)) { -// options.hue = hue; -// } +chrome.storage.local.get('hueRange', ({hueRange}) => { + if (!isNone(hueRange)) { + state.hueRange = hueRange; + } +}); -// if (lightsData[light].state.on === false) { -// options.on = true; -// } +chrome.storage.local.get('brightnessRange', ({brightnessRange}) => { + if (!isNone(brightnessRange)) { + state.brightnessRange = brightnessRange; + } +}); -// $.ajax(this.get('apiURL') + '/lights/' + light + '/state', { -// data: JSON.stringify(options), -// contentType: 'application/json', -// type: 'PUT' -// }); -// }, -// timeToBriOff = 100; +chrome.storage.local.get('bridgeIp', ({bridgeIp}) => { + if (!isNone(bridgeIp)) { + state.bridgeIp = bridgeIp; + } +}); -// if (activeLights.length > 0) { -// let lastLightBopIndex = this.get('lastLightBopIndex'), -// lightBopIndex, -// brightnessRange = this.get('brightnessRange'), -// light; +chrome.storage.local.get('bridgeUsername', ({bridgeUsername}) => { + if (!isNone(bridgeUsername)) { + state.bridgeUsername = bridgeUsername; + } +}); -// lightBopIndex = Math.floor(Math.random() * activeLights.length); +chrome.storage.local.get('lightsData', ({lightsData}) => { + if (!isNone(lightsData)) { + state.lightsData = lightsData; + } +}); -// // let's try not to select the same light twice in a row -// if (activeLights.length > 1) { -// while (lightBopIndex === lastLightBopIndex) { -// lightBopIndex = Math.floor(Math.random() * activeLights.length); -// } -// } +// add listeners for appliation state change +chrome.storage.onChanged.addListener(function ({activeLights, threshold, hueRange, brightnessRange, bridgeIp, bridgeUsername, lightsData}) { + if (activeLights) { + state.activeLights = activeLights.newValue; + } -// light = activeLights[lightBopIndex]; -// this.set('lastLightBopIndex', lightBopIndex); + if (threshold) { + state.threshold = threshold.newValue; + kick.set({ threshold: state.threshold }); + } -// if (!this.get('colorloopMode')) { -// let hueRange = this.get('hueRange'); + if (hueRange) { + state.hueRange = hueRange.newValue; + } -// color = Math.floor(Math.random() * (hueRange[1] - hueRange[0] + 1) + hueRange[0]); -// } + if (brightnessRange) { + state.brightnessRange = brightnessRange.newValue; + } -// if (transitiontime) { -// timeToBriOff = 80; -// } + if (bridgeIp) { + state.bridgeIp = bridgeIp.newValue; + } -// stimulateLight(light, brightnessRange[1], color); -// later(this, stimulateLight, light, brightnessRange[0], timeToBriOff); -// } + if (bridgeUsername) { + state.bridgeUsername = bridgeUsername.newValue; + } -// this.set('paused', true); -// later(this, function () { -// this.set('paused', false); -// }, 150); -// } \ No newline at end of file + if (lightsData) { + state.lightsData = lightsData.newValue; + } +}) + +chrome.storage.local.set({ currentlyListenining: false }); +chrome.browserAction.setBadgeBackgroundColor({ color: [80, 80, 80, 255] }); + +chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) { + if (request.action === 'start-listening') { + chrome.tabCapture.capture({ + audio: true, + video: false + }, function (_stream) { + let error = null; + + if (!_stream) { + error = chrome.runtime.lastError.message; + } else { + stream = _stream; + dancer.load(_stream, 2); + chrome.storage.local.set({ currentlyListenining: true }); + chrome.browserAction.setBadgeText({ text: "♪" }); + state.preMusicLightsDataCache = state.lightsData; + } + + sendResponse({ error }); + + return true; + }); + } else if (request.action === 'stop-listening' && stream !== null) { + stream.getTracks()[0].stop(); + stream = null; + chrome.browserAction.setBadgeText({ text: "" }); + chrome.storage.local.set({ currentlyListenining: false }); + + let updateLight = function (lightIndex) { + $.ajax('http://' + state.bridgeIp + '/api/' + state.bridgeUsername + '/lights/' + lightIndex + '/state', { + data: JSON.stringify({ + 'on': state.preMusicLightsDataCache[lightIndex].state.on, + 'hue': state.preMusicLightsDataCache[lightIndex].state.hue, + 'bri': state.preMusicLightsDataCache[lightIndex].state.bri + }), + contentType: 'application/json', + type: 'PUT' + }); + }; + + for (let key in state.lightsData) { + if (state.lightsData.hasOwnProperty(key)) { + setTimeout(function () { + updateLight(key); + }, 1000); + } + } + } + + return true; +}); + +// core function that simulates a random light on kick ( beat ) +let simulateKick = (/*mag, ratioKickMag*/) => { + chrome.runtime.sendMessage({ action: 'button-bump' }); + + let color = null, + _stimulateLight = (light, brightness, hue) => { + let options = { bri: brightness, transitiontime: 1 }, + xhr = new XMLHttpRequest(); + + if (!isNone(hue)) { + options.hue = hue; + } + + if (state.lightsData[light].state.on === false) { + options.on = true; + } + + $.ajax('http://' + state.bridgeIp + '/api/' + state.bridgeUsername + '/lights/' + light + '/state', { + data: JSON.stringify(options), + contentType: 'application/json', + type: 'PUT' + }); + }, + timeToBriOff = 100; + + if (state.activeLights.length > 0) { + let lightBopIndex = Math.floor(Math.random() * state.activeLights.length); + + // let's try not to select the same light twice in a row + if (state.activeLights.length > 1) { + while (lightBopIndex === state.lastLightBopIndex) { + lightBopIndex = Math.floor(Math.random() * state.activeLights.length); + } + } + + let light = state.activeLights[lightBopIndex]; + state.lastLightBopIndex = lightBopIndex; + + color = Math.floor(Math.random() * (state.hueRange[1] - state.hueRange[0] + 1) + state.hueRange[0]); + + _stimulateLight(light, state.brightnessRange[1], color); + setTimeout(function () { + _stimulateLight(light, state.brightnessRange[0]) + }, timeToBriOff); + } + + state.paused = true; + setTimeout(function () { + state.paused = false; + }, 200); +}; \ No newline at end of file diff --git a/chrome/public/dancer.js b/chrome/public/dancer.js new file mode 100644 index 0000000..18a86d8 --- /dev/null +++ b/chrome/public/dancer.js @@ -0,0 +1,519 @@ +'use strict'; + +(function () { + + var Dancer = function () { + this.audioAdapter = new Dancer.adapters.webaudio(this); + this.events = {}; + this.sections = []; + this.bind('update', update); + }; + + Dancer.version = 'X.X.X'; + Dancer.adapters = {}; + + Dancer.prototype = { + + load: function (source, boost) { + this.audio = this.audioAdapter.load(source, boost); + + return this; + }, + + /* Actions */ + createKick: function (options) { + return new Dancer.Kick(this, options); + }, + + bind: function (name, callback) { + if (!this.events[name]) { + this.events[name] = []; + } + this.events[name].push(callback); + return this; + }, + + unbind: function (name) { + if (this.events[name]) { + delete this.events[name]; + } + return this; + }, + + trigger: function (name) { + var _this = this; + if (this.events[name]) { + this.events[name].forEach(function (callback) { + callback.call(_this); + }); + } + return this; + }, + + // Returns the magnitude of a frequency or average over a range of frequencies + getFrequency: function (freq, endFreq) { + var sum = 0; + if (endFreq !== undefined) { + for (var i = freq; i <= endFreq; i++) { + sum += this.getSpectrum()[i]; + } + return sum / (endFreq - freq + 1); + } else { + return this.getSpectrum()[freq]; + } + }, + + getWaveform: function () { + return this.audioAdapter.getWaveform(); + }, + + getSpectrum: function () { + return this.audioAdapter.getSpectrum(); + }, + + /* Sections */ + + after: function (time, callback) { + var _this = this; + this.sections.push({ + condition: function () { + return _this.getTime() > time; + }, + callback: callback + }); + return this; + }, + + before: function (time, callback) { + var _this = this; + this.sections.push({ + condition: function () { + return _this.getTime() < time; + }, + callback: callback + }); + return this; + }, + + between: function (startTime, endTime, callback) { + var _this = this; + this.sections.push({ + condition: function () { + return _this.getTime() > startTime && _this.getTime() < endTime; + }, + callback: callback + }); + return this; + }, + + onceAt: function (time, callback) { + var + _this = this, + thisSection = null; + this.sections.push({ + condition: function () { + return _this.getTime() > time && !this.called; + }, + callback: function () { + callback.call(this); + thisSection.called = true; + }, + called: false + }); + // Baking the section in the closure due to callback's this being the dancer instance + thisSection = this.sections[this.sections.length - 1]; + return this; + } + }; + + function update() { + for (var i in this.sections) { + if (this.sections[i].condition && this.sections[i].condition()) + this.sections[i].callback.call(this); + } + } + + window.Dancer = Dancer; +})(); + +(function (Dancer) { + + var CODECS = { + 'mp3': 'audio/mpeg;', + 'ogg': 'audio/ogg; codecs="vorbis"', + 'wav': 'audio/wav; codecs="1"', + 'aac': 'audio/mp4; codecs="mp4a.40.2"' + }, + audioEl = document.createElement('audio'); + + Dancer.options = {}; + + Dancer.setOptions = function (o) { + for (var option in o) { + if (o.hasOwnProperty(option)) { + Dancer.options[option] = o[option]; + } + } + }; +})(window.Dancer); + +(function (undefined) { + var Kick = function (dancer, o) { + o = o || {}; + this.dancer = dancer; + this.frequency = o.frequency !== undefined ? o.frequency : [0, 5]; + this.threshold = o.threshold !== undefined ? o.threshold : 0.3; + this.decay = o.decay !== undefined ? o.decay : 0.02; + this.onKick = o.onKick; + this.offKick = o.offKick; + this.isOn = false; + this.currentThreshold = this.threshold; + this.previousMag = 0; + this.canUseRatio = true; + this.canUseRatioHandle = null; + + var _this = this; + this.dancer.bind('update', function () { + _this.onUpdate(); + }); + }; + + Kick.prototype = { + on: function () { + this.isOn = true; + return this; + }, + off: function () { + this.isOn = false; + return this; + }, + + set: function (o) { + o = o || {}; + this.frequency = o.frequency !== undefined ? o.frequency : this.frequency; + this.threshold = o.threshold !== undefined ? o.threshold : this.threshold; + this.decay = o.decay !== undefined ? o.decay : this.decay; + this.onKick = o.onKick || this.onKick; + this.offKick = o.offKick || this.offKick; + }, + + onUpdate: function () { + if (!this.isOn) { return; } + + var magnitude = this.maxAmplitude(this.frequency); + if (magnitude >= this.currentThreshold && magnitude >= this.threshold) { + this.currentThreshold = magnitude; + this.onKick && this.onKick.call(this.dancer, magnitude); + this.canUseRatio = false; + + if (this.canUseRatioHandle) { + clearTimeout(this.canUseRatioHandle); + this.canUseRatioHandle = null; + } + + var self = this; + this.canUseRatioHandle = setTimeout(function () { + self.canUseRatio = true; + }, 5000); + } else { + if (magnitude / this.previousMag > this.threshold * 5 && magnitude > 0.1 && this.canUseRatio) { + this.onKick && this.onKick.call(this.dancer, magnitude, magnitude / this.previousMag); + } else { + this.offKick && this.offKick.call(this.dancer, magnitude); + } + + this.currentThreshold -= this.decay; + this.previousMag = (magnitude > 0) ? magnitude : 0.0001; + } + }, + maxAmplitude: function (frequency) { + var max = 0, fft = this.dancer.getSpectrum(); + + // Sloppy array check + if (!frequency.length) { + return frequency < fft.length ? + fft[~~frequency] : + null; + } + + for (var i = frequency[0], l = frequency[1]; i <= l; i++) { + if (fft[i] > max) { max = fft[i]; } + } + return max; + } + }; + + window.Dancer.Kick = Kick; +})(); + +(function () { + var + SAMPLE_SIZE = 2048, + SAMPLE_RATE = 44100; + + var adapter = function (dancer) { + var context; + + if ('AudioContext' in window) { + context = new AudioContext(); + } else { + context = new webkitAudioContext(); + } + + this.dancer = dancer; + this.context = context; + }; + + adapter.prototype = { + + load: function (_source, boost) { + var _this = this; + this.source = this.context.createMediaStreamSource(_source); + + this.isLoaded = false; + this.progress = 0; + + if (this.proc) { + this.proc.onaudioprocess = null; + delete this.proc; + } + + this.proc = this.context.createScriptProcessor(SAMPLE_SIZE / 2, 1, 1); + + this.proc.onaudioprocess = function (e) { + _this.update.call(_this, e); + }; + + this.gain = this.context.createGain(); + + this.fft = new FFT(SAMPLE_SIZE / 2, SAMPLE_RATE, boost); + this.signal = new Float32Array(SAMPLE_SIZE / 2); + + connectContext.call(_this); + + return this.source; + }, + + getWaveform: function () { + return this.signal; + }, + + getSpectrum: function () { + return this.fft.spectrum; + }, + + update: function (e) { + var + buffers = [], + channels = e.inputBuffer.numberOfChannels, + resolution = SAMPLE_SIZE / channels, + sum = function (prev, curr) { + return prev[i] + curr[i]; + }, i; + + for (i = channels; i--;) { + buffers.push(e.inputBuffer.getChannelData(i)); + } + + for (i = 0; i < resolution; i++) { + this.signal[i] = channels > 1 ? + buffers.reduce(sum) / channels : + buffers[0][i]; + } + + this.fft.forward(this.signal); + this.dancer.trigger('update'); + } + }; + + function connectContext() { + this.source.connect(this.proc); + this.source.connect(this.gain); + this.gain.connect(this.context.destination); + this.proc.connect(this.context.destination); + + this.isLoaded = true; + this.progress = 1; + this.dancer.trigger('loaded'); + } + + Dancer.adapters.webaudio = adapter; + +})(); + + +/* + * DSP.js - a comprehensive digital signal processing library for javascript + * + * Created by Corban Brook on 2010-01-01. + * Copyright 2010 Corban Brook. All rights reserved. + * + */ + +// Fourier Transform Module used by DFT, FFT, RFFT +function FourierTransform(bufferSize, sampleRate, boost) { + this.bufferSize = bufferSize; + this.sampleRate = sampleRate; + this.bandwidth = 2 / bufferSize * sampleRate / 2; + this.boost = boost ? boost : 1; + + this.spectrum = new Float32Array(bufferSize / 2); + this.real = new Float32Array(bufferSize); + this.imag = new Float32Array(bufferSize); + + this.peakBand = 0; + this.peak = 0; + + /** + * Calculates the *middle* frequency of an FFT band. + * + * @param {Number} index The index of the FFT band. + * + * @returns The middle frequency in Hz. + */ + this.getBandFrequency = function (index) { + return this.bandwidth * index + this.bandwidth / 2; + }; + + this.setBoost = function (boost) { + this.boost = boost; + }; + + this.calculateSpectrum = function () { + var spectrum = this.spectrum, + real = this.real, + imag = this.imag, + boost = this.boost, + bSi = 2 / this.bufferSize, + sqrt = Math.sqrt, + rval, + ival, + mag; + + for (var i = 0, N = bufferSize / 2; i < N; i++) { + rval = real[i]; + ival = imag[i]; + mag = bSi * sqrt(rval * rval + ival * ival); + + if (mag > this.peak) { + this.peakBand = i; + this.peak = mag; + } + + spectrum[i] = mag * boost; + } + }; +} + +/** + * FFT is a class for calculating the Discrete Fourier Transform of a signal + * with the Fast Fourier Transform algorithm. + * + * @param {Number} bufferSize The size of the sample buffer to be computed. Must be power of 2 + * @param {Number} sampleRate The sampleRate of the buffer (eg. 44100) + * @param {Number} boost The coefficient + * + * @constructor + */ +function FFT(bufferSize, sampleRate, boost) { + FourierTransform.call(this, bufferSize, sampleRate, boost); + + this.reverseTable = new Uint32Array(bufferSize); + + var limit = 1; + var bit = bufferSize >> 1; + + var i; + + while (limit < bufferSize) { + for (i = 0; i < limit; i++) { + this.reverseTable[i + limit] = this.reverseTable[i] + bit; + } + + limit = limit << 1; + bit = bit >> 1; + } + + this.sinTable = new Float32Array(bufferSize); + this.cosTable = new Float32Array(bufferSize); + + for (i = 0; i < bufferSize; i++) { + this.sinTable[i] = Math.sin(-Math.PI / i); + this.cosTable[i] = Math.cos(-Math.PI / i); + } +} + +/** + * Performs a forward transform on the sample buffer. + * Converts a time domain signal to frequency domain spectra. + * + * @param {Array} buffer The sample buffer. Buffer Length must be power of 2 + * + * @returns The frequency spectrum array + */ +FFT.prototype.forward = function (buffer) { + // Locally scope variables for speed up + var bufferSize = this.bufferSize, + cosTable = this.cosTable, + sinTable = this.sinTable, + reverseTable = this.reverseTable, + real = this.real, + imag = this.imag, + spectrum = this.spectrum; + + var k = Math.floor(Math.log(bufferSize) / Math.LN2); + + if (Math.pow(2, k) !== bufferSize) { throw "Invalid buffer size, must be a power of 2."; } + if (bufferSize !== buffer.length) { throw "Supplied buffer is not the same size as defined FFT. FFT Size: " + bufferSize + " Buffer Size: " + buffer.length; } + + var halfSize = 1, + phaseShiftStepReal, + phaseShiftStepImag, + currentPhaseShiftReal, + currentPhaseShiftImag, + off, + tr, + ti, + tmpReal, + i; + + for (i = 0; i < bufferSize; i++) { + real[i] = buffer[reverseTable[i]]; + imag[i] = 0; + } + + while (halfSize < bufferSize) { + //phaseShiftStepReal = Math.cos(-Math.PI/halfSize); + //phaseShiftStepImag = Math.sin(-Math.PI/halfSize); + phaseShiftStepReal = cosTable[halfSize]; + phaseShiftStepImag = sinTable[halfSize]; + + currentPhaseShiftReal = 1; + currentPhaseShiftImag = 0; + + for (var fftStep = 0; fftStep < halfSize; fftStep++) { + i = fftStep; + + while (i < bufferSize) { + off = i + halfSize; + tr = (currentPhaseShiftReal * real[off]) - (currentPhaseShiftImag * imag[off]); + ti = (currentPhaseShiftReal * imag[off]) + (currentPhaseShiftImag * real[off]); + + real[off] = real[i] - tr; + imag[off] = imag[i] - ti; + real[i] += tr; + imag[i] += ti; + + i += halfSize << 1; + } + + tmpReal = currentPhaseShiftReal; + currentPhaseShiftReal = (tmpReal * phaseShiftStepReal) - (currentPhaseShiftImag * phaseShiftStepImag); + currentPhaseShiftImag = (tmpReal * phaseShiftStepImag) + (currentPhaseShiftImag * phaseShiftStepReal); + } + + halfSize = halfSize << 1; + } + + return this.calculateSpectrum(); +}; \ No newline at end of file diff --git a/chrome/public/jquery-3.1.1.min.js b/chrome/public/jquery-3.1.1.min.js new file mode 100644 index 0000000..4c5be4c --- /dev/null +++ b/chrome/public/jquery-3.1.1.min.js @@ -0,0 +1,4 @@ +/*! jQuery v3.1.1 | (c) jQuery Foundation | jquery.org/license */ +!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):C.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/[^\x20\t\r\n\f]+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R), +a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length\x20\t\r\n\f]+)/i,ka=/^$|\/(?:java|ecma)script/i,la={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};la.optgroup=la.option,la.tbody=la.tfoot=la.colgroup=la.caption=la.thead,la.th=la.td;function ma(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function na(a,b){for(var c=0,d=a.length;c-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=ma(l.appendChild(f),"script"),j&&na(g),c){k=0;while(f=g[k++])ka.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var qa=d.documentElement,ra=/^key/,sa=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ta=/^([^.]*)(?:\.(.+)|)/;function ua(){return!0}function va(){return!1}function wa(){try{return d.activeElement}catch(a){}}function xa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)xa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=va;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(qa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i\x20\t\r\n\f]*)[^>]*)\/>/gi,za=/\s*$/g;function Da(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Ea(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Fa(a){var b=Ba.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ga(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c1&&"string"==typeof q&&!o.checkClone&&Aa.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ia(f,b,c,d)});if(m&&(e=pa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(ma(e,"script"),Ea),i=h.length;l")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=ma(h),f=ma(a),d=0,e=f.length;d0&&na(g,!i&&ma(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ja(this,a,!0)},remove:function(a){return Ja(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.appendChild(a)}})},prepend:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(ma(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!za.test(a)&&!la[(ja.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c1)}});function Ya(a,b,c,d,e){return new Ya.prototype.init(a,b,c,d,e)}r.Tween=Ya,Ya.prototype={constructor:Ya,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Ya.propHooks[this.prop];return a&&a.get?a.get(this):Ya.propHooks._default.get(this)},run:function(a){var b,c=Ya.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ya.propHooks._default.set(this),this}},Ya.prototype.init.prototype=Ya.prototype,Ya.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Ya.propHooks.scrollTop=Ya.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Ya.prototype.init,r.fx.step={};var Za,$a,_a=/^(?:toggle|show|hide)$/,ab=/queueHooks$/;function bb(){$a&&(a.requestAnimationFrame(bb),r.fx.tick())}function cb(){return a.setTimeout(function(){Za=void 0}),Za=r.now()}function db(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ba[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function eb(a,b,c){for(var d,e=(hb.tweeners[b]||[]).concat(hb.tweeners["*"]),f=0,g=e.length;f1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?ib:void 0)), +void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),ib={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=jb[b]||r.find.attr;jb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=jb[g],jb[g]=e,e=null!=c(a,b,d)?g:null,jb[g]=f),e}});var kb=/^(?:input|select|textarea|button)$/i,lb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):kb.test(a.nodeName)||lb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function mb(a){var b=a.match(K)||[];return b.join(" ")}function nb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,nb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,nb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,nb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=nb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(nb(c))+" ").indexOf(b)>-1)return!0;return!1}});var ob=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(ob,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:mb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ia.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,"$1"),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r(" - - diff --git a/mobile/app/pods/components/music-tab/component.js b/mobile/app/pods/components/music-tab/component.js index a987c71..8de43a9 100644 --- a/mobile/app/pods/components/music-tab/component.js +++ b/mobile/app/pods/components/music-tab/component.js @@ -165,10 +165,8 @@ export default Component.extend(helperMixin, visualizerMixin, { this.set('paused', true); later(this, function () { - { - this.set('paused', false); - } - }, 150); + this.set('paused', false); + }, 200); //work the music beat area - simulate the speaker vibration by running a CSS animation on it $('#beat-speaker-center-outer').velocity({ blur: 3 }, 100).velocity({ blur: 0 }, 100); diff --git a/mobile/ember-cordova/cordova/config.xml b/mobile/ember-cordova/cordova/config.xml index 9b7f6cb..b2a66d6 100644 --- a/mobile/ember-cordova/cordova/config.xml +++ b/mobile/ember-cordova/cordova/config.xml @@ -1,5 +1,5 @@ - + Huegasm diff --git a/web/app/pods/components/huegasm-footer/template.hbs b/web/app/pods/components/huegasm-footer/template.hbs index 4bf5a43..1410c7c 100644 --- a/web/app/pods/components/huegasm-footer/template.hbs +++ b/web/app/pods/components/huegasm-footer/template.hbs @@ -1,8 +1,8 @@
© {{year}} - - Egor Philippov + + Nidratech Ltd
diff --git a/web/app/pods/components/music-tab/component.js b/web/app/pods/components/music-tab/component.js index 92dc0b4..35025c1 100644 --- a/web/app/pods/components/music-tab/component.js +++ b/web/app/pods/components/music-tab/component.js @@ -181,7 +181,7 @@ export default Component.extend(helperMixin, visualizerMixin, { this.set('paused', true); later(this, function () { this.set('paused', false); - }, 150); + }, 200); //work the music beat area - simulate the speaker vibration by running a CSS animation on it $('#beat-speaker-center-outer').velocity({ blur: 3 }, 100).velocity({ blur: 0 }, 100); diff --git a/web/app/pods/components/music-tab/template.hbs b/web/app/pods/components/music-tab/template.hbs index c23c0b8..344bd69 100644 --- a/web/app/pods/components/music-tab/template.hbs +++ b/web/app/pods/components/music-tab/template.hbs @@ -13,28 +13,16 @@ {{#if playQueueNotEmpty}} {{paper-icon "skip-previous" class="player-control-icon"}} - - {{/if}} - - {{paper-icon playingIcon class="player-control-icon"}} - - {{#if playQueueMultiple}} - {{paper-icon "skip-next" action="" class="player-control-icon"}} - - {{/if}} - - - {{range-slider start=volume min=0 max=100 connect=filledConnect on-change="volumeChanged" id="volume-bar" class="hidden-xs"}} + {{action "previous"}}>{{paper-icon "skip-previous" class="player-control-icon"}}{{/if}}{{paper-icon playingIcon class="player-control-icon"}}{{#if playQueueMultiple}}{{paper-icon "skip-next" action="" class="player-control-icon"}}{{/if}}{{range-slider start=volume min=0 max=100 connect=filledConnect on-change="volumeChanged" id="volume-bar" class="hidden-xs"}}
{{timeElapsedTxt}} / {{timeTotalTxt}}