Pastie Support Pastie or read my Pastie << self blog

Language: ActionScript C/C++ CSS Diff HTML (ERB / Rails) HTML / XML Java Javascript Objective C/C++ Pascal Perl PHP Plain text Python Ruby Ruby (on Rails) Shell Script (Bash) SQL YAML  

## mark a section (Learn more)

This paste will be private.

Index: /Users/jan/webdev/moodev/mootools/trunk/Remote/Json.js =================================================================== --- /Users/jan/webdev/moodev/mootools/trunk/Remote/Json.js (revision 757) +++ /Users/jan/webdev/moodev/mootools/trunk/Remote/Json.js (working copy) @@ -30,9 +30,11 @@ */ encode: function(obj){ + if(obj.toJSON) return obj.toJSON(); switch ($type(obj)){ case 'string': return '"' + obj.replace(/[\x00-\x1f\\"]/g, Json.$replaceChars) + '"'; + case 'arguments': obj = $A(obj); case 'array': return '[' + obj.map(Json.encode).filter($defined).join(',') + ']'; case 'object': Index: /Users/jan/webdev/moodev/mootools/trunk/Remote/XHR.js =================================================================== --- /Users/jan/webdev/moodev/mootools/trunk/Remote/XHR.js (revision 757) +++ /Users/jan/webdev/moodev/mootools/trunk/Remote/XHR.js (working copy) @@ -63,7 +63,7 @@ this.setTransport(); this.setOptions(params.options); this.options.isSuccess = this.options.isSuccess || this.isSuccess; - this.headers = $merge(this.options.headers); + this.headers = $merge({'X-Requested-With': 'XMLHttpRequest'}, this.options.headers); if (this.options.urlEncoded && this.options.method != 'get'){ var encoding = (this.options.encoding) ? '; charset=' + this.options.encoding : ''; this.setHeader('Content-type', 'application/x-www-form-urlencoded' + encoding); Index: /Users/jan/webdev/moodev/mootools/trunk/Remote/Ajax.js =================================================================== --- /Users/jan/webdev/moodev/mootools/trunk/Remote/Ajax.js (revision 757) +++ /Users/jan/webdev/moodev/mootools/trunk/Remote/Ajax.js (working copy) @@ -46,7 +46,6 @@ this._method = '_method=' + this.options.method; this.options.method = 'post'; } - this.setHeader('X-Requested-With', 'XMLHttpRequest'); this.setHeader('Accept', 'text/javascript, text/html, application/xml, text/xml, */*'); }, Index: /Users/jan/webdev/moodev/mootools/trunk/Remote/Json.Remote.js =================================================================== --- /Users/jan/webdev/moodev/mootools/trunk/Remote/Json.Remote.js (revision 757) +++ /Users/jan/webdev/moodev/mootools/trunk/Remote/Json.Remote.js (working copy) @@ -32,6 +32,7 @@ this.parent(url, options); this.addEvent('onSuccess', this.onComplete, true); this.setHeader('X-Request', 'JSON'); + this.setHeader('Accept', 'text/javascript'); }, send: function(obj){