Merge branch 'master' of https://github.com/borisyankov/DefinitelyTyped

backbone/backbone.d.ts

@@ -11,14 +11,14 @@ declare module Backbone {
     export interface AddOptions extends Silenceable {
         at: number;
     }
-    
+
     export interface CreateOptions extends Silenceable {
         wait: bool;
     }
-    
+
     export interface HistoryOptions extends Silenceable {
-        pushState: bool;
-        root: string;
+        pushState?: bool;
+        root?: string;
     }
 
     export interface NavigateOptions {
@@ -30,7 +30,7 @@ declare module Backbone {
     }
 
     export interface Silenceable {
-        silent: bool;
+        silent?: bool;
     }
 
     interface on { (eventName: string, callback: (...args: any[]) => void, context?: any): any; }
@@ -68,8 +68,8 @@ declare module Backbone {
         constructor (attributes?: any, options?: any);
         initialize(attributes?: any);
 
-        get(attributeName: string): any;
-        set(attributeName: string, value: any, options?: Silenceable);
+        get(attributeName: string): any;
+        set(attributeName: string, value: any, options?: Silenceable);
         set(obj: any, options?: Silenceable);
 
         change();

jquery/jquery.d.ts

@@ -156,7 +156,12 @@ interface JQueryKeyEventObject extends JQueryInputEventObject
     keyCode: number;
 }
 
-interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject {
+interface JQueryPopStateEventObject extends BaseJQueryEventObject
+{
+    originalEvent: PopStateEvent;
+}
+
+interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject, JQueryPopStateEventObject {
 }
 
 /*

knockout/knockout.d.ts

@@ -337,7 +337,7 @@ interface KnockoutUtils {
 
     toggleDomNodeCssClass(node: any, className: string, shouldHaveClass: bool): void;
 
-    setTextContent(element: any, textContent: string): void;
+    //setTextContent(element: any, textContent: string): void; // NOT PART OF THE MINIFIED API SURFACE (ONLY IN knockout-{version}.debug.js) https://github.com/SteveSanderson/knockout/issues/670
 
     setElementName(element: any, name: string): void;