Skip to content

Commit 77b210b

Browse files
committed
1.1.22
1 parent 6278810 commit 77b210b

8 files changed

+61
-48
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 1.1.22
4+
5+
* Fix another outstanding bug related to https://github.com/getsentry/raven-js/issues/377 that wasn't fully resolved with 1.1.21
6+
* Laid groundwork for pluggable transports, but not ready for public consumption yet
7+
38
## 1.1.21
49

510
* Fix a bug where calling `captureException` before calling `Raven.config()` would trigger it's own exception. See: https://github.com/getsentry/raven-js/issues/377

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "raven-js",
3-
"version": "1.1.21",
3+
"version": "1.1.22",
44
"dependencies": {},
55
"main": "dist/raven.js",
66
"ignore": [

dist/raven.js

+48-40
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Raven.js 1.1.21 (8995c6d) | github.com/getsentry/raven-js */
1+
/*! Raven.js 1.1.22 (6278810) | github.com/getsentry/raven-js */
22

33
/*
44
* Includes TraceKit
@@ -1101,7 +1101,6 @@ var _Raven = window.Raven,
11011101
maxMessageLength: 100,
11021102
extra: {}
11031103
},
1104-
authQueryString,
11051104
isRavenInstalled = false,
11061105
objectPrototype = Object.prototype,
11071106
// capture references to window.console *and* all its methods first
@@ -1119,7 +1118,7 @@ for (var method in originalConsole) {
11191118
* @this {Raven}
11201119
*/
11211120
var Raven = {
1122-
VERSION: '1.1.21',
1121+
VERSION: '1.1.22',
11231122

11241123
debug: true,
11251124

@@ -1192,8 +1191,6 @@ var Raven = {
11921191

11931192
TraceKit.collectWindowErrors = !!globalOptions.collectWindowErrors;
11941193

1195-
setAuthQueryString();
1196-
11971194
// return for chaining
11981195
return Raven;
11991196
},
@@ -1586,15 +1583,6 @@ function each(obj, callback) {
15861583
}
15871584
}
15881585

1589-
1590-
function setAuthQueryString() {
1591-
authQueryString =
1592-
'?sentry_version=4' +
1593-
'&sentry_client=raven-js/' + Raven.VERSION +
1594-
'&sentry_key=' + globalKey;
1595-
}
1596-
1597-
15981586
function handleStackInfo(stackInfo, options) {
15991587
var frames = [];
16001588

@@ -1693,7 +1681,7 @@ function extractContextFromFrame(frame) {
16931681
function processException(type, message, fileurl, lineno, frames, options) {
16941682
var stacktrace, i, fullMessage;
16951683

1696-
if (globalOptions.ignoreErrors.test(message)) return;
1684+
if (!!globalOptions.ignoreErrors.test && globalOptions.ignoreErrors.test(message)) return;
16971685

16981686
message += '';
16991687
message = truncate(message, globalOptions.maxMessageLength);
@@ -1717,8 +1705,8 @@ function processException(type, message, fileurl, lineno, frames, options) {
17171705
};
17181706
}
17191707

1720-
if (globalOptions.ignoreUrls && globalOptions.ignoreUrls.test(fileurl)) return;
1721-
if (globalOptions.whitelistUrls && !globalOptions.whitelistUrls.test(fileurl)) return;
1708+
if (!!globalOptions.ignoreUrls.test && globalOptions.ignoreUrls.test(fileurl)) return;
1709+
if (!!globalOptions.whitelistUrls.test && !globalOptions.whitelistUrls.test(fileurl)) return;
17221710

17231711
// Fire away!
17241712
send(
@@ -1826,35 +1814,46 @@ function send(data) {
18261814
// Set lastEventId after we know the error should actually be sent
18271815
lastEventId = data.event_id || (data.event_id = uuid4());
18281816

1829-
makeRequest(data);
1830-
}
1817+
logDebug('debug', 'Raven about to send:', data);
18311818

1819+
if (!isSetup()) return;
18321820

1833-
function makeRequest(data) {
1834-
var img,
1835-
src;
1821+
(globalOptions.transport || makeRequest)({
1822+
url: globalServer,
1823+
auth: {
1824+
sentry_version: '4',
1825+
sentry_client: 'raven-js/' + Raven.VERSION,
1826+
sentry_key: globalKey
1827+
},
1828+
data: data,
1829+
options: globalOptions,
1830+
onSuccess: function success() {
1831+
triggerEvent('success', {
1832+
data: data,
1833+
src: globalServer
1834+
});
1835+
},
1836+
onError: function failure() {
1837+
triggerEvent('failure', {
1838+
data: data,
1839+
src: globalServer
1840+
});
1841+
}
1842+
});
1843+
}
18361844

1837-
logDebug('debug', 'Raven about to send:', data);
1845+
function makeRequest(opts) {
1846+
// Tack on sentry_data to auth options, which get urlencoded
1847+
opts.auth.sentry_data = JSON.stringify(opts.data);
18381848

1839-
if (!isSetup()) return;
1849+
var img = newImage(),
1850+
src = opts.url + '?' + urlencode(opts.auth);
18401851

1841-
img = newImage();
1842-
src = globalServer + authQueryString + '&sentry_data=' + encodeURIComponent(JSON.stringify(data));
1843-
if (globalOptions.crossOrigin || globalOptions.crossOrigin === '') {
1844-
img.crossOrigin = globalOptions.crossOrigin;
1852+
if (opts.options.crossOrigin || opts.options.crossOrigin === '') {
1853+
img.crossOrigin = opts.options.crossOrigin;
18451854
}
1846-
img.onload = function success() {
1847-
triggerEvent('success', {
1848-
data: data,
1849-
src: src
1850-
});
1851-
};
1852-
img.onerror = img.onabort = function failure() {
1853-
triggerEvent('failure', {
1854-
data: data,
1855-
src: src
1856-
});
1857-
};
1855+
img.onload = opts.onSuccess;
1856+
img.onerror = img.onabort = opts.onError;
18581857
img.src = src;
18591858
}
18601859

@@ -1948,6 +1947,15 @@ function afterLoad() {
19481947
Raven.config(RavenConfig.dsn, RavenConfig.config).install();
19491948
}
19501949
}
1950+
1951+
function urlencode(o) {
1952+
var pairs = [];
1953+
each(o, function(key, value) {
1954+
pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
1955+
});
1956+
return pairs.join('&');
1957+
}
1958+
19511959
afterLoad();
19521960

19531961
// Expose Raven to the world

dist/raven.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/raven.min.map

+1-1
Large diffs are not rendered by default.

docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ you can use our CDN:
2727

2828
.. sourcecode:: html
2929

30-
<script src="//cdn.ravenjs.com/1.1.21/raven.min.js"></script>
30+
<script src="//cdn.ravenjs.com/1.1.22/raven.min.js"></script>
3131

3232
Configuring the Project
3333
-----------------------

docs/install.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ So for example:
99
.. sourcecode:: html
1010

1111
<script src="jquery.js"></script>
12-
<script src="//cdn.ravenjs.com/1.1.21/jquery,native/raven.min.js"></script>
12+
<script src="//cdn.ravenjs.com/1.1.22/jquery,native/raven.min.js"></script>
1313
<script>Raven.config('___PUBLIC_DSN___').install();</script>
1414
<script src="app.js"></script>
1515

@@ -28,7 +28,7 @@ Our CDN distributes builds with and without :doc:`plugins <plugins>`.
2828

2929
.. sourcecode:: html
3030

31-
<script src="//cdn.ravenjs.com/1.1.21/raven.min.js"></script>
31+
<script src="//cdn.ravenjs.com/1.1.22/raven.min.js"></script>
3232

3333
**We highly recommend trying out a plugin or two since it'll greatly
3434
improve the chances that we can collect good information.**

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "raven-js",
3-
"version": "1.1.21",
3+
"version": "1.1.22",
44
"license": "BSD-2-Clause",
55
"homepage": "https://getsentry.com",
66
"scripts": {

0 commit comments

Comments
 (0)