Removed javascript allKeys method, now uses HTML5 Object.keys()

parmanoir · Aug 7, 2011 · 7b62389 · 7b62389
1 parent 735de68
commit 7b62389
Show file tree

Hide file tree

Showing 59 changed files with 2,449 additions and 2,400 deletions.
diff --git a/JSCocoa/JSCocoaController.m b/JSCocoa/JSCocoaController.m
@@ -274,30 +274,9 @@ - (id)initWithGlobalContext:(JSGlobalContextRef)_ctx
  if ([[NSFileManager defaultManager] fileExistsAtPath:classKitPath]) [self evalJSFile:classKitPath];
  }
 
- // Add allKeys method to Javascript hash : { a : 1, b : 2, c : 3 }.allKeys() = ['a', 'b', 'c']
-
- // Retrieve Javascript function from class.js
- JSStringRef jsName = JSStringCreateWithUTF8CString("allKeysInHash");
- JSValueRef fn = JSObjectGetProperty(ctx, JSContextGetGlobalObject(ctx), jsName, NULL);
- JSStringRelease(jsName);
-
- if (fn)
- {
- // Add it to Object.prototype with dont enum property
- JSStringRef scriptJS = JSStringCreateWithUTF8CString("return Object.prototype");
- JSObjectRef fn2 = JSObjectMakeFunction(ctx, NULL, 0, NULL, scriptJS, NULL, 1, NULL);
- JSValueRef jsValue = JSObjectCallAsFunction(ctx, fn2, NULL, 0, NULL, NULL);
- JSObjectRef jsObject = JSValueToObject(ctx, jsValue, NULL);
- JSStringRelease(scriptJS);
-
- jsName = JSStringCreateWithUTF8CString("allKeys");
- JSObjectSetProperty(ctx, jsObject, jsName, fn, kJSPropertyAttributeDontEnum, NULL);
- JSStringRelease(jsName);
- }
-
  // Objects can use their own dealloc, normally used up by JSCocoa
  // JSCocoa registers 'safeDealloc' in place of 'dealloc' and calls it in the next run loop cycle. 
- // (If called during dealloc, this would mean executing JS code during JS GC, which is not possible)
+ // (Dealloc might be called by JS GC, and running JS fails at this time)
  // useSafeDealloc will be turned to NO upon JSCocoaController dealloc
  useSafeDealloc = YES;
  // Yep !

diff --git a/JSCocoa/class.js b/JSCocoa/class.js
@@ -1053,10 +1053,3 @@
 // log('Transformed' + script + '->' + transformed)
  return transformed
  }
