diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/components/layout/documents-tab.reel | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/layout/documents-tab.reel')
| -rwxr-xr-x | js/components/layout/documents-tab.reel/documents-tab.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/components/layout/documents-tab.reel/documents-tab.js b/js/components/layout/documents-tab.reel/documents-tab.js index 41c98b30..b72056f8 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.js +++ b/js/components/layout/documents-tab.reel/documents-tab.js | |||
| @@ -9,6 +9,7 @@ var Component = require("montage/ui/component").Component; | |||
| 9 | 9 | ||
| 10 | exports.DocumentsTab = Montage.create(Component, { | 10 | exports.DocumentsTab = Montage.create(Component, { |
| 11 | contentController: { | 11 | contentController: { |
| 12 | value: null | 12 | value: null, |
| 13 | serializable: true | ||
| 13 | } | 14 | } |
| 14 | }); \ No newline at end of file | 15 | }); \ No newline at end of file |