1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

merge from dev

This commit is contained in:
Luke Pulverenti 2016-01-30 13:52:33 -05:00
parent 8436c7ff3c
commit db793b9d25
46 changed files with 646 additions and 356 deletions

View file

@ -1,14 +1,14 @@
{
"name": "howler.js",
"version": "1.1.28",
"description": "Javascript audio library for the modern web.",
"main": "howler.js",
"homepage": "https://github.com/goldfire/howler.js",
"_release": "1.1.28",
"version": "1.1.29",
"_release": "1.1.29",
"_resolution": {
"type": "version",
"tag": "v1.1.28",
"commit": "34c22ab507f847bba7bd2eb2b003197cfc54f274"
"tag": "v1.1.29",
"commit": "169feb2702632459cb0eb37bf24a20e1d840f78c"
},
"_source": "git://github.com/goldfire/howler.js.git",
"_target": "~1.1.27",

View file

@ -1,3 +1,9 @@
## 1.1.29 (January 22, 2016)
- `ADDED`: Error messages added onto each `loaderror` event (thanks Philip Silva).
- `FIXED`: Fixed various edge-case bugs by no longer comparing functions by string in `.off()` (thanks richard-livingston).
- `FIXED`: Edge case where multiple overlapping instances of the same sound won't all fire `end` (thanks richard-livingston).
- `FIXED`: `end` event now fires correctly when changing the `rate` of a sound.
## 1.1.28 (October 22, 2015)
- `FIXED`: Fixed typo with iOS enabler that was preventing it from working.

View file

@ -1,6 +1,5 @@
{
"name": "howler.js",
"version": "1.1.27",
"description": "Javascript audio library for the modern web.",
"main": "howler.js"
}

View file

@ -1,8 +1,8 @@
/*!
* howler.js v1.1.28
* howler.js v1.1.29
* howlerjs.com
*
* (c) 2013-2015, James Simpson of GoldFire Studios
* (c) 2013-2016, James Simpson of GoldFire Studios
* goldfirestudios.com
*
* MIT License
@ -139,7 +139,7 @@
/**
* Check for codec support.
* @param {String} ext Audio file extention.
* @param {String} ext Audio file extension.
* @return {Boolean}
*/
codecs: function(ext) {
@ -284,7 +284,7 @@
// if no audio is available, quit immediately
if (noAudio) {
self.on('loaderror');
self.on('loaderror', new Error('No audio support.'));
return;
}
@ -306,7 +306,7 @@
if (ext) {
ext = ext[1].toLowerCase();
} else {
self.on('loaderror');
self.on('loaderror', new Error('Could not extract format from passed URLs, please add format parameter.'));
return;
}
}
@ -318,7 +318,7 @@
}
if (!url) {
self.on('loaderror');
self.on('loaderror', new Error('No codec support for selected audio sources.'));
return;
}
@ -483,7 +483,7 @@
// fire ended event
self.on('end', soundId);
}, duration * 1000);
}, (duration / self._rate) * 1000);
// store the reference to the timer
self._onendTimer.push({timer: timerId, id: data.id});
@ -1060,7 +1060,7 @@
*/
_clearEndTimer: function(soundId) {
var self = this,
index = 0;
index = -1;
// loop through the timers to find the one associated with this sound
for (var i=0; i<self._onendTimer.length; i++) {
@ -1136,13 +1136,12 @@
*/
off: function(event, fn) {
var self = this,
events = self['_on' + event],
fnString = fn ? fn.toString() : null;
events = self['_on' + event];
if (fnString) {
if (fn) {
// loop through functions in the event for comparison
for (var i=0; i<events.length; i++) {
if (fnString === events[i].toString()) {
if (fn === events[i]) {
events.splice(i, 1);
break;
}
@ -1269,7 +1268,7 @@
}
},
function(err) {
obj.on('loaderror');
obj.on('loaderror', err);
}
);
};

File diff suppressed because one or more lines are too long

View file

@ -16,7 +16,7 @@
"url": "git://github.com/goldfire/howler.js.git"
},
"main": "howler.js",
"version": "1.1.27",
"version": "1.1.29",
"license": {
"type": "MIT",
"url": "https://raw.githubusercontent.com/goldfire/howler.js/master/LICENSE.md"