@@ -514,7 +514,7 @@ module.exports.supportsCORS = !module.exports.isNode && (typeof XMLHttpRequest !
514514
515515module . exports . params = ! module . exports . isNode ?qs . parse ( window . location . search . split ( '?' ) . pop ( ) ) :{ } ;
516516
517- } , { "querystring" :12 } ] , 5 :[ function ( _dereq_ , module , exports ) {
517+ } , { "querystring" :11 } ] , 5 :[ function ( _dereq_ , module , exports ) {
518518var _ = _dereq_ ( 'underscore' ) ;
519519
520520var util = _dereq_ ( './util' ) ;
@@ -659,12 +659,20 @@ module.exports = View;
659659
660660} , { "./util" :4 , "underscore" :125 } ] , 6 :[ function ( _dereq_ , module , exports ) {
661661var hasOwn = Object . prototype . hasOwnProperty ;
662- var toString = Object . prototype . toString ;
662+ var toStr = Object . prototype . toString ;
663663var undefined ;
664664
665+ var isArray = function isArray ( arr ) {
666+ if ( typeof Array . isArray === 'function' ) {
667+ return Array . isArray ( arr ) ;
668+ }
669+
670+ return toStr . call ( arr ) === '[object Array]' ;
671+ } ;
672+
665673var isPlainObject = function isPlainObject ( obj ) {
666674 'use strict' ;
667- if ( ! obj || toString . call ( obj ) !== '[object Object]' ) {
675+ if ( ! obj || toStr . call ( obj ) !== '[object Object]' ) {
668676 return false ;
669677 }
670678
@@ -716,10 +724,10 @@ module.exports = function extend() {
716724 }
717725
718726 // Recurse if we're merging plain objects or arrays
719- if ( deep && copy && ( isPlainObject ( copy ) || ( copyIsArray = Array . isArray ( copy ) ) ) ) {
727+ if ( deep && copy && ( isPlainObject ( copy ) || ( copyIsArray = isArray ( copy ) ) ) ) {
720728 if ( copyIsArray ) {
721729 copyIsArray = false ;
722- clone = src && Array . isArray ( src ) ? src : [ ] ;
730+ clone = src && isArray ( src ) ? src : [ ] ;
723731 } else {
724732 clone = src && isPlainObject ( src ) ? src : { } ;
725733 }
@@ -1044,31 +1052,6 @@ function isUndefined(arg) {
10441052}
10451053
10461054} , { } ] , 8 :[ function ( _dereq_ , module , exports ) {
1047- if ( typeof Object . create === 'function' ) {
1048- // implementation from standard node.js 'util' module
1049- module . exports = function inherits ( ctor , superCtor ) {
1050- ctor . super_ = superCtor
1051- ctor . prototype = Object . create ( superCtor . prototype , {
1052- constructor : {
1053- value : ctor ,
1054- enumerable : false ,
1055- writable : true ,
1056- configurable : true
1057- }
1058- } ) ;
1059- } ;
1060- } else {
1061- // old school shim for old browsers
1062- module . exports = function inherits ( ctor , superCtor ) {
1063- ctor . super_ = superCtor
1064- var TempCtor = function ( ) { }
1065- TempCtor . prototype = superCtor . prototype
1066- ctor . prototype = new TempCtor ( )
1067- ctor . prototype . constructor = ctor
1068- }
1069- }
1070-
1071- } , { } ] , 9 :[ function ( _dereq_ , module , exports ) {
10721055// shim for using process in browser
10731056
10741057var process = module . exports = { } ;
@@ -1133,7 +1116,7 @@ process.chdir = function (dir) {
11331116 throw new Error ( 'process.chdir is not supported' ) ;
11341117} ;
11351118
1136- } , { } ] , 10 :[ function ( _dereq_ , module , exports ) {
1119+ } , { } ] , 9 :[ function ( _dereq_ , module , exports ) {
11371120// Copyright Joyent, Inc. and other Node contributors.
11381121//
11391122// Permission is hereby granted, free of charge, to any person obtaining a
@@ -1219,7 +1202,7 @@ var isArray = Array.isArray || function (xs) {
12191202 return Object . prototype . toString . call ( xs ) === '[object Array]' ;
12201203} ;
12211204
1222- } , { } ] , 11 :[ function ( _dereq_ , module , exports ) {
1205+ } , { } ] , 10 :[ function ( _dereq_ , module , exports ) {
12231206// Copyright Joyent, Inc. and other Node contributors.
12241207//
12251208// Permission is hereby granted, free of charge, to any person obtaining a
@@ -1306,13 +1289,38 @@ var objectKeys = Object.keys || function (obj) {
13061289 return res ;
13071290} ;
13081291
1309- } , { } ] , 12 :[ function ( _dereq_ , module , exports ) {
1292+ } , { } ] , 11 :[ function ( _dereq_ , module , exports ) {
13101293'use strict' ;
13111294
13121295exports . decode = exports . parse = _dereq_ ( './decode' ) ;
13131296exports . encode = exports . stringify = _dereq_ ( './encode' ) ;
13141297
1315- } , { "./decode" :10 , "./encode" :11 } ] , 13 :[ function ( _dereq_ , module , exports ) {
1298+ } , { "./decode" :9 , "./encode" :10 } ] , 12 :[ function ( _dereq_ , module , exports ) {
1299+ if ( typeof Object . create === 'function' ) {
1300+ // implementation from standard node.js 'util' module
1301+ module . exports = function inherits ( ctor , superCtor ) {
1302+ ctor . super_ = superCtor
1303+ ctor . prototype = Object . create ( superCtor . prototype , {
1304+ constructor : {
1305+ value : ctor ,
1306+ enumerable : false ,
1307+ writable : true ,
1308+ configurable : true
1309+ }
1310+ } ) ;
1311+ } ;
1312+ } else {
1313+ // old school shim for old browsers
1314+ module . exports = function inherits ( ctor , superCtor ) {
1315+ ctor . super_ = superCtor
1316+ var TempCtor = function ( ) { }
1317+ TempCtor . prototype = superCtor . prototype
1318+ ctor . prototype = new TempCtor ( )
1319+ ctor . prototype . constructor = ctor
1320+ }
1321+ }
1322+
1323+ } , { } ] , 13 :[ function ( _dereq_ , module , exports ) {
13161324module . exports = function isBuffer ( arg ) {
13171325 return arg && typeof arg === 'object'
13181326 && typeof arg . copy === 'function'
@@ -1909,7 +1917,7 @@ function hasOwnProperty(obj, prop) {
19091917}
19101918
19111919} ) . call ( this , _dereq_ ( "IrXUsu" ) , typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : { } )
1912- } , { "./support/isBuffer" :13 , "IrXUsu" :9 , "inherits" :8 } ] , 15 :[ function ( _dereq_ , module , exports ) {
1920+ } , { "./support/isBuffer" :13 , "IrXUsu" :8 , "inherits" :12 } ] , 15 :[ function ( _dereq_ , module , exports ) {
19131921module . exports = _dereq_ ( './lib' ) ;
19141922} , { "./lib" :40 } ] , 16 :[ function ( _dereq_ , module , exports ) {
19151923module . exports = function ( ) {
@@ -2382,7 +2390,7 @@ module.exports = reduce;
23822390
23832391} , { "lodash.createcallback" :44 , "lodash.forown" :80 } ] , 44 :[ function ( _dereq_ , module , exports ) {
23842392/**
2385- * Lo-Dash 2.4.1 (Custom Build) <http://lodash.com/>
2393+ * Lo-Dash 2.4.4 (Custom Build) <http://lodash.com/>
23862394 * Build: `lodash modularize modern exports="npm" -o ./npm/`
23872395 * Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
23882396 * Based on Underscore.js 1.5.2 <http://underscorejs.org/LICENSE>
@@ -4962,11 +4970,7 @@ internals.parseValues = function (str, options) {
49624970 var key = Utils . decode ( part . slice ( 0 , pos ) ) ;
49634971 var val = Utils . decode ( part . slice ( pos + 1 ) ) ;
49644972
4965- if ( Object . prototype . hasOwnProperty ( key ) ) {
4966- continue ;
4967- }
4968-
4969- if ( ! obj . hasOwnProperty ( key ) ) {
4973+ if ( ! Object . prototype . hasOwnProperty . call ( obj , key ) ) {
49704974 obj [ key ] = val ;
49714975 }
49724976 else {
@@ -5594,7 +5598,9 @@ function parseHeader(str) {
55945598 */
55955599
55965600function isJSON ( mime ) {
5597- return / [ \/ + ] j s o n \b / . test ( mime ) ;
5601+ // should match /json or +json
5602+ // but not /json-seq
5603+ return / [ \/ + ] j s o n ( $ | [ ^ - \w ] ) / . test ( mime ) ;
55985604}
55995605
56005606/**
0 commit comments