From 8704a6be08836b0ad8beca3121ebd73cbdad7be3 Mon Sep 17 00:00:00 2001
From: John Vrbanac <john.vrbanac@linux.com>
Date: Mon, 22 Oct 2012 17:22:10 -0500
Subject: [PATCH] Merging some of Boris' changes into 1.0.pre

---
 Definitions/ember-1.0.pre.d.ts | 35 +++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/Definitions/ember-1.0.pre.d.ts b/Definitions/ember-1.0.pre.d.ts
index 5361b4642..f498255be 100644
--- a/Definitions/ember-1.0.pre.d.ts
+++ b/Definitions/ember-1.0.pre.d.ts
@@ -1,3 +1,7 @@
+// Type definitions for Ember.js 1.0.pre
+// Project: http://emberjs.com/
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
 declare module Ember {
 	export class CoreObject {
 		isDestroyed:Boolean;
@@ -14,6 +18,10 @@ declare module Ember {
 		extend(first:Object, second:Object):Object;
 	}
 	
+	export class View {
+		
+	}
+	
 	export class Enumerable extends Ember.Mixin {
 		// Fields
 		firstObject:Object;
@@ -68,7 +76,9 @@ declare module Ember {
 		eventDispatcher;
 		ready;
 		rootElement;
+		MyView:Ember.View;
 		
+		create():Ember.Application;
 		initialize(router);
 		registerInjection(options);
 	}
@@ -148,6 +158,8 @@ interface EmberStatic {
 	VERSION:String;
 	VIEW_PRESERVES_CONTEXT:Boolean;
 	
+	$; // jQuery
+
 	// API Doc Members
 	A(arr:any[]):Ember.NativeArray;
 	addBeforeObserver(obj:Object, path:String, target:Object, method:Function);
@@ -215,25 +227,26 @@ interface EmberStatic {
 	warn(message:String, test:Boolean);
 	watchedEvents(obj:Object);
 	
-	// Other members not listed in API Doc
+	// Other public members not listed in API Doc
 	meta(obj, writable);
 	metaPath(obj, path, writable);
 	normalizeTuple(target, path);
-	notifyBeforeObservers(obj, keyName);
-	notifyObservers(obj, keyName);
-	observersFor(obj, path);
-	rewatch(obj);
+	notifyBeforeObservers(obj:Object, keyName:String);
+	notifyObservers(obj:Object, keyName:String);
+	observersFor(obj:Object, path:String);
+	rewatch(obj:Object);
 	run(target, method);
-	defineProperty(obj, keyName, desc, data, meta);
+	defineProperty(obj:Object, keyName:String, desc, data, meta);
 	beforeObserversFor(obj:Object, path:String);
-	generateGuid(obj, prefix);
+	generateGuid(obj:Object, prefix);
 	getPath();
-	guidFor(obj);
+	guidFor(obj:Object);
 	identifyNamespaces();	
 	setPath();	
 	trySetPath();
-	unwatch(obj, keyName);	
-	watch(obj, keyName);	
-	wrap(func, superFunc);
+	unwatch(obj:Object, keyName:String);	
+	watch(obj:Object, keyName:String);	
+	wrap(func:Function, superFunc:Function);
 }
+declare var Em: EmberStatic;
 declare var Ember:EmberStatic;