opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Client: update raven.js to 1.1.17

Browse Source
This commit is contained in:
Carl Eberhard
2015-03-17 11:55:12 -04:00
parent 2632738584
commit bcd1701a4b
3 changed files with 95 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/libs/raven.js
+93 -60
View File
@@ -1,10 +1,10 @@
/*! Raven.js 1.1.16 (463f68f) | github.com/getsentry/raven-js */
/*! Raven.js 1.1.17 (aa35178) | github.com/getsentry/raven-js */
/*
* Includes TraceKit
* https://github.com/getsentry/TraceKit
*
* Copyright 2014 Matt Robenolt and other contributors
* Copyright 2015 Matt Robenolt and other contributors
* Released under the BSD license
* https://github.com/getsentry/raven-js/blob/master/LICENSE
*
@@ -270,7 +270,6 @@ TraceKit.report = (function reportModuleWrapper() {
* TraceKit.computeStackTrace: cross-browser stack traces in JavaScript
*
* Syntax:
* s = TraceKit.computeStackTrace.ofCaller([depth])
* s = TraceKit.computeStackTrace(exception) // consider using TraceKit.report instead (see below)
* Returns:
* s.name - exception name
@@ -318,19 +317,6 @@ TraceKit.report = (function reportModuleWrapper() {
* exceptions (because your catch block will likely be far away from the
* inner function that actually caused the exception).
*
* Tracing example:
* function trace(message) {
* var stackInfo = TraceKit.computeStackTrace.ofCaller();
* var data = message + "\n";
* for(var i in stackInfo.stack) {
* var item = stackInfo.stack[i];
* data += (item.func || '[anonymous]') + "() in " + item.url + ":" + (item.line || '0') + "\n";
* }
* if (window.console)
* console.info(data);
* else
* alert(data);
* }
*/
TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
var debug = false,
@@ -645,8 +631,8 @@ TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
return null;
}
var chrome = /^\s*at (?:((?:\[object object\])?\S+(?: \[as \S+\])?) )?\(?((?:file|https?|chrome-extension):.*?):(\d+)(?::(\d+))?\)?\s*$/i,
gecko = /^\s*(\S*)(?:\((.*?)\))?@((?:file|https?|chrome).*?):(\d+)(?::(\d+))?\s*$/i,
var chrome = /^\s*at (.*?) ?\(?((?:file|https?|chrome-extension):.*?):(\d+)(?::(\d+))?\)?\s*$/i,
gecko = /^\s*(.*?)(?:\((.*?)\))?@((?:file|https?|chrome).*?):(\d+)(?::(\d+))?\s*$/i,
lines = ex.stack.split('\n'),
stack = [],
parts,
@@ -1063,24 +1049,10 @@ TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
return {};
}
/**
* Logs a stacktrace starting from the previous call and working down.
* @param {(number|string)=} depth How many frames deep to trace.
* @return {Object.<string, *>} Stack trace information.
*/
function computeStackTraceOfCaller(depth) {
depth = (depth == null ? 0 : +depth) + 1; // "+ 1" because "ofCaller" should drop one frame
try {
throw new Error();
} catch (ex) {
return computeStackTrace(ex, depth + 1);
}
}
computeStackTrace.augmentStackTraceWithInitialElement = augmentStackTraceWithInitialElement;
computeStackTrace.computeStackTraceFromStackProp = computeStackTraceFromStackProp;
computeStackTrace.guessFunctionName = guessFunctionName;
computeStackTrace.gatherContext = gatherContext;
computeStackTrace.ofCaller = computeStackTraceOfCaller;
return computeStackTrace;
}());
@@ -1091,7 +1063,7 @@ TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
// If there is no JSON, we no-op the core features of Raven
// since JSON is required to encode the payload
var _Raven = window.Raven,
hasJSON = !!(window.JSON && window.JSON.stringify),
hasJSON = !!(typeof JSON === 'object' && JSON.stringify),
lastCapturedException,
lastEventId,
globalServer,
@@ -1106,10 +1078,14 @@ var _Raven = window.Raven,
includePaths: [],
collectWindowErrors: true,
tags: {},
maxMessageLength: 100,
extra: {}
},
authQueryString,
isRavenInstalled = false;
isRavenInstalled = false,
objectPrototype = Object.prototype,
startTime = now();
/*
* The core Raven singleton
@@ -1117,7 +1093,7 @@ var _Raven = window.Raven,
* @this {Raven}
*/
var Raven = {
VERSION: '1.1.16',
VERSION: '1.1.17',
debug: true,
@@ -1159,12 +1135,8 @@ var Raven = {
// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
globalOptions.ignoreErrors.push('Script error.');
globalOptions.ignoreErrors.push('Script error');
// Other variants of external script errors:
globalOptions.ignoreErrors.push('Javascript error: Script error on line 0');
globalOptions.ignoreErrors.push('Javascript error: Script error. on line 0');
globalOptions.ignoreErrors.push(/^Script error\.?$/);
globalOptions.ignoreErrors.push(/^Javascript error: Script error\.? on line 0$/);
// join regexp rules into one big rule
globalOptions.ignoreErrors = joinRegExp(globalOptions.ignoreErrors);
@@ -1319,7 +1291,7 @@ var Raven = {
*/
captureException: function(ex, options) {
// If not an Error is passed through, recall as a message instead
if (!(ex instanceof Error)) return Raven.captureMessage(ex, options);
if (!isError(ex)) return Raven.captureMessage(ex, options);
// Store the raw exception object for potential debugging and introspection
lastCapturedException = ex;
@@ -1348,6 +1320,13 @@ var Raven = {
* @return {Raven}
*/
captureMessage: function(msg, options) {
// config() automagically converts ignoreErrors from a list to a RegExp so we need to test for an
// early call; we'll error on the side of logging anything called before configuration since it's
// probably something you should see:
if (!!globalOptions.ignoreErrors.test && globalOptions.ignoreErrors.test(msg)) {
return;
}
// Fire away!
send(
objectMerge({
@@ -1365,9 +1344,9 @@ var Raven = {
* @return {Raven}
*/
setUserContext: function(user) {
globalUser = user;
globalUser = user;
return Raven;
return Raven;
},
/*
@@ -1377,9 +1356,9 @@ var Raven = {
* @return {Raven}
*/
setExtraContext: function(extra) {
globalOptions.extra = extra || {};
globalOptions.extra = extra || {};
return Raven;
return Raven;
},
/*
@@ -1389,9 +1368,21 @@ var Raven = {
* @return {Raven}
*/
setTagsContext: function(tags) {
globalOptions.tags = tags || {};
globalOptions.tags = tags || {};
return Raven;
return Raven;
},
/*
* Set release version of application
*
* @param {string} release Typically something like a git SHA to identify version
* @return {Raven}
*/
setReleaseContext: function(release) {
globalOptions.release = release;
return Raven;
},
/*
@@ -1410,6 +1401,15 @@ var Raven = {
*/
lastEventId: function() {
return lastEventId;
},
/*
* Determine if Raven is setup and ready to go.
*
* @return {boolean}
*/
isSetup: function() {
return isSetup();
}
};
@@ -1486,11 +1486,23 @@ function isString(what) {
return typeof what === 'string';
}
function isObject(what) {
return typeof what === 'object' && what !== null;
}
function isEmptyObject(what) {
for (var k in what) return false;
return true;
}
// Sorta yanked from https://github.com/joyent/node/blob/aa3b4b4/lib/util.js#L560
// with some tiny modifications
function isError(what) {
return isObject(what) &&
objectPrototype.toString.call(what) === '[object Error]' ||
what instanceof Error;
}
/**
* hasKey, a better form of hasOwnProperty
* Example: hasKey(MainHostObject, property) === true/false
@@ -1499,7 +1511,7 @@ function isEmptyObject(what) {
* @param {string} key to check
*/
function hasKey(object, key) {
return Object.prototype.hasOwnProperty.call(object, key);
return objectPrototype.hasOwnProperty.call(object, key);
}
function each(obj, callback) {
@@ -1658,7 +1670,7 @@ function processException(type, message, fileurl, lineno, frames, options) {
}
// Truncate the message to a max of characters
message = truncate(message, 100);
message = truncate(message, globalOptions.maxMessageLength);
if (globalOptions.ignoreUrls && globalOptions.ignoreUrls.test(fileurl)) return;
if (globalOptions.whitelistUrls && !globalOptions.whitelistUrls.test(fileurl)) return;
@@ -1695,6 +1707,10 @@ function truncate(str, max) {
return str.length <= max ? str : str.substr(0, max) + '\u2026';
}
function now() {
return +new Date();
}
function getHttpData() {
var http = {
url: document.location.href,
@@ -1716,25 +1732,31 @@ function send(data) {
data = objectMerge({
project: globalProject,
logger: globalOptions.logger,
site: globalOptions.site,
platform: 'javascript',
// sentry.interfaces.Http
request: getHttpData()
}, data);
// Merge in the tags and extra separately since objectMerge doesn't handle a deep merge
data.tags = objectMerge(globalOptions.tags, data.tags);
data.extra = objectMerge(globalOptions.extra, data.extra);
data.tags = objectMerge(objectMerge({}, globalOptions.tags), data.tags);
data.extra = objectMerge(objectMerge({}, globalOptions.extra), data.extra);
// Send along our own collected metadata with extra
data.extra = objectMerge({
'session:duration': now() - startTime,
}, data.extra);
// If there are no tags/extra, strip the key from the payload alltogther.
if (isEmptyObject(data.tags)) delete data.tags;
if (isEmptyObject(data.extra)) delete data.extra;
if (globalUser) {
// sentry.interfaces.User
data.user = globalUser;
}
// Include the release iff it's defined in globalOptions
if (globalOptions.release) data.release = globalOptions.release;
if (isFunction(globalOptions.dataCallback)) {
data = globalOptions.dataCallback(data);
}
@@ -1757,6 +1779,7 @@ function makeRequest(data) {
var img = new Image(),
src = globalServer + authQueryString + '&sentry_data=' + encodeURIComponent(JSON.stringify(data));
img.crossOrigin = 'anonymous';
img.onload = function success() {
triggerEvent('success', {
data: data,
@@ -1828,11 +1851,21 @@ function afterLoad() {
afterLoad();
// Expose Raven to the world
window.Raven = Raven;
// AMD
if (typeof define === 'function' && define.amd) {
define('raven', [], function() { return Raven; });
// AMD
window.Raven = Raven;
define('raven', [], function() {
return Raven;
});
} else if (typeof module === 'object') {
// browserify
module.exports = Raven;
} else if (typeof exports === 'object') {
// CommonJS
exports = Raven;
} else {
// Everything else
window.Raven = Raven;
}
})(this);
})(window);
static/maps/libs/raven.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/libs/raven.js
+1 -1
View File
File diff suppressed because one or more lines are too long