diff options
| author | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
| commit | ee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch) | |
| tree | a9d5ff91681aa06bf26cb62994461a58d3f80005 /js/ninja.reel/ninja.js | |
| parent | ca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff) | |
| parent | 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff) | |
| download | ninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Document
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 | }, |