-
- function allKeysInHash(o)
- {
- var r = []
- for (var i in this) r.push(i)
- return r
- }
diff --git a/Tests/! stock/1 C and ObjC calls.js → Tests/1 C and ObjC calls.js b/Tests/! stock/1 C and ObjC calls.js → Tests/1 C and ObjC calls.js
diff --git a/Tests/! stock/10 shorthand overload.js → Tests/10 shorthand overload.js b/Tests/! stock/10 shorthand overload.js → Tests/10 shorthand overload.js
diff --git a/Tests/! stock/11 retain test 2.js → Tests/11 retain test 2.js b/Tests/! stock/11 retain test 2.js → Tests/11 retain test 2.js
diff --git a/Tests/! stock/12 instance variables.js → Tests/12 instance variables.js b/Tests/! stock/12 instance variables.js → Tests/12 instance variables.js
diff --git a/Tests/! stock/13 instance.js → Tests/13 instance.js b/Tests/! stock/13 instance.js → Tests/13 instance.js
diff --git a/Tests/! stock/14 class.js → Tests/14 class.js b/Tests/! stock/14 class.js → Tests/14 class.js
diff --git a/Tests/! stock/15 IBOutlet IBAction.js → Tests/15 IBOutlet IBAction.js b/Tests/! stock/15 IBOutlet IBAction.js → Tests/15 IBOutlet IBAction.js
diff --git a/...ck/16 NSArray NSDictionary easy access.js → Tests/16 NSArray NSDictionary easy access.js b/...ck/16 NSArray NSDictionary easy access.js → Tests/16 NSArray NSDictionary easy access.js
diff --git a/Tests/! stock/17 struct instance.js → Tests/17 struct instance.js b/Tests/! stock/17 struct instance.js → Tests/17 struct instance.js
diff --git a/Tests/! stock/18 structure args.js → Tests/18 structure args.js b/Tests/! stock/18 structure args.js → Tests/18 structure args.js
diff --git a/Tests/! stock/19 pure js methods.js → Tests/19 pure js methods.js b/Tests/! stock/19 pure js methods.js → Tests/19 pure js methods.js
diff --git a/Tests/! stock/2 structure arguments.js → Tests/2 structure arguments.js b/Tests/! stock/2 structure arguments.js → Tests/2 structure arguments.js
diff --git a/Tests/! stock/20 pointer to function.js → Tests/20 pointer to function.js b/Tests/! stock/20 pointer to function.js → Tests/20 pointer to function.js
diff --git a/Tests/! stock/21 new class definition.js → Tests/21 new class definition.js b/Tests/! stock/21 new class definition.js → Tests/21 new class definition.js
diff --git a/Tests/! stock/22 instance valueOf.js → Tests/22 instance valueOf.js b/Tests/! stock/22 instance valueOf.js → Tests/22 instance valueOf.js
diff --git a/Tests/! stock/23 NSString bridging.js → Tests/23 NSString bridging.js b/Tests/! stock/23 NSString bridging.js → Tests/23 NSString bridging.js
diff --git a/Tests/! stock/24 structure set.js → Tests/24 structure set.js b/Tests/! stock/24 structure set.js → Tests/24 structure set.js
diff --git a/Tests/! stock/25 variadic.js → Tests/25 variadic.js b/Tests/! stock/25 variadic.js → Tests/25 variadic.js
diff --git a/Tests/! stock/26 full NSArray bridge.js → Tests/26 full NSArray bridge.js b/Tests/! stock/26 full NSArray bridge.js → Tests/26 full NSArray bridge.js
diff --git a/Tests/! stock/27 type modifier o.js → Tests/27 type modifier o.js b/Tests/! stock/27 type modifier o.js → Tests/27 type modifier o.js
diff --git a/Tests/! stock/28 struct description.js → Tests/28 struct description.js b/Tests/! stock/28 struct description.js → Tests/28 struct description.js
diff --git a/Tests/! stock/29 pointer handling.js → Tests/29 pointer handling.js b/Tests/! stock/29 pointer handling.js → Tests/29 pointer handling.js
diff --git a/Tests/! stock/3 derivation.js → Tests/3 derivation.js b/Tests/! stock/3 derivation.js → Tests/3 derivation.js
diff --git a/Tests/! stock/30 obj1 == obj2.js → Tests/30 obj1 == obj2.js b/Tests/! stock/30 obj1 == obj2.js → Tests/30 obj1 == obj2.js
diff --git a/Tests/! stock/31 bridgeSupport bench.js → Tests/31 bridgeSupport bench.js b/Tests/! stock/31 bridgeSupport bench.js → Tests/31 bridgeSupport bench.js
diff --git a/Tests/! stock/32 new class syntax.js → Tests/32 new class syntax.js b/Tests/! stock/32 new class syntax.js → Tests/32 new class syntax.js
diff --git a/Tests/! stock/33 class syntax swizzle.js → Tests/33 class syntax swizzle.js b/Tests/! stock/33 class syntax swizzle.js → Tests/33 class syntax swizzle.js
diff --git a/Tests/! stock/34 object keys.js → Tests/34 object keys.js b/Tests/! stock/34 object keys.js → Tests/34 object keys.js
@@ -12,7 +12,7 @@
  var hasName = false
  var hasSurname = false
  var hasSomeVariable = false
