diff options
author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/io/ui/new-file-dialog/new-file-workflow-controller.js | |
parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/io/ui/new-file-dialog/new-file-workflow-controller.js')
-rwxr-xr-x | js/io/ui/new-file-dialog/new-file-workflow-controller.js | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-workflow-controller.js b/js/io/ui/new-file-dialog/new-file-workflow-controller.js index 901b61c7..d065ca35 100755 --- a/js/io/ui/new-file-dialog/new-file-workflow-controller.js +++ b/js/io/ui/new-file-dialog/new-file-workflow-controller.js | |||
@@ -70,21 +70,10 @@ var NewFileWorkflowController = exports.NewFileWorkflowController = Montage.cre | |||
70 | var fileName = data.fileName || "filename.txt"; | 70 | var fileName = data.fileName || "filename.txt"; |
71 | var folderUri = data.folderUri || "/Documents"; | 71 | var folderUri = data.folderUri || "/Documents"; |
72 | 72 | ||
73 | //render modal dialog | ||
74 | var saveAsDialogContainer = document.createElement("div"); | ||
75 | saveAsDialogContainer.id = "saveAsDialog"; | ||
76 | |||
77 | //elements needs to be on DOM to be drawn | ||
78 | document.getElementById('modalContainer').appendChild(saveAsDialogContainer); | ||
79 | |||
80 | var saveAsDialog = saveAsModule.SaveAsDialog.create(); | 73 | var saveAsDialog = saveAsModule.SaveAsDialog.create(); |
81 | saveAsDialog.fileName = fileName; | 74 | saveAsDialog.fileName = fileName; |
82 | saveAsDialog.folderUri = folderUri; | 75 | saveAsDialog.folderUri = folderUri; |
83 | saveAsDialog.callback = data.callback; | 76 | saveAsDialog.callback = data.callback; |
84 | saveAsDialog.element = saveAsDialogContainer; | ||
85 | |||
86 | //remove after rendering and add in modal dialog | ||
87 | document.getElementById('modalContainer').removeChild(saveAsDialogContainer); | ||
88 | 77 | ||
89 | var popup = Popup.create(); | 78 | var popup = Popup.create(); |
90 | popup.content = saveAsDialog; | 79 | popup.content = saveAsDialog; |