aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/file-input.reel
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/ui/file-input.reel
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/ui/file-input.reel')
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html
index 0c3c465e..735f970c 100755
--- a/js/components/ui/file-input.reel/file-input.html
+++ b/js/components/ui/file-input.reel/file-input.html
@@ -22,9 +22,9 @@
22 </script> 22 </script>
23</head> 23</head>
24<body> 24<body>
25 <div id="fileInput" class="fileInput"> 25 <div data-montage-id="fileInput" class="fileInput">
26 <input id="fileInputTextField" class="file-path nj-skinned" type="text" /> 26 <input data-montage-id="fileInputTextField" class="file-path nj-skinned" type="text" />
27 <input id="fileInputControl" class="browse-button" type="file" /> 27 <input data-montage-id="fileInputControl" class="browse-button" type="file" />
28 </div> 28 </div>
29</body> 29</body>
30</html> \ No newline at end of file 30</html> \ No newline at end of file