Skip to content

Commit

Permalink
Pre merge commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@parmanoir
parmanoir committed Sep 25, 2010
1 parent 3b17d64 commit 2e05383
Show file tree
Hide file tree
Showing 3 changed files with 239 additions and 114 deletions.
8 changes: 0 additions & 8 deletions Tests/0 blank.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@

// blank : used by TestsRunner to test the evalJSFile delegate method

var f = function(err) {
log("Hello from a jsfunction " + err);
};

var objcBlock = JSTestBlocks.newErrorBlockForJSFunction_(f);

JSTestBlocks.testFunction_(objcBlock);
89 changes: 45 additions & 44 deletions TestsRunner/TestsRunner.xcodeproj/mini.mode2v3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,24 +202,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79DE0124D379600E0B47D</string>
<string>3DC79E60124D3ABD00E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>ApplicationController.m</string>
<string>0 blank.js</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79DE1124D379600E0B47D</string>
<string>3DC79E61124D3ABD00E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>ApplicationController.m</string>
<string>0 blank.js</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>3DC79FDC124DE05A00E0B47D</string>
<string>3DC79FED124DE0B000E0B47D</string>
<key>history</key>
<array>
<string>3DC79F69124DDBEF00E0B47D</string>
<string>3DC79FEC124DE0B000E0B47D</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -231,35 +231,35 @@
<key>Geometry</key>
<dict>
<key>Frame</key>
<string>{{0, 20}, {968, 907}}</string>
<string>{{0, 20}, {1095, 951}}</string>
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>577 202 968 948 0 0 1920 1178 </string>
<string>347 86 1095 992 0 0 1920 1178 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79E60124D3ABD00E0B47D</string>
<string>3DC79ED7124D44CE00E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>0 blank.js</string>
<string>JSCocoaFFIArgument.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79E61124D3ABD00E0B47D</string>
<string>3DC79ED8124D44CE00E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>0 blank.js</string>
<string>JSCocoaFFIArgument.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>3DC79FDD124DE05A00E0B47D</string>
<string>3DC79FEE124DE0B000E0B47D</string>
<key>history</key>
<array>
<string>3DC79E5D124D3AB900E0B47D</string>
<string>3DC79FE2124DE09500E0B47D</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -271,35 +271,35 @@
<key>Geometry</key>
<dict>
<key>Frame</key>
<string>{{0, 20}, {1095, 951}}</string>
<string>{{0, 20}, {968, 907}}</string>
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>347 86 1095 992 0 0 1920 1178 </string>
<string>232 204 968 948 0 0 1920 1178 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79F86124DDD8600E0B47D</string>
<string>3DC79DE0124D379600E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>JSCocoaController.h</string>
<string>ApplicationController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79F87124DDD8600E0B47D</string>
<string>3DC79DE1124D379600E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>JSCocoaController.h</string>
<string>ApplicationController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>3DC79FDE124DE05A00E0B47D</string>
<string>3DC79FEF124DE0B000E0B47D</string>
<key>history</key>
<array>
<string>3DC79F88124DDD8600E0B47D</string>
<string>3DC79F69124DDBEF00E0B47D</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -315,31 +315,31 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>299 97 968 948 0 0 1920 1178 </string>
<string>577 202 968 948 0 0 1920 1178 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79DD9124D379600E0B47D</string>
<string>3DC79F86124DDD8600E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>JSCocoaController.m</string>
<string>JSCocoaController.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79DDA124D379600E0B47D</string>
<string>3DC79F87124DDD8600E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>JSCocoaController.m</string>
<string>JSCocoaController.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>3DC79FDF124DE05A00E0B47D</string>
<string>3DC79FF0124DE0B000E0B47D</string>
<key>history</key>
<array>
<string>3DC79F26124D4CD800E0B47D</string>
<string>3DC79F88124DDD8600E0B47D</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -355,31 +355,31 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>408 215 968 948 0 0 1920 1178 </string>
<string>299 97 968 948 0 0 1920 1178 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79ED7124D44CE00E0B47D</string>
<string>3DC79DD9124D379600E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>JSCocoaFFIArgument.m</string>
<string>JSCocoaController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>3DC79ED8124D44CE00E0B47D</string>
<string>3DC79DDA124D379600E0B47D</string>
<key>PBXProjectModuleLabel</key>
<string>JSCocoaFFIArgument.m</string>
<string>JSCocoaController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>3DC79FE0124DE05A00E0B47D</string>
<string>3DC79FF1124DE0B000E0B47D</string>
<key>history</key>
<array>
<string>3DC79ED3124D448400E0B47D</string>
<string>3DC79F26124D4CD800E0B47D</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -395,7 +395,7 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>232 204 968 948 0 0 1920 1178 </string>
<string>408 215 968 948 0 0 1920 1178 </string>
</dict>
</dict>
</array>
Expand Down Expand Up @@ -476,13 +476,14 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>20</integer>
<integer>18</integer>
<integer>28</integer>
<integer>26</integer>
<integer>25</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 62}, {432, 356}}</string>
<string>{{0, 195}, {432, 356}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
Expand Down Expand Up @@ -685,16 +686,16 @@
<string>3DC79DED124D379600E0B47D</string>
<string>3DC79DEE124D379600E0B47D</string>
<string>1C530D52069F1CE1000CFCEE</string>
<string>3DC79ED7124D44CE00E0B47D</string>
<string>3DC79DD9124D379600E0B47D</string>
<string>3DC79DF4124D37AD00E0B47D</string>
<string>1C530D57069F1CE1000CFCEE</string>
<string>/Users/mini/Software Inexdo/JSCocoa/TestsRunner/TestsRunner.xcodeproj</string>
<string>1C530D54069F1CE1000CFCEE</string>
<string>3DC79F86124DDD8600E0B47D</string>
<string>3DC79E60124D3ABD00E0B47D</string>
<string>1C530D5B069F1CE1000CFCEE</string>
<string>3DC79DE0124D379600E0B47D</string>
<string>3DC79ED7124D44CE00E0B47D</string>
<string>1C530D5B069F1CE1000CFCEE</string>
<string>/Users/mini/Software Inexdo/JSCocoa/TestsRunner/TestsRunner.xcodeproj</string>
<string>3DC79E60124D3ABD00E0B47D</string>
</array>
<key>WindowString</key>
<string>1053 736 449 442 0 0 1920 1178 </string>
Expand Down
Loading

0 comments on commit 2e05383

Please sign in to comment.