diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/components/ui/file-input.reel | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/components/ui/file-input.reel')
| -rwxr-xr-x[-rw-r--r--] | js/components/ui/file-input.reel/file-input.css | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | js/components/ui/file-input.reel/file-input.html | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | js/components/ui/file-input.reel/file-input.js | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/js/components/ui/file-input.reel/file-input.css b/js/components/ui/file-input.reel/file-input.css index 6bc1d13f..6bc1d13f 100644..100755 --- a/js/components/ui/file-input.reel/file-input.css +++ b/js/components/ui/file-input.reel/file-input.css | |||
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html index 5cdd8f9e..2a8546a5 100644..100755 --- a/js/components/ui/file-input.reel/file-input.html +++ b/js/components/ui/file-input.reel/file-input.html | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module": "js/components/ui/file-input", | 14 | "module": "js/components/ui/file-input.reel", |
| 15 | "name": "FileInput", | 15 | "name": "FileInput", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "fileInput"}, | 17 | "element": {"#": "fileInput"}, |
| @@ -23,8 +23,8 @@ | |||
| 23 | </script> | 23 | </script> |
| 24 | </head> | 24 | </head> |
| 25 | <body> | 25 | <body> |
| 26 | <div id="fileInput"> | 26 | <div id="fileInput" class="fileInput"> |
| 27 | <input id="fileInputTextField" class="file-path" type="text" /> | 27 | <input id="fileInputTextField" class="file-path nj-skinned" type="text" /> |
| 28 | <input id="fileInputControl" class="browse-button" type="file" /> | 28 | <input id="fileInputControl" class="browse-button" type="file" /> |
| 29 | </div> | 29 | </div> |
| 30 | </body> | 30 | </body> |
diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js index 2ea38162..b57f7c21 100644..100755 --- a/js/components/ui/file-input.reel/file-input.js +++ b/js/components/ui/file-input.reel/file-input.js | |||
| @@ -5,7 +5,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
| 8 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component; |
| 9 | 9 | ||
| 10 | var FileInput = exports.FileInput = Montage.create(Component, { | 10 | var FileInput = exports.FileInput = Montage.create(Component, { |
| 11 | 11 | ||