refactor for instanceof

Author: finscn

Source/Ejecta/EJAudio/EJBindingAudio.h

@@ -1,3 +1,6 @@
+// This provides an <audio> element to JavaScript. Each instance has its own
+// AudioSource - either backed by AVAudio or OpenAL.
+
 #import <Foundation/Foundation.h>
 #import "EJBindingEventedBase.h"
 

Source/Ejecta/EJAudio/EJBindingAudio.m

@@ -25,14 +25,6 @@ - (id)initWithContext:(JSContextRef)ctx argc:(size_t)argc argv:(const JSValueRef
 	return self;
 }
 
-- (void)createWithJSObject:(JSObjectRef)obj scriptView:(EJJavaScriptView *)view {
-    [super createWithJSObject:obj scriptView:view];
-    
-    JSStringRef protoName = JSStringCreateWithUTF8CString("__proto__");
-    JSObjectSetProperty(scriptView.jsGlobalContext, jsObject, protoName,
-                        scriptView->jsHTMLAudioElementProto, kJSPropertyAttributeReadOnly, NULL);
-}
-
 - (void)dealloc {
 	[loadCallback cancel];
 	[loadCallback release];

Source/Ejecta/EJBindingGlobalUtils.m

@@ -289,17 +289,4 @@ - (void)setAudioSession:(EJCoreAudioSession)session {
 	}
 }
 
-EJ_BIND_GET(__image__proto__, ctx ) {
-    return scriptView->jsHTMLImageElementProto;
-}
-EJ_BIND_GET(__canvas__proto__, ctx ) {
-    return scriptView->jsHTMLCanvasElementProto;
-}
-EJ_BIND_GET(__video__proto__, ctx ) {
-    return scriptView->jsHTMLVideoElementProto;
-}
-EJ_BIND_GET(__audio__proto__, ctx ) {
-    return scriptView->jsHTMLAudioElementProto;
-}
-
 @end

Source/Ejecta/EJBindingVideo.m

@@ -12,14 +12,6 @@ - (id)initWithContext:(JSContextRef)ctx argc:(size_t)argc argv:(const JSValueRef
 	return self;
 }
 
-- (void)createWithJSObject:(JSObjectRef)obj scriptView:(EJJavaScriptView *)view {
-    [super createWithJSObject:obj scriptView:view];
-    
-    JSStringRef protoName = JSStringCreateWithUTF8CString("__proto__");
-    JSObjectSetProperty(scriptView.jsGlobalContext, jsObject, protoName,
-                        scriptView->jsHTMLVideoElementProto, kJSPropertyAttributeReadOnly, NULL);
-}
-
 - (void)prepareGarbageCollection {
 	[NSNotificationCenter.defaultCenter removeObserver:self];
 }

Source/Ejecta/EJCanvas/EJBindingCanvas.m

