diff options
| author | Valerio Virgillito | 2012-02-16 10:54:48 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-16 10:54:48 -0800 |
| commit | d52aca45e0357b5597e13d9b74998abb75fabea5 (patch) | |
| tree | ffd4a0c060b00611953b7e3ed0b3955bf02ac6e7 /node_modules/montage/montage.js | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-d52aca45e0357b5597e13d9b74998abb75fabea5.tar.gz | |
integrating the latest montage fixes for v0.6 into master
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/montage.js')
| -rwxr-xr-x | node_modules/montage/montage.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/montage.js b/node_modules/montage/montage.js index cee1f27a..495b6c72 100755 --- a/node_modules/montage/montage.js +++ b/node_modules/montage/montage.js | |||
| @@ -78,7 +78,7 @@ if (typeof window !== "undefined") { | |||
| 78 | Require.PackageSandbox(params.montageBase, config) | 78 | Require.PackageSandbox(params.montageBase, config) |
| 79 | .then(function (montageRequire) { | 79 | .then(function (montageRequire) { |
| 80 | montageRequire.inject("core/promise", Promise); | 80 | montageRequire.inject("core/promise", Promise); |
| 81 | montageRequire.inject("core/shim/timeers", {}); | 81 | montageRequire.inject("core/shim/timers", {}); |
| 82 | 82 | ||
| 83 | // install the linter, which loads on the first error | 83 | // install the linter, which loads on the first error |
| 84 | config.lint = function (module) { | 84 | config.lint = function (module) { |