Merge remote-tracking branch 'remotes/upstream/master'

This commit is contained in:
s_kimura
2013-11-28 11:33:27 +09:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ declare module ng {
// All service providers extend this interface
interface IServiceProvider {
$get(): any;
$get: any;
}
///////////////////////////////////////////////////////////////////////////
+2 -2
View File
@@ -157,8 +157,8 @@ declare module Backbone {
comparator(element: Model): any;
comparator(compare: Model, to?: Model): any;
add(model: Model, options?: AddOptions);
add(models: Model[], options?: AddOptions);
add(model: Model, options?: AddOptions): Collection;
add(models: Model[], options?: AddOptions): Collection;
at(index: number): Model;
get(id: any): Model;
create(attributes: any, options?: ModelSaveOptions): Model;