aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorJonathan Duran2012-03-15 13:46:53 -0700
committerJonathan Duran2012-03-15 13:46:53 -0700
commitcc57a3dff8f504526bbf41a8b01c412c4788424a (patch)
tree9127331e952ef1da6faa331ec0bb49ea3acfb980 /js/io
parent0893ba7f5d1f03099c7b5f8c53ce750e412023cd (diff)
parente6bfd7fb3d3324bea5dbc05350832a9e25c6c00d (diff)
downloadninja-cc57a3dff8f504526bbf41a8b01c412c4788424a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/controllers/selection-controller.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/helper-classes/backup-delete/GLBrushStroke.js js/helper-classes/backup-delete/GLCircle.js js/helper-classes/backup-delete/GLGeomObj.js js/helper-classes/backup-delete/GLRectangle.js js/helper-classes/backup-delete/GLSubpath.js js/helper-classes/backup-delete/GLWorld.js js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js js/helper-classes/backup-delete/Materials/DeformMaterial.js js/helper-classes/backup-delete/Materials/FlatMaterial.js js/helper-classes/backup-delete/Materials/FlyMaterial.js js/helper-classes/backup-delete/Materials/JuliaMaterial.js js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js js/helper-classes/backup-delete/Materials/MandelMaterial.js js/helper-classes/backup-delete/Materials/PlasmaMaterial.js js/helper-classes/backup-delete/Materials/PulseMaterial.js js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js js/helper-classes/backup-delete/Materials/StarMaterial.js js/helper-classes/backup-delete/Materials/TaperMaterial.js js/helper-classes/backup-delete/Materials/TunnelMaterial.js js/helper-classes/backup-delete/Materials/TwistMaterial.js js/helper-classes/backup-delete/Materials/TwistVertMaterial.js js/helper-classes/backup-delete/Materials/UberMaterial.js js/helper-classes/backup-delete/Materials/WaterMaterial.js js/helper-classes/backup-delete/Materials/ZInvertMaterial.js js/lib/drawing/world.js js/preloader/Preloader.js js/stage/layout.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/io')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-workflow-controller.js11
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;