@@ -491,7 +491,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie"; var future = new Date(); future.setYear(2019); - [_swatchCookie setValue: CPJSObjectCreateJSON(result) expires:future domain: nil]; + [_swatchCookie setValue: JSON.stringify(result) expires:future domain: nil]; } - (void)setColorPanel:(CPColorPanel)panel AppKit/CPColorPanel.j @@ -85,7 +85,7 @@ var CPValueValueKey = @"CPValueValueKey"; self = [super init]; if (self) - _JSObject = CPJSObjectCreateWithJSON([aCoder decodeObjectForKey:CPValueValueKey]); + _JSObject = JSON.parse([aCoder decodeObjectForKey:CPValueValueKey]); return self; } @@ -96,7 +96,7 @@ var CPValueValueKey = @"CPValueValueKey"; */ - (void)encodeWithCoder:(CPCoder)aCoder { - [aCoder encodeObject:CPJSObjectCreateJSON(_JSObject) forKey:CPValueValueKey]; + [aCoder encodeObject:JSON.stringify(_JSObject) forKey:CPValueValueKey]; } @end Foundation/CPValue.j @@ -28,7 +28,7 @@ function readConfig(configFile) if (!fileData) throw new Error("Couldn't read file: " + configFile); - var configs = CPJSObjectCreateWithJSON(fileData); + var configs = JSON.parse(fileData); return configs; } Tools/bake/main.j @@ -239,7 +239,7 @@ function main() // add fake bundle response bookkeeping applicationJS.push("var __fakeDidReceiveBundleResponse = " + String(fakeDidReceiveBundleResponse)); - applicationJS.push("var __fakeBundleArchives = " + CPJSObjectCreateJSON(bundleArchives) + ";"); + applicationJS.push("var __fakeBundleArchives = " + JSON.stringify(bundleArchives) + ";"); applicationJS.push("for (var i = 0; i < __fakeBundleArchives.length; i++) __fakeDidReceiveBundleResponse(__fakeBundleArchives[i]);") // add each fragment, wrapped in a function, along with OBJJ_CURRENT_BUNDLE bookkeeping Tools/press/main.j 7c305c45fceb8e87fa9277035cb84744154184e0 Tom Robinson tom@280north.com http://github.com/280north/cappuccino/commit/b0470ca2d7e43766f60b52b154ae3df693b8dc72 b0470ca2d7e43766f60b52b154ae3df693b8dc72 2009-06-02T15:07:07-07:00 2009-06-02T15:07:07-07:00 Update to use JSON.{parse,stringify} a6b85a60043e1b5a7f01fe8dc5433396b6708618 Tom Robinson tom@280north.com