aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/file-input.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/ui/file-input.reel
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-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/ui/file-input.reel')
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js
index 584380ec..adec6d84 100755
--- a/js/components/ui/file-input.reel/file-input.js
+++ b/js/components/ui/file-input.reel/file-input.js
@@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage,
9 9
10var FileInput = exports.FileInput = Montage.create(Component, { 10var FileInput = exports.FileInput = Montage.create(Component, {
11 11
12 inputField: {
13 value: null,
14 serializable: true
15 },
16
17 filePathField: {
18 value: null,
19 serializable: true
20 },
21
12 _filePath: { 22 _filePath: {
13 enumerable: false, 23 enumerable: false,
14 value: "" 24 value: ""