diff options
| author | Sam Potts <sam@potts.es> | 2018-06-29 00:43:02 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-29 00:43:02 +1000 |
| commit | 7de9fd1d65471d54410b6a0069893a38eb1cbb22 (patch) | |
| tree | 47d6c6d997802e7d3efcad41d16d158af915084c /demo/dist/demo.js | |
| parent | ac64350a5fb658f0c9d96063a3cdb8871669cd55 (diff) | |
| parent | 566c05983233f935b2d537b4f9f682e464aab27c (diff) | |
| download | plyr-7de9fd1d65471d54410b6a0069893a38eb1cbb22.tar.lz plyr-7de9fd1d65471d54410b6a0069893a38eb1cbb22.tar.xz plyr-7de9fd1d65471d54410b6a0069893a38eb1cbb22.zip | |
Merge branch 'develop'
# Conflicts:
# changelog.md
# demo/dist/demo.css
# demo/dist/demo.js.map
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# dist/plyr.css
# dist/plyr.js.map
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# package.json
# readme.md
# src/js/plyr.js
# src/js/plyr.polyfilled.js
Diffstat (limited to 'demo/dist/demo.js')
| -rw-r--r-- | demo/dist/demo.js | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/demo/dist/demo.js b/demo/dist/demo.js index fff14b05..7117f631 100644 --- a/demo/dist/demo.js +++ b/demo/dist/demo.js @@ -1874,7 +1874,7 @@ typeof navigator === "object" && (function () { // webpack (using a build step causes webpack #1617). Grunt verifies that // this value matches package.json during build. // See: https://github.com/getsentry/raven-js/issues/465 - VERSION: '3.26.3', + VERSION: '3.26.2', debug: false, @@ -2351,9 +2351,7 @@ typeof navigator === "object" && (function () { return; } - // Always attempt to get stacktrace if message is empty. - // It's the only way to provide any helpful information to the user. - if (this._globalOptions.stacktrace || options.stacktrace || data.message === '') { + if (this._globalOptions.stacktrace || (options && options.stacktrace)) { // fingerprint on msg, not stack trace (legacy behavior, could be revisited) data.fingerprint = data.fingerprint == null ? msg : data.fingerprint; @@ -3510,11 +3508,6 @@ typeof navigator === "object" && (function () { options ); - var ex = data.exception.values[0]; - if (ex.type == null && ex.value === '') { - ex.value = 'Unrecoverable error caught'; - } - // Move mechanism from options to exception interface // We do this, as requiring user to pass `{exception:{mechanism:{ ... }}}` would be // too much @@ -4137,6 +4130,7 @@ typeof navigator === "object" && (function () { tooltips: { controls: true }, + clickToPlay: false, /* controls: [ 'play-large', 'restart', |