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

Pull code from sound js master #2

Open
wants to merge 83 commits into
base: SIS-12146
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
732bf96
Updated shared classes to the latest
Oct 27, 2016
ef1d8c7
Updated docs and libs to NEXT
Oct 27, 2016
2b0bb62
Added touchstart event support for mobile audio unlocking
Dec 12, 2016
4851517
Checked if preload candidates are videos, since SoundJS mistakenly ha…
Dec 12, 2016
5000867
Merged in latest shared files from PreloadJS/EaselJS
Dec 12, 2016
64785de
Added missing Methods and Types classes from recent PreloadJS changes
Dec 12, 2016
508bceb
Added remaining PreloadJS dependencies.
Dec 12, 2016
c4950ef
Added latest PreloadJS minified file (required for some demos)
Dec 12, 2016
41ca6cf
Updated latest libs and docs
Dec 12, 2016
c813a7b
Handled case where the duration returns < 0 in a web audio context, r…
Jan 11, 2017
d3de015
PreloadJS fix where loading content could still scale the browser.
Jan 11, 2017
4b23598
Updated minified versions + VERSION.txt
Jan 11, 2017
870d9d8
Minor adjustment to earlier fix, which caused resume() to always rese…
Jan 19, 2017
cd9d7a0
Updated min files.
Jan 19, 2017
aa95123
An iOS hack should only exist on iOS
NuclearCookie Jan 25, 2017
6ce1ebe
Fixed case of folder to correctly build with grunt on case sensitive OS
NuclearCookie Jan 25, 2017
63b8f77
Merge pull request #262 from FishingCactus/fix/edge_error
Jan 31, 2017
aabf145
Updated shared classes from EaselJS & PreloadJS
lannymcnie May 31, 2017
a5661f3
Minor demo updates
lannymcnie Jun 1, 2017
5a90eda
Updates to shared classes from PreloadJS
lannymcnie Jun 1, 2017
e1ad346
Updated asset libraries used in demos
lannymcnie Jun 1, 2017
41c8c43
Removed the deprecated capabilities method (in favour of the getter/p…
lannymcnie Jun 1, 2017
f0cbb83
Removed deprecated defaultNumChannels (an object pool is used now)
lannymcnie Jun 1, 2017
a46b345
Removed setVolume/getVolume and setMute/getMute in favour of volume/m…
lannymcnie Jun 1, 2017
7f935bc
Removed deprecated initialize method (was already commented out)
lannymcnie Jun 1, 2017
084c6be
Removed deprecated get/set methods, in place of protected methods (ge…
lannymcnie Jun 2, 2017
5f93934
Removed deprecated properties on play()
lannymcnie Jun 2, 2017
472260d
Missed a few @deprecated comments
lannymcnie Jun 2, 2017
c393d16
Updated shared classes from PreloadJS
lannymcnie Jun 2, 2017
ca90905
Updated deprecated method usage on demos
lannymcnie Jun 2, 2017
3f6827a
Missed rename of protected methods in docs
lannymcnie Jun 2, 2017
6ef87e6
Updated shared classes from EaselJS
lannymcnie Jun 8, 2017
ae744ad
Missed a few changes to getter/setters
lannymcnie Jun 8, 2017
4b6bc17
Handled empty playProps
lannymcnie Jun 8, 2017
e8c2e67
Mistakenly removed src param when changing default parameters.
lannymcnie Jun 8, 2017
f25c8cb
Minor doc fixes / formatting
lannymcnie Jun 8, 2017
3730993
Fixed issue where mute/volume were not properly set on new instances …
lannymcnie Jun 8, 2017
d08b298
Edge case were play is called before preloading, causing an RTE
lannymcnie Jun 8, 2017
15f1957
Updates to VERSIONS, docs, and libs
lannymcnie Jun 8, 2017
1e7569d
Updated shared libs to latest
lannymcnie Jun 8, 2017
8ca1ce0
Changed SoundJS static/private properties to be @private instead of @…
lannymcnie Jun 13, 2017
eca6b61
Added patch from https://github.com/Jam3/ios-safe-audio-context
lannymcnie Jun 13, 2017
19c1b1e
Missed a few deprecated property changes
lannymcnie Jun 21, 2017
ec20604
Updated shared PreloadJS (with deprecated fixes)
lannymcnie Jun 21, 2017
39474c9
Updated docs and libs
lannymcnie Jun 21, 2017
789e5a6
EaselJS shared lib bug fix
lannymcnie Jun 22, 2017
43c85f8
Added deprecate utility, and reintroduced deprecated methods for this…
lannymcnie Jun 29, 2017
4cd4bf5
Fixed RTE in WebAudioPlugin during capabilities check when there was …
lannymcnie Jun 29, 2017
b2650b0
Merge branch 'Deprecated'
lannymcnie Jun 29, 2017
a50a6f0
Fixed issue with deprecated play() fallback
lannymcnie Jun 29, 2017
2678a12
Updated deprecate utility
lannymcnie Sep 14, 2017
320090d
Updated NEXT libs and docs
lannymcnie Sep 14, 2017
c1a3f66
Updated to 1.0.0
lannymcnie Sep 14, 2017
39e3246
Added NPM support
lannymcnie Sep 15, 2017
1fd1c36
Updated version naming
lannymcnie Sep 15, 2017
ff25923
Updated README
lannymcnie Sep 15, 2017
0defb6a
Updated VERSIONS
lannymcnie Sep 15, 2017
e10a583
Minor demo improvements
lannymcnie Sep 18, 2017
9b831ef
Changed all demos and supporting files to the *new* correct naming of…
lannymcnie Sep 18, 2017
0f45ba5
Tweak the build to only append -NEXT when running a grunt next build.
lannymcnie Sep 18, 2017
08b449b
Add correct path for jsdelivr.
wdamien Sep 18, 2017
1019c8f
1.0.1
wdamien Sep 18, 2017
4859132
Updated bower main to new renamed file
lannymcnie Sep 28, 2017
f949114
Merge branch 'master' of https://github.com/CreateJS/SoundJS
lannymcnie Sep 28, 2017
33b1303
Internal preloading was using deprecated method name
lannymcnie Oct 10, 2017
dc873d1
Missing deprecated handling (changed to underscore syntax for protect…
lannymcnie Oct 10, 2017
640d610
Updated libs
lannymcnie Oct 10, 2017
863a40d
New libs with Sound 1.0 fix
lannymcnie Oct 12, 2017
2ef2de8
Updated SoundJS version for NPM
lannymcnie Oct 12, 2017
ed23b6b
Minor demo issues
lannymcnie Oct 16, 2017
a95abb5
Updated https in tutorials
lannymcnie Oct 16, 2017
83b1517
Fixed https in doc assets
lannymcnie Oct 16, 2017
a83ffe7
Fixed possible issues when internal preloading completes.
lannymcnie Nov 8, 2017
c49fd3f
Typo in comments.
lannymcnie Nov 8, 2017
f08592e
Create ISSUE_TEMPLATE.md
wdamien Dec 6, 2017
c4c7522
Missing class documentation
lannymcnie May 22, 2018
abbc98b
Minor fix for canceled handling
lannymcnie May 22, 2018
357d48c
Doc'd deprecated methods
lannymcnie May 22, 2018
482b752
Update to latest shared class
lannymcnie Mar 27, 2019
416db50
Minor update to deprecated docs
lannymcnie Mar 27, 2019
930ba01
docs: Fix simple typo, ammount -> amount
timgates42 Sep 22, 2020
999d586
Merge pull request #325 from timgates42/bugfix_typo_amount
danzen Sep 22, 2020
5213ac5
Adjusted XHR test and added warning reply
danzen Mar 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
_assets
build
bower.json
dev
docs
examples
extras
icon.png
lib/**-NEXT**.js
spikes
src
tests
tutorials
VERSIONS.txt
27 changes: 27 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
### TODO
- [ ] Is this a question or bug? [Stack Overflow](https://stackoverflow.com/questions/tagged/createjs) is a much better place to ask any questions you may have.

- [ ] Did you search the [issues](https://github.com/CreateJS/SoundJS/issues) to see if someone else has already reported your issue? If yes, please add more details if you have any!

- [ ] If you're using an older [version](https://github.com/CreateJS/SoundJS/blob/master/VERSIONS.txt), have you tried the latest?

- [ ] If you're requesting a new feature; provide as many details as you can. Why do you want this feature? Do you have ideas for how this feature should be implemented? Pseudocode is always welcome!


### Issue Details
* Version used (Ex; 1.0):


* Describe whats happening (Include any relevant console errors, a [Gist](https://gist.github.com/) is preferred for longer errors):



* OS & Browser version *(Please be specific)* (Ex; Windows 10 Home, Chrome 62.0.3202.94):



* Do you know of any workarounds?



* Provide any extra details that will help us fix your issue. Including a link to a [CodePen.io](https://codepen.io) or [JSFiddle.net](https://jsfiddle.net) example that shows the issue in isolation will greatly increase the chance of getting a quick response.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

SoundJS is a library to make working with audio on the web easier. It provides a consistent API for playing audio in
different browsers, including using a target plugin model to provide an easy way to provide additional audio plugins
like a Flash fallback. A mechanism has been provided for easily tying in audio preloading to
[PreloadJS](http://createjs.com/preloadjs/).
like a Flash fallback (included, but must be used separately from the combined/minified version).

A mechanism has been provided for easily tying in audio preloading to [PreloadJS](http://createjs.com/preloadjs/).


## Example
Expand Down
28 changes: 25 additions & 3 deletions VERSIONS.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,30 @@
Version NEXT [Not yet released]
Version 1.0.0 (September 14, 2017)
****************************************************************************************************
* Changed XHR error conditions to only include 400-599. Specifically removed status=0 as an error,
CRITICAL
- removed deprecated properties, particularly getValue/setValue properties, in favour of .value
this particularly affects instance and global properties like mute, volume, pan, etc.
- removed deprecated TYPE duplicates, notably the loader types (LoadQueue.SOUND, AbstractLoader.SOUND)
in place of the Types.SOUND, and request methods (LoadQueue.POST, AbstractLoader.POST) in place
of Methods.POST.
- Deprecated get/set methods are now protect with an underscore (eg _setEnabled)
The deprecated methods and properties will still work, but will display a console warning when used.
- Sound.play is no longer overloaded, and only takes a source and an initialization object
(or PlayPropsConfig) instead of a bunch of arguments. A console warning will be displayed if the
old approach is used, and additional arguments will be ignored.
- Changed version naming to use soundjs.js, instead of containing the version number

*****
- changed XHR error conditions to only include 400-599. Specifically removed status=0 as an error,
which affects compiled applications.
* Fixed issue where values don't get appended to GET requests in XHRRequest
- fixed issue where values don't get appended to GET requests in XHRRequest
- added "touchstart" as an audio unlocking event, which seems to be the best for iOS
- checked if preload candidates are videos, since SoundJS mistakenly handles these when they are mp4.
- added missing Methods and Types classes from recent PreloadJS changes
- handled case where audio duration returned < 0, resulting in a DOM Error
- fixed issue where new instances wouldn't get the global mute/volume (thanks @PythonFanboy)
- added a shared createjs.deprecate() method, which wraps old methods and property getter/setters to display
a console warning when used.
- fixed an issue with the initial 1.0.0 build that used a deprecated property that was improperly removed


Version 0.6.2 [November 26, 2015]
Expand Down
7 changes: 4 additions & 3 deletions _assets/libs/easeljs-NEXT.min.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions _assets/libs/preloadjs-NEXT.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _assets/libs/tweenjs-NEXT.min.js

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"name": "SoundJS",
"version": "0.6.2",
"version": "1.0.0",
"homepage": "https://github.com/CreateJS/SoundJS",
"authors": [
"lannymcnie",
"OJayRobinson",
"gskinner",
"wdamien"
],
"description": "A Javascript library for working with Audio. Features a simple interface as the front end to multiple audio APIs via a plugin model. Currently supports WebAudio, HTML5 Audio, and a Flash fallback. Part of the CreateJS suite of libraries.",
"main": "lib/soundjs-0.6.2.combined.js",
"main": "lib/soundjs.js",
"keywords": [
"sound",
"audio",
Expand Down
18 changes: 10 additions & 8 deletions build/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ module.exports = function (grunt) {

// Default values
version: 'NEXT',
fileVersion: '-<%= version %>',
name: 'soundjs',

// Setup doc names / paths.
docsName: '<%= pkg.name %>_docs-<%= version %>',
docsName: '<%= pkg.name %>_docs<%= fileVersion %>',
docsZip: "<%= docsName %>.zip",

// Setup Uglify for JS minification.
Expand All @@ -30,9 +31,9 @@ module.exports = function (grunt) {
},
build: {
files: {
'output/<%= pkg.name.toLowerCase() %>-<%= version %>.min.js': getConfigValue('source'),
'output/flashaudioplugin-<%= version %>.min.js': getConfigValue('flashaudioplugin_source'),
'output/cordovaaudioplugin-<%= version %>.min.js': getConfigValue('cordovaaudioplugin_source'),
'output/<%= pkg.name.toLowerCase() %><%= fileVersion %>.min.js': getConfigValue('source'),
'output/flashaudioplugin<%= fileVersion %>.min.js': getConfigValue('flashaudioplugin_source'),
'output/cordovaaudioplugin<%= fileVersion %>.min.js': getConfigValue('cordovaaudioplugin_source'),
}
}
},
Expand Down Expand Up @@ -71,13 +72,13 @@ module.exports = function (grunt) {
},
build: {
files: {
'output/<%= pkg.name.toLowerCase() %>-<%= version %>.combined.js': combineSource([
'output/<%= pkg.name.toLowerCase() %><%= fileVersion %>.js': combineSource([
{cwd: '', config:'config.json', source:'source'}
]),
'output/flashaudioplugin-<%= version %>.combined.js': combineSource([
'output/flashaudioplugin<%= fileVersion %>.js': combineSource([
{cwd: '', config:'config.json', source:'flashaudioplugin_source'}
]),
'output/cordovaaudioplugin-<%= version %>.combined.js': combineSource([
'output/cordovaaudioplugin<%= fileVersion %>.js': combineSource([
{cwd: '', config:'config.json', source:'cordovaaudioplugin_source'}
])
}
Expand Down Expand Up @@ -135,7 +136,7 @@ module.exports = function (grunt) {
},
src: {
files: [
{expand: true, cwd:'./output/', src: '*<%=version %>*.js', dest: '../lib/'}
{expand: true, cwd:'./output/', src: '*<%=fileVersion %>*.js', dest: '../lib/'}
]
}
},
Expand Down Expand Up @@ -315,6 +316,7 @@ module.exports = function (grunt) {
*/
grunt.registerTask('setVersion', function () {
grunt.config.set('version', grunt.config.get('pkg').version);
grunt.config.set('fileVersion', '');
});

/**
Expand Down
18 changes: 12 additions & 6 deletions build/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@

"../src/createjs/utils/extend.js",
"../src/createjs/utils/promote.js",
"../src/createjs/utils/IndexOf.js",
"../src/createjs/utils/Proxy.js",
"../src/createjs/utils/deprecate.js",
"../src/createjs/utils/indexOf.js",
"../src/createjs/utils/proxy.js",
"../src/createjs/utils/BrowserDetect.js",
"../src/createjs/events/EventDispatcher.js",
"../src/createjs/events/Event.js",

"../src/createjs/events/ErrorEvent.js",

"../src/preloadjs/events/ProgressEvent.js",
"../src/preloadjs/data/LoadItem.js",
"../src/preloadjs/data/Methods.js",
"../src/preloadjs/data/Types.js",
"../src/preloadjs/utils/Elements.js",
"../src/preloadjs/utils/DomUtils.js",
"../src/preloadjs/utils/RequestUtils.js",
"../src/preloadjs/utils/URLUtils.js",
"../src/preloadjs/loaders/AbstractLoader.js",
"../src/preloadjs/loaders/AbstractMediaLoader.js",
"../src/preloadjs/net/AbstractRequest.js",
Expand All @@ -27,9 +33,9 @@
"../src/soundjs/Sound.js",
"../src/soundjs/AbstractSoundInstance.js",
"../src/soundjs/AbstractPlugin.js",
"../src/soundjs/webAudio/WebAudioLoader.js",
"../src/soundjs/webAudio/WebAudioSoundInstance.js",
"../src/soundjs/webAudio/WebAudioPlugin.js",
"../src/soundjs/webaudio/WebAudioLoader.js",
"../src/soundjs/webaudio/WebAudioSoundInstance.js",
"../src/soundjs/webaudio/WebAudioPlugin.js",
"../src/soundjs/htmlaudio/HTMLAudioTagPool.js",
"../src/soundjs/htmlaudio/HTMLAudioSoundInstance.js",
"../src/soundjs/htmlaudio/HTMLAudioPlugin.js"
Expand Down
2 changes: 1 addition & 1 deletion build/createjsTheme/assets/css/yui-cssgrids-min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/createjsTheme/assets/js/yui-source.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/createjsTheme/assets/scss/settings/fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ $fontFamily-secondary: 'Proxima Nova', sans-serif;
// Weights: 400, 500

// Monospace Font
@import url("http://fonts.googleapis.com/css?family=Source+Code+Pro&subset=latin,latin-ext");
@import url("https://fonts.googleapis.com/css?family=Source+Code+Pro&subset=latin,latin-ext");
$fontFamily-monospace: 'Source Code Pro', monospace;
// Weights: 400

Expand Down
2 changes: 1 addition & 1 deletion build/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SoundJS",
"version": "0.6.2",
"version": "1.0.0",
"description": "SoundJS Docs",
"url": "http://www.createjs.com/soundjs",
"logo": "assets/docs-icon-SoundJS.png",
Expand Down
Binary file removed docs/SoundJS_docs-0.6.2.zip
Binary file not shown.
Binary file added docs/SoundJS_docs.zip
Binary file not shown.
Binary file modified docs/soundjs_docs-NEXT.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/00_Basics.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h2>Sorry!</h2>
Thank you.</p>
</div>

<script type="text/javascript" src="../lib/soundjs-NEXT.combined.js"></script>
<script type="text/javascript" src="../lib/soundjs-NEXT.js"></script>
<!-- We also provide hosted minified versions of all CreateJS libraries.
http://code.createjs.com -->

Expand Down
4 changes: 2 additions & 2 deletions examples/01_LoadWithPreloadJS.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ <h2>Sorry!</h2>
</div>

<script type="text/javascript" src="../_assets/libs/preloadjs-NEXT.min.js"></script>
<script type="text/javascript" src="../lib/soundjs-NEXT.combined.js"></script>
<script type="text/javascript" src="../lib/soundjs-NEXT.js"></script>
<!-- Note: FlashAudioPlugin is only needed to support older browsers -->
<script type="text/javascript" src="../lib/flashaudioplugin-NEXT.combined.js"></script>
<script type="text/javascript" src="../lib/flashaudioplugin-NEXT.js"></script>

<!-- We also provide hosted minified versions of all CreateJS libraries.
http://code.createjs.com -->
Expand Down
2 changes: 1 addition & 1 deletion examples/02_PlayOnClick.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h2>Sorry!</h2>
with the device and browser you are using. Thank you.</p>
</div>

<script type="text/javascript" src="../lib/soundjs-NEXT.combined.js"></script>
<script type="text/javascript" src="../lib/soundjs-NEXT.js"></script>
<!-- We also provide hosted minified versions of all CreateJS libraries.
http://code.createjs.com -->

Expand Down
2 changes: 1 addition & 1 deletion examples/03_PlayWithEaselJS.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h2>Sorry!</h2>

<script type="text/javascript" src="../_assets/libs/easeljs-NEXT.min.js"></script>
<script type="text/javascript" src="../_assets/libs/preloadjs-NEXT.min.js"></script>
<script type="text/javascript" src="../lib/soundjs-NEXT.combined.js"></script>
<script type="text/javascript" src="../lib/soundjs-NEXT.js"></script>
<!-- We also provide hosted minified versions of all CreateJS libraries.
http://code.createjs.com -->

Expand Down
Loading