From a11ef2eed7049835c8bdfa50a2b893632c46eaa0 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 4 Apr 2012 11:11:58 -0700
Subject: Squashed commit of Preparing for the montage undo-manager:
Architecture changes
Reworked the add and remove elements into 1 function which can take 1 or more elements.
Removed the _element from the selection array
Many other changes related to those 2 changes
Undo/Redo shortcuts are now using montage undo/redo manager.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
js/panels/properties.reel/properties.js | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
(limited to 'js/panels/properties.reel/properties.js')
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 40e9b86a..d5acd503 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -87,7 +87,7 @@ exports.Properties = Montage.create(Component, {
this.displayStageProperties();
} else {
if(this.application.ninja.selectedElements.length === 1) {
- this.displayElementProperties(this.application.ninja.selectedElements[0]._element);
+ this.displayElementProperties(this.application.ninja.selectedElements[0]);
} else {
this.displayGroupProperties(this.application.ninja.selectedElements);
}
@@ -120,7 +120,6 @@ exports.Properties = Montage.create(Component, {
} else if(event.target.id === "elementClass") {
if(this.application.ninja.selectedElements.length) {
ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "class", this.elementClass.value, "Change", "pi");
- console.log(this.application.ninja.selectedElements[0]._element.className);
} else {
ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.elementClass);
}
@@ -138,8 +137,8 @@ exports.Properties = Montage.create(Component, {
handleElementChanging: {
value: function(event) {
-// this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(this.application.ninja.selectedElements[0]._element, "left"));
-// this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(this.application.ninja.selectedElements[0]._element, "top"));
+// this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(this.application.ninja.selectedElements[0], "left"));
+// this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(this.application.ninja.selectedElements[0], "top"));
}
},
@@ -148,23 +147,22 @@ exports.Properties = Montage.create(Component, {
// console.log("Element Change PI ", event.detail.source); // If the event comes from the pi don't need to update
if(event.detail.source && event.detail.source !== "pi") {
// TODO - This should only update the properties that were changed.
- var el = this.application.ninja.selectedElements[0]._element || this.application.ninja.selectedElements[0];
+ var el = this.application.ninja.selectedElements[0];
this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(el, "left"));
this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(el, "top"));
this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height"));
this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width"));
- if(this.threeD.inGlobalMode)
- {
+ if(this.threeD.inGlobalMode) {
this.threeD.x3D = ElementsMediator.get3DProperty(el, "x3D");
this.threeD.y3D = ElementsMediator.get3DProperty(el, "y3D");
this.threeD.z3D = ElementsMediator.get3DProperty(el, "z3D");
this.threeD.xAngle = ElementsMediator.get3DProperty(el, "xAngle");
this.threeD.yAngle = ElementsMediator.get3DProperty(el, "yAngle");
this.threeD.zAngle = ElementsMediator.get3DProperty(el, "zAngle");
+ }
}
}
- }
},
handleSelectionChange: {
@@ -173,7 +171,7 @@ exports.Properties = Montage.create(Component, {
this.displayStageProperties();
} else {
if(this.application.ninja.selectedElements.length === 1) {
- this.displayElementProperties(this.application.ninja.selectedElements[0]._element);
+ this.displayElementProperties(this.application.ninja.selectedElements[0]);
} else {
this.displayGroupProperties(this.application.ninja.selectedElements);
}
--
cgit v1.2.3