diff options
author | Valerio Virgillito | 2012-04-13 14:22:53 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-13 14:22:53 -0700 |
commit | e8b4eebc94db3d2dbddb3e493025c426eaeb63e4 (patch) | |
tree | 186819a4b444fa3eb9c908ebab49d45791b6715a | |
parent | 5561e7cc43ae9f7cb9d1217ac02f9f136000e79c (diff) | |
download | ninja-e8b4eebc94db3d2dbddb3e493025c426eaeb63e4.tar.gz |
collapsing the history panel by default and commenting out the undo for the 3d properties
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rwxr-xr-x | js/mediators/element-mediator.js | 12 | ||||
-rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.js | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index fb3f2f27..919aaec1 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -272,6 +272,18 @@ exports.ElementMediator = Montage.create(Component, { | |||
272 | item.element.elementModel.controller["set3DProperties"](item.element, item.properties, update3DModel); | 272 | item.element.elementModel.controller["set3DProperties"](item.element, item.properties, update3DModel); |
273 | } | 273 | } |
274 | 274 | ||
275 | /* | ||
276 | if(eventType === "Change") { | ||
277 | var undoLabel = "3D Properties change"; | ||
278 | elements.forEach(function(elementObject) { | ||
279 | var swap = elementObject.properties; | ||
280 | elementObject.properties = elementObject.previousProperties; | ||
281 | elementObject.previousProperties = swap; | ||
282 | }); | ||
283 | document.application.undoManager.add(undoLabel, this.set3DProperties, this, elements, eventType, source); | ||
284 | } | ||
285 | */ | ||
286 | |||
275 | var els = elements.map(function(element) { | 287 | var els = elements.map(function(element) { |
276 | return element.element; | 288 | return element.element; |
277 | }); | 289 | }); |
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js index c40bbc21..8d1d6a5e 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.js +++ b/js/panels/PanelContainer.reel/PanelContainer.js | |||
@@ -45,6 +45,7 @@ exports.PanelContainer = Montage.create(Component, { | |||
45 | this['panel_'+i].minHeight= p.minHeight; | 45 | this['panel_'+i].minHeight= p.minHeight; |
46 | this['panel_'+i].maxHeight = p.maxHeight; | 46 | this['panel_'+i].maxHeight = p.maxHeight; |
47 | this['panel_'+i].flexible = p.flexible; | 47 | this['panel_'+i].flexible = p.flexible; |
48 | this['panel_'+i].collapsed = p.collapsed; | ||
48 | this['panel_'+i].modulePath = p.modulePath; | 49 | this['panel_'+i].modulePath = p.modulePath; |
49 | this['panel_'+i].moduleName = p.moduleName; | 50 | this['panel_'+i].moduleName = p.moduleName; |
50 | this['panel_'+i].disabled = true; | 51 | this['panel_'+i].disabled = true; |