diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/io/ui/save-as-dialog.reel | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/io/ui/save-as-dialog.reel')
| -rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.html | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html index 453d7a96..dcdb073f 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "fileInputField":{ | 13 | "fileInputField":{ |
| 14 | "module": "js/io/ui/file-picker/file-input-field.reel", | 14 | "prototype": "js/io/ui/file-picker/file-input-field.reel", |
| 15 | "name": "FileInputField", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "fileInputField"} | 16 | "element": {"#": "fileInputField"} |
| 18 | } | 17 | } |
| @@ -26,8 +25,7 @@ | |||
| 26 | }, | 25 | }, |
| 27 | 26 | ||
| 28 | "owner":{ | 27 | "owner":{ |
| 29 | "module": "js/io/ui/new-file-dialog/new-file-location.reel", | 28 | "prototype": "js/io/ui/new-file-dialog/new-file-location.reel[SaveAsDialog]", |
| 30 | "name": "SaveAsDialog", | ||
| 31 | "properties": { | 29 | "properties": { |
| 32 | "element": {"#": "saveAsDialog"}, | 30 | "element": {"#": "saveAsDialog"}, |
| 33 | "fileInputField": {"@": "fileInputField"}, | 31 | "fileInputField": {"@": "fileInputField"}, |
| @@ -41,22 +39,22 @@ | |||
| 41 | </script> | 39 | </script> |
| 42 | </head> | 40 | </head> |
| 43 | <body> | 41 | <body> |
| 44 | <div id="saveAsDialog" class="saveAsDialog"> | 42 | <div data-montage-id="saveAsDialog" class="saveAsDialog"> |
| 45 | <div class="title">Save As</div> | 43 | <div class="title">Save As</div> |
| 46 | <div class="locationSelection"> | 44 | <div class="locationSelection"> |
| 47 | <div class="filename"> | 45 | <div class="filename"> |
| 48 | <span class="nameText">Save As :</span> | 46 | <span class="nameText">Save As :</span> |
| 49 | <input id="newFileName" class="nj-skinned newFileName" type="search" value="" /> | 47 | <input data-montage-id="newFileName" class="nj-skinned newFileName" type="search" value="" /> |
| 50 | </div> | 48 | </div> |
| 51 | <div> | 49 | <div> |
| 52 | <span>Location :</span> | 50 | <span>Location :</span> |
| 53 | <div id="fileInputField"></div> | 51 | <div data-montage-id="fileInputField"></div> |
| 54 | </div> | 52 | </div> |
| 55 | </div> | 53 | </div> |
| 56 | <div class="errorMsg"><span id="error" class="error"></span></div> | 54 | <div class="errorMsg"><span data-montage-id="error" class="error"></span></div> |
| 57 | <div class="buttons"> | 55 | <div class="buttons"> |
| 58 | <button id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" >CANCEL</button> | 56 | <button data-montage-id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" >CANCEL</button> |
| 59 | <button id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" >OK</button> | 57 | <button data-montage-id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" >OK</button> |
| 60 | </div> | 58 | </div> |
| 61 | 59 | ||
| 62 | </div> | 60 | </div> |