Merge pull request #364 from JabX/develop

Update typings for new router/history.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "focus-core",
-    "version": "0.16.0-beta2",
+    "version": "0.16.0-beta3",
     "description": "Focus library core part.",
     "main": "index.js",
     "babel": {

src/history/index.d.ts

@@ -1,10 +1,29 @@
 /**
- * Navigates to the given URL.
+ * Sets the navigation functions.
+ * @param navigate The navigate function.
+ * @param back The back function.
+ * @param start The start function.
+ */
+export function setNavigationFunctions(navigate: Function, back: Function, start: Function): void
+
+/**
+ * Navigates to the previous page.
+ */
+export function back(): void
+
+/**
+ * Navigates to the given URL (Backbone).
  * @param path The URL to navigate to.
  * @param options Navigation options.
  */
 export function navigate(path: string, options?: {trigger?: boolean, replace?: boolean}): void
 
+/**
+ * Navigates to the given URL (React-Router).
+ * @param path The URL to navigate to or an object with options.
+ */
+export function navigate(path: string | {pathName: string, query: {}, state: {}}): void
+
 /**
  * Starts the router.
  */

src/router/index.d.ts

@@ -4,9 +4,9 @@ interface RouterConfig {
     routes: {[x: string]: string};
 }
 
-declare let router: {
+declare let Router: {
     extend<T>(config: T & RouterConfig): {new(): {}}
 };
 
-export = router
+export = Backbone => typeof Router