Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

setAliases and deepMerge util functions. #1129

Closed
wants to merge 92 commits into from
Closed

setAliases and deepMerge util functions. #1129

wants to merge 92 commits into from

Conversation

agamemnus
Copy link
Contributor

The use cases (will be evident in subsequent pull requests -- later today):

deepMerge allows a deep merge of two objects and properties (ignoring HTML elements).

This is useful in the case of a parameter having an object instead of a string/number/etc..

setAlias allows several source properties to match a target property via getters/setters. This is useful in the case where we have a cursorColor as a property but might also want to allow the user to alternatively set a cursor's backgroundColor (assuming the cursor was an element and its color was set with backgroundColor). Both properties would transform and be transformed by a hidden property; e.g.: _backgroundColor.

mspae and others added 30 commits November 16, 2016 23:13
…862)

* close the audiocontext in the destroy method of the webaudio backend

* ac is only closed in WebAudio destroy function if it was created internally and not passed in as a parameter

* removed WaveSurfer.WebAudio.audioContext caching (and WebAudio.getAudioContext)

* getAudioContext method is back in place, but doesn't cache to WebAudio.audioContext
When running code that uses Wavesurfer under PhantomJS (even if not explicitly testing the Wavesurfer code), the JS interpreter crashes because PhantomJS DOM `<audio>` elements don't have a `load()` method. This change skips that one line if the method doesn't exist.
* Adds an optional 'partialRender' parameter to enable
* Calculates and renders peaks only for current visible waveform
* Keeps track of currently calculated/rendered peaks to avoid
  duplicate calculation and only incremental scroll changes are rendered

Tested all combinations of Canvas/MultiCanvas and Wave/Bars rendering
at various zoom levels.
* fix draw wrong position while playing backward seeking

* fix spelling mistake
add getPlaybackRate method and return playback rate.
…awWave + drawBars without the start and end parameters introduced by peakCache (#945)
* fix getDuration() return value for MediaElement 

change getDuration function in mediaelement.js to return the correct duration length same as WebAudio.

from
        var duration = this.media.duration; // incorrect duration value returned
        console.log preview:
        https://cloud.githubusercontent.com/assets/5193884/22399178/6d26c1fe-e565-11e6-9b13-e6107641666a.png
to
        var duration = this.buffer.duration; // correct duration value returned same as WebAudio
        console.log preview:
        https://cloud.githubusercontent.com/assets/5193884/22393549/7b130096-e4d6-11e6-83ff-4ebb78b9e42f.png

* Update mediaelement.js
Updated the render function to call the new version of the getPeaks and drawPeaks calls which now require start and end parameters.  Fixes flat waveform drawing in minimap plugin.
add check for browser support of AudioContext.close(). This is only supported by Chrome 43+ and FireFox 40+ for now. Edge and other non supported browsers will give an undefined error.

https://developer.mozilla.org/en-US/docs/Web/API/AudioContext/close

// check if browser supports AudioContext.close()
            if(typeof this.ac.close() !== 'undefined'){
                this.ac.close();
            }

fixes #949
* Update wavesurfer.minimap.js

renders the minimap without the need to resize the window.
Changed 

        this.wavesurfer.on('ready', this.render.bind(this));

to 

        this.wavesurfer.on('ready', my.render.bind(this));

* Update wavesurfer.minimap.js

added the fixes for the drawPeaks()

* update my.render to this.render

* add parameter check renderOnLoad

check to see if a parameter called "miniRenderOnLoad" is set to true, if it is render the minimap on load.

* Update wavesurfer.minimap.js

* add space after else

* render minimap on load

will update docs and create example for minimap plugin
- minimap should be initialized within the main wavesurfer ready event.
* create debounce method in util.js

Can be used as follows with a resize event to prevent drawBuffer() from running concurrently when resizing the browser window.
preview:
http://codepen.io/entonbiba/pen/jyKrEz

var responsiveWave = debounce(function() {
  wavesurfer.empty();
  wavesurfer.drawBuffer();
}, 150);

window.addEventListener(‘resize’, responsiveWave);

* create debounce method in util.js

* Update util.js

* create debounce method in util.js, remove spaces
agamemnus and others added 10 commits May 31, 2017 18:20
* requestAnimationFrame addition to utils.

* Update util.js

* Update util.js

* Update util.js

* Update util.js

* Update util.js
* Wrap drawing in requestAnimationFrame.

Wrap drawing in requestAnimationFrame per #1084.

* Update drawer.canvas.js

* Update drawer.canvas.js

* Update drawer.canvas.js

* Update drawer.canvas.js

* Update drawer.canvas.js
* Listen to and relay play and pause events on media element

* Corrected the 'pause' event label

* removed play and pause emits from respective functions
* Remove pointer events from the left and right sides of the wave and change `zIndex` to 2.

The reasoning behind this is to allow, for example, the region plugin to have a styling such that the regions are below the waves (so that the waves look clearer and not blended with the regions), while still allowing resize events on the regions. Otherwise, the left/right sections of the wave block the resize elements of the regions, since their `zIndex` needs to be necessarily higher to be drawn over the regions.
* Update drawer.multicanvas.js

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js

* I have no idea why this failed.

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js

* Update drawer.multicanvas.js
The use cases (will be evident in subsequent pull requests -- later today):

`deepMerge` allows a deep merge of two objects and properties  (ignoring HTML elements).

This is useful in the case of a parameter having an object instead of a string/number/etc..

`setAlias` allows several source properties to match a target property via getters/setters. This is useful in the case where we have a `cursorColor` as a property but might also want to allow the user to alternatively set a cursor's `backgroundColor` (assuming the cursor was an element and its color was set with backgroundColor). Both properties would transform and be transformed by a hidden property; e.g.: `_backgroundColor`.
@thijstriemstra
Copy link
Contributor

The use cases (will be evident in subsequent pull requests -- later today):

Please reference these pull requests so we can see what you're talking about.

@agamemnus
Copy link
Contributor Author

#1130 ...

@thijstriemstra
Copy link
Contributor

@agamemnus can you rebase/create a new pull request based on the current master branch?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.