Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
+5 -5
View File
@@ -10,7 +10,7 @@ declare function Sammy(selector: string): Sammy.Application;
declare function Sammy(handler: Function): Sammy.Application;
declare function Sammy(selector: string, handler: Function): Sammy.Application;
declare module Sammy {
declare namespace Sammy {
interface SammyFunc {
(): Sammy.Application;
(selector: string): Sammy.Application;
@@ -121,8 +121,8 @@ declare module Sammy {
unload(): Application;
use(...params: any[]): void;
last_location: string[];
// Features provided by oauth2 plugin
// Features provided by oauth2 plugin
oauthorize: string;
requireOAuth();
requireOAuth(path?:string);
@@ -165,7 +165,7 @@ declare module Sammy {
toString(): string;
trigger(name: string, data?: any): EventContext;
// Provided by common sammy modules:
// Provided by common sammy modules:
name: any;
title: any;
}
@@ -235,7 +235,7 @@ declare module Sammy {
trigger(name, data);
wait(): void;
}
export interface StoreOptions {
name?: string;
element?: string;