Merge pull request #1679 from sventschui/master

Improvements to marionette type definition
This commit is contained in:
Masahiro Wakame
2014-02-12 11:49:08 +09:00

View File

@@ -2,6 +2,7 @@
// Project: https://github.com/marionettejs/
// Definitions by: Zeeshan Hamid <https://github.com/zhamid>
// Definitions by: Natan Vivo <https://github.com/nvivo>
// Definitions by: Sven Tschui <https://github.com/sventschui>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
/// <reference path="../backbone/backbone.d.ts" />
@@ -288,6 +289,7 @@ declare module Marionette {
start(options?);
addRegions(regions);
removeRegion(region: Region);
getRegion(regionName: string): Region;
module(moduleNames, moduleDefinition);
}
@@ -306,3 +308,9 @@ declare module Marionette {
addDefinition(moduleDefinition, customArgs);
}
}
declare module 'backbone.marionette' {
import Backbone = require('backbone');
export = Marionette;
}