aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorAnanya Sen2012-02-03 09:57:41 -0800
committerAnanya Sen2012-02-03 09:57:41 -0800
commitc093dd13a84ce6eb3e00a672c38a808093c5d966 (patch)
tree5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /js/mediators
parent79b0173eeca079dec42ff1480182656dbe3af44f (diff)
parent8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff)
downloadninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz
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>
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/element-mediator.js5
-rw-r--r--js/mediators/io-mediator.js35
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, {
92 _addElement: { 92 _addElement: {
93 value: function(el, rules, noEvent) { 93 value: function(el, rules, noEvent) {
94 ElementController.addElement(el, rules); 94 ElementController.addElement(el, rules);
95 var p3d = this.get3DProperties(el);
96 if(p3d)
97 {
98 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
99 }
95 if(!noEvent) NJevent("elementAdded", el); 100 if(!noEvent) NJevent("elementAdded", el);
96 } 101 }
97 }, 102 },
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
6 6
7//////////////////////////////////////////////////////////////////////// 7////////////////////////////////////////////////////////////////////////
8// 8//
9var Montage = require("montage/core/core").Montage, 9var Montage = require("montage/core/core").Montage,
10 FileIo = require("js/io/system/fileio").FileIo, 10 FileIo = require("js/io/system/fileio").FileIo,
11 ProjectIo = require("js/io/system/projectio").ProjectIo; 11 ProjectIo = require("js/io/system/projectio").ProjectIo;
12//////////////////////////////////////////////////////////////////////// 12////////////////////////////////////////////////////////////////////////
13// 13//
14exports.IoMediator = Montage.create(Object.prototype, { 14exports.IoMediator = Montage.create(Object.prototype, {
15 //////////////////////////////////////////////////////////////////// 15 ////////////////////////////////////////////////////////////////////
16 // 16 //
17 name: { 17 fileNew: {
18 enumerable: false, 18 enumerable: false,
19 value: function () { 19 value: function (file, template, callback) {
20 //
21
22 }
23 },
24 ////////////////////////////////////////////////////////////////////
25 //
26 fileOpen: {
27 enumerable: false,
28 value: function (file, callback) {
29 //
30 }
31 },
32 ////////////////////////////////////////////////////////////////////
33 //
34 fileSave: {
35 enumerable: false,
36 value: function (file, callback) {
37 //
38 }
39 },
40 ////////////////////////////////////////////////////////////////////
41 //
42 fileSaveAs: {
43 enumerable: false,
44 value: function (file, copy, callback) {
20 // 45 //
21 } 46 }
22 } 47 }