@@ -3546,7 +3546,7 @@ static bool jsCocoaObject_setProperty(JSContextRef ctx, JSObjectRef object, JSSt } } // Check if delegate handles calling - if ([delegate respondsToSelector:@selector(JSCocoa:callMethod:ofObject:argumentCount:arguments:inContext:exception:)]) + if ([delegate respondsToSelector:@selector(JSCocoa:callMethod:ofObject:privateObject:argumentCount:arguments:inContext:exception:)]) { JSValueRef delegateCall = [delegate JSCocoa:jsc callMethod:setterName ofObject:callee privateObject:privateObject argumentCount:0 arguments:NULL inContext:ctx exception:exception]; if (delegateCall) return !!delegateCall; JSCocoa/JSCocoaController.m @@ -578,7 +578,7 @@ int dummyValue; methodName = _methodName; return canCallObjC; } -- (JSValueRef) JSCocoa:(JSCocoaController*)controller callMethod:(NSString*)_methodName ofObject:(id)_object argumentCount:(int)argumentCount arguments:(JSValueRef*)arguments inContext:(JSContextRef)ctx exception:(JSValueRef*)exception +- (JSValueRef) JSCocoa:(JSCocoaController*)controller callMethod:(NSString*)_methodName ofObject:(id)_object privateObject:(JSCocoaPrivateObject*)thisPrivateObject argumentCount:(int)argumentCount arguments:(JSValueRef*)arguments inContext:(JSContextRef)ctx exception:(JSValueRef*)exception { // NSLog(@"custom method call %@.%@", _object, _methodName); object = _object; TestsRunner/ApplicationController.m @@ -202,6 +202,126 @@ <key>Content</key> <dict> <key>PBXProjectModuleGUID</key> + <string>3D1C5D2D1087157700F7B3D4</string> + <key>PBXProjectModuleLabel</key> + <string>ApplicationController.m</string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>3D1C5D2E1087157700F7B3D4</string> + <key>PBXProjectModuleLabel</key> + <string>ApplicationController.m</string> + <key>_historyCapacity</key> + <integer>0</integer> + <key>bookmark</key> + <string>3D1C5D3C108715D700F7B3D4</string> + <key>history</key> + <array> + <string>3D1C5D271087152B00F7B3D4</string> + </array> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <true/> + </dict> + <key>Geometry</key> + <dict> + <key>Frame</key> + <string>{{0, 20}, {968, 907}}</string> + <key>PBXModuleWindowStatusBarHidden2</key> + <false/> + <key>RubberWindowFrame</key> + <string>507 167 968 948 0 0 1920 1178 </string> + </dict> + </dict> + <dict> + <key>Content</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>3D1C5D211087151F00F7B3D4</string> + <key>PBXProjectModuleLabel</key> + <string>JSCocoaController.h</string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>3D1C5D221087151F00F7B3D4</string> + <key>PBXProjectModuleLabel</key> + <string>JSCocoaController.h</string> + <key>_historyCapacity</key> + <integer>0</integer> + <key>bookmark</key> + <string>3D1C5D3D108715D700F7B3D4</string> + <key>history</key> + <array> + <string>3D1C5D301087157700F7B3D4</string> + </array> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <true/> + </dict> + <key>Geometry</key> + <dict> + <key>Frame</key> + <string>{{0, 20}, {968, 907}}</string> + <key>PBXModuleWindowStatusBarHidden2</key> + <false/> + <key>RubberWindowFrame</key> + <string>597 142 968 948 0 0 1920 1178 </string> + </dict> + </dict> + <dict> + <key>Content</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>3D1C5D13108714CD00F7B3D4</string> + <key>PBXProjectModuleLabel</key> + <string>JSCocoaController.m</string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>3D1C5D14108714CD00F7B3D4</string> + <key>PBXProjectModuleLabel</key> + <string>JSCocoaController.m</string> + <key>_historyCapacity</key> + <integer>0</integer> + <key>bookmark</key> + <string>3D1C5D3E108715D700F7B3D4</string> + <key>history</key> + <array> + <string>3D1C5D0E108714B800F7B3D4</string> + </array> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <true/> + </dict> + <key>Geometry</key> + <dict> + <key>Frame</key> + <string>{{0, 20}, {968, 907}}</string> + <key>PBXModuleWindowStatusBarHidden2</key> + <false/> + <key>RubberWindowFrame</key> + <string>751 89 968 948 0 0 1920 1178 </string> + </dict> + </dict> + <dict> + <key>Content</key> + <dict> + <key>PBXProjectModuleGUID</key> <string>3D1C5D051086916900F7B3D4</string> <key>PBXProjectModuleLabel</key> <string>0 blank.js</string> @@ -216,7 +336,7 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>3D1C5D0D108709F200F7B3D4</string> + <string>3D1C5D3F108715D700F7B3D4</string> <key>history</key> <array> <string>3D1C5D021086915C00F7B3D4</string> @@ -318,14 +438,13 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>28</integer> - <integer>26</integer> - <integer>25</integer> + <integer>8</integer> + <integer>1</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 233}, {341, 337}}</string> + <string>{{0, 74}, {341, 337}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -529,11 +648,14 @@ <string>3D1C58B2107B821A00F7B3D4</string> <string>3D1C58B5107B821A00F7B3D4</string> <string>3D1C58B6107B821A00F7B3D4</string> - <string>1C530D54069F1CE1000CFCEE</string> <string>1C530D52069F1CE1000CFCEE</string> - <string>/Users/mini/Software Inexdo/JSCocoa/TestsRunner/TestsRunner.xcodeproj</string> - <string>1C530D5B069F1CE1000CFCEE</string> <string>3D1C5D051086916900F7B3D4</string> + <string>3D1C5D13108714CD00F7B3D4</string> + <string>1C530D54069F1CE1000CFCEE</string> + <string>3D1C5D211087151F00F7B3D4</string> + <string>3D1C5D2D1087157700F7B3D4</string> + <string>1C530D5B069F1CE1000CFCEE</string> + <string>/Users/mini/Software Inexdo/JSCocoa/TestsRunner/TestsRunner.xcodeproj</string> </array> <key>WindowString</key> <string>1562 755 358 423 0 0 1920 1178 </string> @@ -848,10 +970,10 @@ <key>Frame</key> <string>{{551, 0}, {637, 333}}</string> <key>RubberWindowFrame</key> - <string>160 154 1188 670 0 0 1920 1178 </string> + <string>279 349 1188 670 0 0 1920 1178 </string> </dict> <key>RubberWindowFrame</key> - <string>160 154 1188 670 0 0 1920 1178 </string> + <string>279 349 1188 670 0 0 1920 1178 </string> </dict> <key>Module</key> <string>PBXDebugSessionModule</string> @@ -885,11 +1007,11 @@ <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> <key>WindowString</key> - <string>160 154 1188 670 0 0 1920 1178 </string> + <string>279 349 1188 670 0 0 1920 1178 </string> <key>WindowToolGUID</key> <string>1C530D54069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -907,6 +1029,8 @@ <key>Dock</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -933,8 +1057,6 @@ <string>358pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> TestsRunner/TestsRunner.xcodeproj/mini.mode2v3 @@ -404,6 +404,27 @@ 3D1C5D071086916900F7B3D4 /* PBXTextBookmark */ = 3D1C5D071086916900F7B3D4 /* PBXTextBookmark */; 3D1C5D0B1086917F00F7B3D4 /* PBXTextBookmark */ = 3D1C5D0B1086917F00F7B3D4 /* PBXTextBookmark */; 3D1C5D0D108709F200F7B3D4 /* PBXTextBookmark */ = 3D1C5D0D108709F200F7B3D4 /* PBXTextBookmark */; + 3D1C5D0E108714B800F7B3D4 /* PBXBookmark */ = 3D1C5D0E108714B800F7B3D4 /* PBXBookmark */; + 3D1C5D15108714CD00F7B3D4 /* PBXTextBookmark */ = 3D1C5D15108714CD00F7B3D4 /* PBXTextBookmark */; + 3D1C5D16108714CD00F7B3D4 /* PBXTextBookmark */ = 3D1C5D16108714CD00F7B3D4 /* PBXTextBookmark */; + 3D1C5D1E1087151C00F7B3D4 /* PBXBookmark */ = 3D1C5D1E1087151C00F7B3D4 /* PBXBookmark */; + 3D1C5D231087151F00F7B3D4 /* PBXTextBookmark */ = 3D1C5D231087151F00F7B3D4 /* PBXTextBookmark */; + 3D1C5D241087151F00F7B3D4 /* PBXTextBookmark */ = 3D1C5D241087151F00F7B3D4 /* PBXTextBookmark */; + 3D1C5D251087151F00F7B3D4 /* PBXTextBookmark */ = 3D1C5D251087151F00F7B3D4 /* PBXTextBookmark */; + 3D1C5D271087152B00F7B3D4 /* PBXBookmark */ = 3D1C5D271087152B00F7B3D4 /* PBXBookmark */; + 3D1C5D2F1087157700F7B3D4 /* PBXTextBookmark */ = 3D1C5D2F1087157700F7B3D4 /* PBXTextBookmark */; + 3D1C5D301087157700F7B3D4 /* PBXTextBookmark */ = 3D1C5D301087157700F7B3D4 /* PBXTextBookmark */; + 3D1C5D311087157700F7B3D4 /* PBXTextBookmark */ = 3D1C5D311087157700F7B3D4 /* PBXTextBookmark */; + 3D1C5D321087157700F7B3D4 /* PBXTextBookmark */ = 3D1C5D321087157700F7B3D4 /* PBXTextBookmark */; + 3D1C5D331087157700F7B3D4 /* PBXTextBookmark */ = 3D1C5D331087157700F7B3D4 /* PBXTextBookmark */; + 3D1C5D35108715D300F7B3D4 /* PBXTextBookmark */ = 3D1C5D35108715D300F7B3D4 /* PBXTextBookmark */; + 3D1C5D36108715D300F7B3D4 /* PBXTextBookmark */ = 3D1C5D36108715D300F7B3D4 /* PBXTextBookmark */; + 3D1C5D38108715D300F7B3D4 /* PBXTextBookmark */ = 3D1C5D38108715D300F7B3D4 /* PBXTextBookmark */; + 3D1C5D39108715D300F7B3D4 /* PBXTextBookmark */ = 3D1C5D39108715D300F7B3D4 /* PBXTextBookmark */; + 3D1C5D3C108715D700F7B3D4 /* PBXTextBookmark */ = 3D1C5D3C108715D700F7B3D4 /* PBXTextBookmark */; + 3D1C5D3D108715D700F7B3D4 /* PBXTextBookmark */ = 3D1C5D3D108715D700F7B3D4 /* PBXTextBookmark */; + 3D1C5D3E108715D700F7B3D4 /* PBXTextBookmark */ = 3D1C5D3E108715D700F7B3D4 /* PBXTextBookmark */; + 3D1C5D3F108715D700F7B3D4 /* PBXTextBookmark */ = 3D1C5D3F108715D700F7B3D4 /* PBXTextBookmark */; }; sourceControlManager = 3D36E256105229C200132E23 /* Source Control */; userBuildSettings = { @@ -3929,6 +3950,201 @@ vrLen = 72; vrLoc = 0; }; + 3D1C5D0E108714B800F7B3D4 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 3D36E288105229E700132E23 /* JSCocoaController.m */; + }; + 3D1C5D15108714CD00F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E288105229E700132E23 /* JSCocoaController.m */; + name = "JSCocoaController.m: 2037"; + rLen = 0; + rLoc = 68938; + rType = 0; + vrLen = 3315; + vrLoc = 64733; + }; + 3D1C5D16108714CD00F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D1C5A9A108005BF00F7B3D4 /* 0 blank.js */; + name = "0 blank.js: 3"; + rLen = 0; + rLoc = 72; + rType = 0; + vrLen = 72; + vrLoc = 0; + }; + 3D1C5D1E1087151C00F7B3D4 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 3D36E287105229E700132E23 /* JSCocoaController.h */; + }; + 3D1C5D231087151F00F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E287105229E700132E23 /* JSCocoaController.h */; + name = "JSCocoaController.h: 65"; + rLen = 0; + rLoc = 1627; + rType = 0; + vrLen = 2270; + vrLoc = 2732; + }; + 3D1C5D241087151F00F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E288105229E700132E23 /* JSCocoaController.m */; + name = "JSCocoaController.m: 2037"; + rLen = 0; + rLoc = 68938; + rType = 0; + vrLen = 3315; + vrLoc = 64733; + }; + 3D1C5D251087151F00F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D1C5A9A108005BF00F7B3D4 /* 0 blank.js */; + name = "0 blank.js: 3"; + rLen = 0; + rLoc = 72; + rType = 0; + vrLen = 72; + vrLoc = 0; + }; + 3D1C5D271087152B00F7B3D4 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 3D36E2B910522A2600132E23 /* ApplicationController.m */; + }; + 3D1C5D2F1087157700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E2B910522A2600132E23 /* ApplicationController.m */; + name = "ApplicationController.m: 581"; + rLen = 0; + rLoc = 17526; + rType = 0; + vrLen = 3226; + vrLoc = 14490; + }; + 3D1C5D301087157700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E287105229E700132E23 /* JSCocoaController.h */; + name = "JSCocoaController.h: 65"; + rLen = 0; + rLoc = 1627; + rType = 0; + vrLen = 2422; + vrLoc = 2732; + }; + 3D1C5D311087157700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E287105229E700132E23 /* JSCocoaController.h */; + name = "JSCocoaController.h: 228"; + rLen = 54; + rLoc = 7663; + rType = 0; + vrLen = 3303; + vrLoc = 6302; + }; + 3D1C5D321087157700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E288105229E700132E23 /* JSCocoaController.m */; + name = "JSCocoaController.m: 2037"; + rLen = 0; + rLoc = 68938; + rType = 0; + vrLen = 3315; + vrLoc = 64733; + }; + 3D1C5D331087157700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D1C5A9A108005BF00F7B3D4 /* 0 blank.js */; + name = "0 blank.js: 3"; + rLen = 0; + rLoc = 72; + rType = 0; + vrLen = 72; + vrLoc = 0; + }; + 3D1C5D35108715D300F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E28E105229E700132E23 /* JSCocoaLib.m */; + name = "JSCocoaLib.m: 618"; + rLen = 0; + rLoc = 15369; + rType = 0; + vrLen = 909; + vrLoc = 15053; + }; + 3D1C5D36108715D300F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D1C5D37108715D300F7B3D4 /* 35 webview.js */; + name = "35 webview.js: 49"; + rLen = 9; + rLoc = 1489; + rType = 0; + vrLen = 1015; + vrLoc = 971; + }; + 3D1C5D37108715D300F7B3D4 /* 35 webview.js */ = { + isa = PBXFileReference; + name = "35 webview.js"; + path = "/Users/mini/Software Inexdo/JSCocoa/Tests/35 webview.js"; + sourceTree = "<absolute>"; + }; + 3D1C5D38108715D300F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E288105229E700132E23 /* JSCocoaController.m */; + rLen = 28; + rLoc = 121904; + rType = 0; + }; + 3D1C5D39108715D300F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E288105229E700132E23 /* JSCocoaController.m */; + name = "JSCocoaController.m: 3547"; + rLen = 0; + rLoc = 121825; + rType = 0; + vrLen = 1308; + vrLoc = 121235; + }; + 3D1C5D3C108715D700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E2B910522A2600132E23 /* ApplicationController.m */; + name = "ApplicationController.m: 581"; + rLen = 0; + rLoc = 17526; + rType = 0; + vrLen = 3273; + vrLoc = 14490; + }; + 3D1C5D3D108715D700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E287105229E700132E23 /* JSCocoaController.h */; + name = "JSCocoaController.h: 228"; + rLen = 54; + rLoc = 7663; + rType = 0; + vrLen = 3329; + vrLoc = 6302; + }; + 3D1C5D3E108715D700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D36E288105229E700132E23 /* JSCocoaController.m */; + name = "JSCocoaController.m: 2037"; + rLen = 0; + rLoc = 68938; + rType = 0; + vrLen = 3423; + vrLoc = 64733; + }; + 3D1C5D3F108715D700F7B3D4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3D1C5A9A108005BF00F7B3D4 /* 0 blank.js */; + name = "0 blank.js: 3"; + rLen = 0; + rLoc = 72; + rType = 0; + vrLen = 72; + vrLoc = 0; + }; 3D36E247105229B500132E23 /* TestsRunner */ = { isa = PBXExecutable; activeArgIndices = ( @@ -4009,17 +4225,17 @@ }; 3D36E287105229E700132E23 /* JSCocoaController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {909, 3498}}"; - sepNavSelRange = "{1627, 0}"; - sepNavVisRange = "{2771, 2329}"; + sepNavIntBoundsRect = "{{0, 0}, {909, 3465}}"; + sepNavSelRange = "{7663, 54}"; + sepNavVisRange = "{6302, 3329}"; sepNavWindowFrame = "{{597, 86}, {968, 1004}}"; }; }; 3D36E288105229E700132E23 /* JSCocoaController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {909, 48708}}"; + sepNavIntBoundsRect = "{{0, 0}, {909, 49478}}"; sepNavSelRange = "{68938, 0}"; - sepNavVisRange = "{67899, 2397}"; + sepNavVisRange = "{64733, 3423}"; sepNavWindowFrame = "{{751, 33}, {968, 1004}}"; }; }; @@ -4118,9 +4334,9 @@ }; 3D36E2B910522A2600132E23 /* ApplicationController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {909, 7920}}"; - sepNavSelRange = "{3530, 0}"; - sepNavVisRange = "{2524, 2060}"; + sepNavIntBoundsRect = "{{0, 0}, {909, 7590}}"; + sepNavSelRange = "{17526, 0}"; + sepNavVisRange = "{14490, 3273}"; sepNavWindowFrame = "{{401, 85}, {968, 1004}}"; }; }; TestsRunner/TestsRunner.xcodeproj/mini.pbxuser ed2e1522dc430b0fa0986d07332543ca5ee41e65 Patrick Geiller parmanoir@gmail.com http://github.com/parmanoir/jscocoa/commit/efc6bf99c31fb16d0c7276f9e824d907bc19b1b5 efc6bf99c31fb16d0c7276f9e824d907bc19b1b5 2009-10-15T01:34:05-07:00 2009-10-15T01:34:05-07:00 Post merge setProperty respondsToSelector fix 1027877f0d2a7b4eaa0fa21a16973bd16e7931de Patrick Geiller parmanoir@gmail.com