Merge branch 'master' into switch-0.9.5

knockout/knockout.d.ts

@@ -68,11 +68,8 @@ interface KnockoutComputedStatic {
     (options?: any): KnockoutComputed<any>;
 }
 
-interface KnockoutComputed<T> extends KnockoutSubscribable<T>, KnockoutComputedFunctions<T> {
-	(): T;
-	(value: T): void;
-
-	peek(): T;
+interface KnockoutComputed<T> extends KnockoutObservable<T>, KnockoutComputedFunctions<T> {
+	
 	dispose(): void;
 	isActive(): boolean;
 	getDependenciesCount(): number;
@@ -100,8 +97,8 @@ interface KnockoutObservable<T> extends KnockoutSubscribable<T>, KnockoutObserva
 	(value: T): void;
 
 	peek(): T;
-	valueHasMutated(): void;
-	valueWillMutate(): void;
+	valueHasMutated?:{(): void;};
+	valueWillMutate?:{(): void;};
     extend(requestedExtenders: { [key: string]: any; }): KnockoutObservable<T>;
 }
 

knockout/tests/knockout-tests.ts

@@ -568,4 +568,17 @@ function test_misc() {
     ko.utils.domNodeDisposal.addDisposeCallback(element, function () {
         $(element).datepicker("destroy");
     });
+	
+	this.observableFactory = function(): KnockoutObservable<number>{
+	    if (true) {
+			return ko.computed({
+				read:function(){ 
+					return 3; 
+				}
+			});
+		} else {
+			return ko.observable(3);
+		}
+	}
+	
 }