diff options
| author | hwc487 | 2012-06-28 12:17:22 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-28 12:17:22 -0700 |
| commit | 230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (patch) | |
| tree | 133be243b24260f831252f347ed66f24e2b78136 /js/ninja.reel/ninja.js | |
| parent | 22cbc9644b79df60b3f6336f9563debd47fb3ea1 (diff) | |
| parent | 56d6311f398e04eee3883a5c848fec3b2b53c981 (diff) | |
| download | ninja-230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'js/ninja.reel/ninja.js')
| -rwxr-xr-x | js/ninja.reel/ninja.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index f1825b9a..859268a0 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
| @@ -137,7 +137,7 @@ exports.Ninja = Montage.create(Component, { | |||
| 137 | serializable: true | 137 | serializable: true |
| 138 | }, | 138 | }, |
| 139 | 139 | ||
| 140 | codeEditorController: { | 140 | codeEditorWrapper: { |
| 141 | value: null, | 141 | value: null, |
| 142 | serializable: true | 142 | serializable: true |
| 143 | }, | 143 | }, |