View | Details | Raw Unified | Return to bug 28551
Collapse All | Expand All

(-)umc/tools.js (-5 / +12 lines)
 Lines 516-534    Link Here 
516
		},
516
		},
517
517
518
		parseError: function(error) {
518
		parseError: function(error) {
519
			if (!error.data) {
519
			if (error.data) {
520
				return {
521
					status: parseInt(error.data.status, 10) || error.status,
522
					message: error.data.message || '',
523
					result: error.data.result
524
				};
525
			}
526
			if (error.response) {
520
				// no JSON was returned, propably proxy error
527
				// no JSON was returned, propably proxy error
521
				var r = /<title>(.*)<\/title>/;
528
				var r = /<title>(.*)<\/title>/;
522
				return {
529
				return {
523
					status: error.status,
530
					status: error.status,
524
					message: r.test(error.text) ? r.exec(error.text)[1] : 'Internal Server Error',
531
					message: r.test(error.text) ? r.exec(error.text)[1] : this._statusMessages[500],
525
					result: null
532
					result: null
526
				};
533
				};
527
			}
534
			}
528
			return {
535
			return {
529
				status: parseInt(error.data.status, 10) || error.status,
536
				status: 500,
530
				message: error.data.message || '',
537
				message: this._statusMessages[500],
531
				result: error.data.result
538
				result: null
532
			};
539
			};
533
		},
540
		},
534
541

Return to bug 28551