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
+6 -6
View File
@@ -5,9 +5,9 @@
/// <reference path="../jquery/jquery.d.ts" />
declare module ScrollToFixed {
declare namespace ScrollToFixed {
interface ScrollToFixedOptions {
marginTop? : number | (() => number);
marginTop? : number | (() => number);
limit? : number | (() => number);
bottom?: number;
zIndex? : number;
@@ -31,7 +31,7 @@ declare module ScrollToFixed {
}
}
interface JQuery {
interface JQuery {
scrollToFixed : (options? : ScrollToFixed.ScrollToFixedOptions) => JQuery[];
}
@@ -40,10 +40,10 @@ interface JQueryStatic {
isScrollToFixed(el: Element[]) : JQuery;
isScrollToFixed(el: {}) : JQuery;
isScrollToFixed(el: JQuery) : JQuery;
ScrollToFixed(el: Element, options: ScrollToFixed.ScrollToFixedOptions): void;
ScrollToFixed(el : Element, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
ScrollToFixed(el: Element[], options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
ScrollToFixed(el: {}, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
ScrollToFixed(el: JQuery, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
}
ScrollToFixed(el: JQuery, options : ScrollToFixed.ScrollToFixedOptions) : JQuery;
}