Merge pull request phoboslab#527 from sleepygarden/addXibSupportEJJavascriptView

support EJJavascriptViews placed inside of XIBs of other view controllers

Author: phoboslab

Source/Ejecta/EJJavaScriptView.m

@@ -49,54 +49,62 @@ - (id)initWithFrame:(CGRect)frame {
 
 - (id)initWithFrame:(CGRect)frame appFolder:(NSString *)folder {
 	if( self = [super initWithFrame:frame] ) {
-		oldSize = frame.size;
-		appFolder = [folder retain];
-		
-		isPaused = false;
-
-		// CADisplayLink (and NSNotificationCenter?) retains it's target, but this
-		// is causing a retain loop - we can't completely release the scriptView
-		// from the outside.
-		// So we're using a "weak proxy" that doesn't retain the scriptView; we can
-		// then just invalidate the CADisplayLink in our dealloc and be done with it.
-		proxy = [[EJNonRetainingProxy proxyWithTarget:self] retain];
-		
-		self.pauseOnEnterBackground = YES;
-		
-		// Limit all background operations (image & sound loading) to one thread
-		backgroundQueue = [[NSOperationQueue alloc] init];
-		backgroundQueue.maxConcurrentOperationCount = 1;
-		
-		timers = [[EJTimerCollection alloc] initWithScriptView:self];
-		
-		displayLink = [[CADisplayLink displayLinkWithTarget:proxy selector:@selector(run:)] retain];
-		[displayLink setFrameInterval:1];
-		[displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
-		
-		// Create the global JS context in its own group, so it can be released properly
-		jsGlobalContext = JSGlobalContextCreateInGroup(NULL, NULL);
-		jsUndefined = JSValueMakeUndefined(jsGlobalContext);
-		JSValueProtect(jsGlobalContext, jsUndefined);
-		
-		// Attach all native class constructors to 'Ejecta'
-		classLoader = [[EJClassLoader alloc] initWithScriptView:self name:@"Ejecta"];
-		
-		
-		// Retain the caches here, so even if they're currently unused in JavaScript,
-		// they will persist until the last scriptView is released
-		textureCache = [[EJSharedTextureCache instance] retain];
-		openALManager = [[EJSharedOpenALManager instance] retain];
-		openGLContext = [[EJSharedOpenGLContext instance] retain];
-		
-		// Create the OpenGL context for Canvas2D
-		glCurrentContext = openGLContext.glContext2D;
-		[EAGLContext setCurrentContext:glCurrentContext];
-		
-		[self loadScriptAtPath:EJECTA_BOOT_JS];
+        [self setupWithAppFolder:folder];
 	}
 	return self;
 }
 
+-(void)awakeFromNib {
+    [self setupWithAppFolder:EJECTA_DEFAULT_APP_FOLDER];
+}
+
+-(void)setupWithAppFolder:(NSString*)folder {
+    oldSize = self.frame.size;
+    appFolder = [folder retain];
+    
+    isPaused = false;
+    
+    // CADisplayLink (and NSNotificationCenter?) retains it's target, but this
+    // is causing a retain loop - we can't completely release the scriptView
+    // from the outside.
+    // So we're using a "weak proxy" that doesn't retain the scriptView; we can
+    // then just invalidate the CADisplayLink in our dealloc and be done with it.
+    proxy = [[EJNonRetainingProxy proxyWithTarget:self] retain];
+    
+    self.pauseOnEnterBackground = YES;
+    
+    // Limit all background operations (image & sound loading) to one thread
+    backgroundQueue = [[NSOperationQueue alloc] init];
+    backgroundQueue.maxConcurrentOperationCount = 1;
+    
+    timers = [[EJTimerCollection alloc] initWithScriptView:self];
+    
+    displayLink = [[CADisplayLink displayLinkWithTarget:proxy selector:@selector(run:)] retain];
+    [displayLink setFrameInterval:1];
+    [displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+    
+    // Create the global JS context in its own group, so it can be released properly
+    jsGlobalContext = JSGlobalContextCreateInGroup(NULL, NULL);
+    jsUndefined = JSValueMakeUndefined(jsGlobalContext);
+    JSValueProtect(jsGlobalContext, jsUndefined);
+    
+    // Attach all native class constructors to 'Ejecta'
+    classLoader = [[EJClassLoader alloc] initWithScriptView:self name:@"Ejecta"];
+    
+    
+    // Retain the caches here, so even if they're currently unused in JavaScript,
+    // they will persist until the last scriptView is released
+    textureCache = [[EJSharedTextureCache instance] retain];
+    openALManager = [[EJSharedOpenALManager instance] retain];
+    openGLContext = [[EJSharedOpenGLContext instance] retain];
+    
+    // Create the OpenGL context for Canvas2D
+    glCurrentContext = openGLContext.glContext2D;
+    [EAGLContext setCurrentContext:glCurrentContext];
+    
+    [self loadScriptAtPath:EJECTA_BOOT_JS];
+}
+
 - (void)dealloc {
 	// Wait until all background operations are finished. If we would just release the
 	// backgroundQueue it would cancel running operations (such as texture loading) and