katspaugh · katspaugh · Nov 16, 2016 · Nov 19, 2016 · Nov 19, 2016 · Nov 19, 2016
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,6 @@
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,26 @@
+# Hey, thank you for testing and contributing to wavesurfer.js!
+
+## Please make sure you can check all of these points below before opening an issue:
+
+(You don't have to post this section)
+
+- [ ] I have checked [the FAQ](https://wavesurfer-js.org/faq/) and it doesn't solve my problem.
+- [ ] I have checked [the documentation](https://wavesurfer-js.org/docs/) and it doesn't solve my problem
+- [ ] I have searched for [already open issues](https://github.com/katspaugh/wavesurfer.js/issues) which desribe my problem.
+- [ ] The issue I'm having is related to and caused by wavesurfer.js, not by other software (which maybe packages and uses wavesurfer incorrectly) – In that case you should open the issue on the respective project pages.
+
+## Please make sure you provide the following information (if applicable):
+
+### Wavesurfer.js version(s):
+
+
+### Browser version(s):
+
+
+### Code needed to reproduce the issue:
+
+(Please reduce your code as much as possible and only post the minimum code needed to reproduce the issue. [A Code pen](http://codepen.io/) is an excellent way to share such code)
+
+
+### Use behaviour needed to reproduce the issue:
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,21 @@
+# Hey, thank you for contributing to wavesurfer.js!
+
+To review/merge open PRs it is very helpful to know as much as possible about the changes which are being introduced. Reviewing PRs is very time consuming, please be patient, it can take some time to do properly.
+
+**Title:** Please make sure the name of your PR is as descriptive as possible (Describe the feature that is introduced or the bug that is being fixed).
+
+## Please make sure you provide the information below:
+
+### Short description of changes:
+
+
+### Breaking in the external API:
+
+
+### Breaking changes in the internal API:
+
+
+### Todos/Notes:
+
+
+### Related Issues and other PRs:
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ dist/plugin/*.js
 /_SpecRunner.html
 .DS_Store
 .idea
+.project
diff --git a/.npmignore b/.npmignore
@@ -1,3 +1,6 @@
-/dist/wavesurfer.min.js.map
-/dist/wavesurfer.amd.js
-/dist/wavesurfer.min.js
+# exclude everything except dist, plugin and src
+**/*
+!dist/*
+!dist/plugin/*.min.js
+!plugin/**
+!src/**
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,76 @@
 wavesurfer.js changelog
 =======================
 
+1.4.0 (10.04.2017)
+------------------
+- A "breaking" change: a new license. We switched to BSD 3 (#1060).
+– Reset the mute state on subsequent file loads (#1045)
+– A fix for vertical scroll (#1054)
+– A new plugin for linguists: `elan-wave-segment` (#1052)
+
+
+1.3.7 (19.03.2017)
+------------------
+- A fix for the timeline plugin (#1049)
+
+1.3.6 (19.03.2017)
+------------------
+- New renderer: `SplitWavePointPlot` (#1048)
+
+1.3.5 (10.03.2017)
+------------------
+- Add a `getImage` method for MultiCanvas (#1012)
+- Add Playlist plugin (#1018)
+- Add Playlist plugin sample (#1019)
+- Add a new parameter `barHeight` (#1020)
+- Add a `playBackRate` method for MediaElement (#1022)
+
+1.3.4 (25.02.2017)
+------------------
+- Add a new parameter `forceDecode` (#1009)
+
+1.3.3 (23.02.2017)
+------------------
+- Add Media Session plugin (#996)
+- Fix check for AudioContext.close (#998)
+
+1.3.2 (12.02.2017)
+------------------
+- Add a `getVolume` method (#979)
+- Add a `getMute` method (#980)
+- Add a `getFilters` method (#982)
+- New feature for spectrogram plugin to display frequency labels
+
+1.3.1 (07.02.2017)
+------------------
+- Add a `getPlaybackRate` method (#936)
+- Add a `debounce` utility (#964)
+- Fixes for MultiCanvas & peaks cache, a fix the minimap plugin – thanks @entonbiba!
+
+1.3.0 (19.01.2017)
+------------------
+- MultiCanvas is now the default renderer. Single Canvas will be soon removed.
+- Fix backward seeking with Media Element (#918)
+- Fix normalize + bar-style waveform (#916)
+- New option `partialRender` for better performance with high zoom (#909)
+
+1.2.8 (09.12.2016)
+------------------
+- PhantomJS support with the MediaElement backend (#875)
+
+1.2.7 (03.12.2016)
+------------------
+- Timeline bugfixes: correctly unsubscribe on destroy and re-render on zoom (#825, #848)
+
+1.2.6 (19.11.2016)
+------------------
+- Solve the disappearing canvas problem on zoom (#825)
+
+1.2.5 (19.11.2016)
+------------------
+- WebAudio backend closes the AudioContext when it is destroyed, unless the AudioContext was passed in as a parameter (params.audioContext)
+- The AudioContext is no longer cached in WebAudio.audioContext, use the getter-function WebAudio.getAudioContext. (#862)
+
 1.2.4 (11.11.2016)
 ------------------
 - Fix a problem of Web Audio not playing in Safari on initial load (#749)

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -25,6 +25,7 @@ module.exports = function (grunt) {
                     'src/mediaelement.js',
                     'src/drawer.js',
                     'src/drawer.*.js',
+                    'src/peakcache.js',
                     'src/html-init.js'
                 ],
                 dest: 'dist/wavesurfer.js'
@@ -102,7 +103,8 @@ module.exports = function (grunt) {
                 strict: false,
                 globals: {
                     WaveSurfer: true,
-                    Promise: true
+                    Promise: true,
+                    MediaMetadata: true
                 }
             },
             ignore_warning: {

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2012-2017, katspaugh and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
@@ -21,6 +21,9 @@ Yes, if you use the `backend: 'MediaElement'` option. See here: https://wavesurf
 ### Can drawing be done as file loads?
 No. Web Audio needs the whole file to decode it in the browser. You can however load pre-decoded waveform data to draw the waveform immediately. See here: https://wavesurfer-js.org/example/audio-element/ (the "Pre-recoded Peaks" section).
 
+### Is wavesurfer.js ES6-compatible?
+ES6 refactoring is going on in the `next` branch. In the meanwhile, you can import wavesurfer.js as an ES6 module via WebPack as described [here](https://github.com/katspaugh/wavesurfer.js/issues/767#issuecomment-267768714).
+
 ## API in examples
 
 Choose a container:
@@ -102,7 +105,7 @@ grunt coverage
 The HTML report can be found in `coverage/html/index.html`.
 
 ## Editing documentation
-The homepage and the documentation are in the [`gh-pages` branch](https://github.com/katspaugh/wavesurfer.js/tree/gh-pages). Contributions to the documentation are especially welcome.
+The homepage and documentation files are maintained in the [`gh-pages` branch](https://github.com/katspaugh/wavesurfer.js/tree/gh-pages). Contributions to the documentation are especially welcome.
 
 ## Credits
 
@@ -112,7 +115,7 @@ thanks to
 
 ## License
 
-![cc-by](https://i.creativecommons.org/l/by/3.0/88x31.png)
+[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 This work is licensed under a
-[Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/deed.en_US).
+[BSD 3-Clause License](https://opensource.org/licenses/BSD-3-Clause).
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "wavesurfer.js",
-  "version": "1.2.4",
+  "version": "1.4.0",
   "homepage": "http://wavesurfer-js.org",
   "authors": [
     "katspaugh <[email protected]>"
@@ -10,5 +10,5 @@
   "keywords": [
     "waveform", "audio", "music", "player"
   ],
-  "license": "CC BY 3.0"
+  "license": "BSD-3-Clause"
 }
diff --git a/dist/plugin/wavesurfer.cursor.min.js b/dist/plugin/wavesurfer.cursor.min.js
diff --git a/dist/plugin/wavesurfer.elan-wave-segment.min.js b/dist/plugin/wavesurfer.elan-wave-segment.min.js