- var allKeys = o.allKeys()
+ var allKeys = Object.keys(o)
  for (var i=0; i<allKeys.length; i++)
  {
  var key = allKeys[i]

diff --git a/Tests/! stock/35 webview.js → Tests/35 webview.js b/Tests/! stock/35 webview.js → Tests/35 webview.js
diff --git a/Tests/! stock/36 safe dealloc.js → Tests/36 safe dealloc.js b/Tests/! stock/36 safe dealloc.js → Tests/36 safe dealloc.js
diff --git a/Tests/! stock/37 init from webview.js → Tests/37 init from webview.js b/Tests/! stock/37 init from webview.js → Tests/37 init from webview.js
diff --git a/Tests/! stock/38 class walker.js → Tests/38 class walker.js b/Tests/! stock/38 class walker.js → Tests/38 class walker.js
diff --git a/Tests/! stock/39 NSArray js functions.js → Tests/39 NSArray js functions.js b/Tests/! stock/39 NSArray js functions.js → Tests/39 NSArray js functions.js
diff --git a/Tests/! stock/4 js load.js → Tests/4 js load.js b/Tests/! stock/4 js load.js → Tests/4 js load.js
diff --git a/Tests/! stock/40 ObjJ syntax.js → Tests/40 ObjJ syntax.js b/Tests/! stock/40 ObjJ syntax.js → Tests/40 ObjJ syntax.js
diff --git a/Tests/! stock/41 class inner js functions.js → Tests/41 class inner js functions.js b/Tests/! stock/41 class inner js functions.js → Tests/41 class inner js functions.js
diff --git a/Tests/! stock/42 return if.js → Tests/42 return if.js b/Tests/! stock/42 return if.js → Tests/42 return if.js
diff --git a/Tests/! stock/43 @ string and selector.js → Tests/43 @ string and selector.js b/Tests/! stock/43 @ string and selector.js → Tests/43 @ string and selector.js
diff --git a/Tests/! stock/44 instanceWith.js → Tests/44 instanceWith.js b/Tests/! stock/44 instanceWith.js → Tests/44 instanceWith.js
diff --git a/Tests/! stock/45 ƒ function shortcut.js → Tests/45 ƒ function shortcut.js b/Tests/! stock/45 ƒ function shortcut.js → Tests/45 ƒ function shortcut.js
diff --git a/Tests/! stock/46 exceptions.js → Tests/46 exceptions.js b/Tests/! stock/46 exceptions.js → Tests/46 exceptions.js
diff --git a/Tests/! stock/47 ObjJ syntax super.js → Tests/47 ObjJ syntax super.js b/Tests/! stock/47 ObjJ syntax super.js → Tests/47 ObjJ syntax super.js
diff --git a/...s/! stock/48 ObjJ syntax compatibility.js → Tests/48 ObjJ syntax compatibility.js b/...s/! stock/48 ObjJ syntax compatibility.js → Tests/48 ObjJ syntax compatibility.js
diff --git a/Tests/! stock/50 setValueForKey op.js → Tests/50 setValueForKey op.js b/Tests/! stock/50 setValueForKey op.js → Tests/50 setValueForKey op.js
diff --git a/Tests/! stock/51 ObjC blocks.js → Tests/51 ObjC blocks.js b/Tests/! stock/51 ObjC blocks.js → Tests/51 ObjC blocks.js
diff --git a/Tests/! stock/52 line and sourceURL.js → Tests/52 line and sourceURL.js b/Tests/! stock/52 line and sourceURL.js → Tests/52 line and sourceURL.js
diff --git a/Tests/! stock/53 Unicode ObjC classes.js → Tests/53 Unicode ObjC classes.js b/Tests/! stock/53 Unicode ObjC classes.js → Tests/53 Unicode ObjC classes.js
diff --git a/Tests/! stock/54 custom indexed access.js → Tests/54 custom indexed access.js b/Tests/! stock/54 custom indexed access.js → Tests/54 custom indexed access.js
diff --git a/.../! stock/55 javascript method override.js → Tests/55 javascript method override.js b/.../! stock/55 javascript method override.js → Tests/55 javascript method override.js
diff --git a/Tests/! stock/56 whitespace.js → Tests/56 whitespace.js b/Tests/! stock/56 whitespace.js → Tests/56 whitespace.js
diff --git a/Tests/! stock/6 basic arguments.js → Tests/6 basic arguments.js b/Tests/! stock/6 basic arguments.js → Tests/6 basic arguments.js
diff --git a/Tests/! stock/7 split call.js → Tests/7 split call.js b/Tests/! stock/7 split call.js → Tests/7 split call.js
diff --git a/Tests/! stock/8 zero arg autocall.js → Tests/8 zero arg autocall.js b/Tests/! stock/8 zero arg autocall.js → Tests/8 zero arg autocall.js
diff --git a/Tests/! stock/9 auto setter.js → Tests/9 auto setter.js b/Tests/! stock/9 auto setter.js → Tests/9 auto setter.js
diff --git a/TestsRunner/ApplicationController.m b/TestsRunner/ApplicationController.m
@@ -268,13 +268,13 @@ - (IBAction)stopContinuousJSTestsRun:(id)sender
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *) menuItem {
- NSLog(@"%@", menuItem);
  SEL itemAction = [menuItem action];
  if (itemAction == @selector(displayTestsWindow:))
  return YES;
  return NO;
 }
 
+// ## debug, to dump an object from an address (Sometimes debugging does not work when breaking in code called from JavascriptCore)
 - (void)dumpObjectAtAddress:(NSUInteger)address {
  void* p = (void*)address;
  NSLog(@"object at %p=", p);