Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	js/io/document/document-controller.js
	js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
	js/io/ui/save-as-dialog.reel/save-as-dialog.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

2 files changed, 35 insertions, 5 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 91b09475..a6f31703 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -92,6 +92,11 @@ exports.ElementMediator = Montage.create(NJComponent, {
     _addElement: {
         value: function(el, rules, noEvent) {
             ElementController.addElement(el, rules);
+            var p3d = this.get3DProperties(el);
+            if(p3d)
+            {
+                el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
+            }
             if(!noEvent) NJevent("elementAdded", el);
         }
     },
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index b392a065..8d0a671e 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -6,17 +6,42 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =           require("montage/core/core").Montage,
-        FileIo =                require("js/io/system/fileio").FileIo,
-        ProjectIo =     require("js/io/system/projectio").ProjectIo;
+var Montage =   require("montage/core/core").Montage,
+        FileIo =        require("js/io/system/fileio").FileIo,
+        ProjectIo = require("js/io/system/projectio").ProjectIo;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.IoMediator = Montage.create(Object.prototype, {
         ////////////////////////////////////////////////////////////////////
     //
-    name: {
+    fileNew: {
         enumerable: false,
-        value: function () {
+        value: function (file, template, callback) {
+                //
+                
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    fileOpen: {
+        enumerable: false,
+        value: function (file, callback) {
+                //
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    fileSave: {
+        enumerable: false,
+        value: function (file, callback) {
+                //
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    fileSaveAs: {
+        enumerable: false,
+        value: function (file, copy, callback) {
                 //
         }
     }