@@ -18,10 +18,6 @@ @implementation EJBindingCanvas
 - (void)createWithJSObject:(JSObjectRef)obj scriptView:(EJJavaScriptView *)view {
 	[super createWithJSObject:obj scriptView:view];
 
-    JSStringRef protoName = JSStringCreateWithUTF8CString("__proto__");
-    JSObjectSetProperty(scriptView.jsGlobalContext, jsObject, protoName,
-                        scriptView->jsHTMLCanvasElementProto, kJSPropertyAttributeReadOnly, NULL);
-
 	// If we don't have a screen canvas yet, make it this one
 	if( !scriptView.hasScreenCanvas ) {
 		isScreenCanvas = YES;

Source/Ejecta/EJCanvas/EJBindingImage.m

@@ -6,14 +6,6 @@
 @implementation EJBindingImage
 @synthesize texture;
 
-- (void)createWithJSObject:(JSObjectRef)obj scriptView:(EJJavaScriptView *)view {
-    [super createWithJSObject:obj scriptView:view];
-    
-    JSStringRef protoName = JSStringCreateWithUTF8CString("__proto__");
-    JSObjectSetProperty(scriptView.jsGlobalContext, jsObject, protoName,
-                        scriptView->jsHTMLImageElementProto, kJSPropertyAttributeReadOnly, NULL);
-}
-
 - (void)beginLoad {
 	// This will begin loading the texture in a background thread and will call the
 	// JavaScript onload callback when done

Source/Ejecta/EJJavaScriptView.h

@@ -92,11 +92,7 @@
     @public JSValueRef jsNull;
 	@public JSValueRef jsTrue;
 	@public JSValueRef jsFalse;
-    
-	@public JSValueRef jsHTMLImageElementProto;
-	@public JSValueRef jsHTMLCanvasElementProto;
-	@public JSValueRef jsHTMLVideoElementProto;
-	@public JSValueRef jsHTMLAudioElementProto;
+
 }
 
 @property (nonatomic, copy) NSString *appFolder;

Source/Ejecta/EJJavaScriptView.m

@@ -113,16 +113,6 @@ -(void)setupWithAppFolder:(NSString*)folder {
     JSValueProtect(jsGlobalContext, jsTrue);
     jsFalse = JSValueMakeBoolean(jsGlobalContext, false);
     JSValueProtect(jsGlobalContext, jsFalse);
-    
-    
-    jsHTMLImageElementProto  = NSObjectToJSValue(jsGlobalContext, @{ @"_type" : @"HTMLImageElement" });
-    JSValueProtect(jsGlobalContext, jsHTMLImageElementProto);
-    jsHTMLCanvasElementProto  = NSObjectToJSValue(jsGlobalContext, @{ @"_type" : @"HTMLCanvasElement" });
-    JSValueProtect(jsGlobalContext, jsHTMLCanvasElementProto);
-    jsHTMLVideoElementProto  = NSObjectToJSValue(jsGlobalContext, @{ @"_type" : @"HTMLVideoElement" });
-    JSValueProtect(jsGlobalContext, jsHTMLVideoElementProto);
-    jsHTMLAudioElementProto  = NSObjectToJSValue(jsGlobalContext, @{ @"_type" : @"HTMLAudioElement" });
-    JSValueProtect(jsGlobalContext, jsHTMLAudioElementProto);
 
     // Attach all native class constructors to 'Ejecta'
     classLoader = [[EJClassLoader alloc] initWithScriptView:self name:@"Ejecta"];

Source/Ejecta/Ejecta.js

@@ -267,19 +267,6 @@ HTMLElement.prototype.removeEventListener = function(event, method){
 	}
 };
 
-HTMLImageElement = function(){};
-HTMLImageElement.prototype = ejecta.__image__proto__;
-
-HTMLCanvasElement = function(){};
-HTMLCanvasElement.prototype = ejecta.__canvas__proto__;
-
-HTMLVideoElement = function(){};
-HTMLVideoElement.prototype = ejecta.__video__proto__;
-
-HTMLAudioElement = function(){};
-HTMLAudioElement.prototype = ejecta.__audio__proto__;
-
-
 // The document object
 window.document = {
 	readyState: 'complete',
@@ -388,6 +375,29 @@ window.document = {
 	}
 };
 
+
+(function(){
+
+	var element = document.createElement("img");
+	HTMLImageElement = function(){};
+	HTMLImageElement.prototype = element.__proto__;
+
+	var element = document.createElement("canvas");
+	HTMLCanvasElement = function(){};
+	HTMLCanvasElement.prototype = element.__proto__;
+
+	var element = document.createElement("video");
+	HTMLVideoElement = function(){};
+	HTMLVideoElement.prototype = element.__proto__;
+
+	var element = document.createElement("audio");
+	HTMLAudioElement = function(){};
+	HTMLAudioElement.prototype = element.__proto__;
+
+})();
+
+
+
 window.canvas.addEventListener = window.addEventListener = function( type, callback ) {
 	window.document.addEventListener(type,callback);
 };