From 6b67b498b3b1eec82e7bb7f34261e2c390506616 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 30 Apr 2012 16:04:13 -0700 Subject: Updating id to data-montage-id (and associated CSS, if necessary) in some of our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari --- .../sections/three-d-view.reel/three-d-view.html | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'js/panels/properties.reel') diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index b82124d0..5ef13fab 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html @@ -259,43 +259,43 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
-
+
+
-
+
-
+
- +
-
+
- +
-
+
- +
-
+
@@ -306,7 +306,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+
@@ -314,7 +314,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+
@@ -322,7 +322,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+
@@ -336,7 +336,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+
@@ -347,7 +347,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
- +
-- cgit v1.2.3 From 5a74b74e8ec76d60cadf623cabaa0b667f1c4058 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 2 May 2012 11:08:59 -0700 Subject: code cleanup Signed-off-by: Valerio Virgillito --- js/panels/properties.reel/properties.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'js/panels/properties.reel') diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index ee90cd64..8c2daa14 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js @@ -208,11 +208,7 @@ exports.Properties = Montage.create(Component, { this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); } - if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { - this.threeD.flatten = false; - } else { - this.threeD.flatten = true; - } + this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d"; if(this.customPi !== stage.elementModel.pi) { // We need to unregister color chips from the previous selection from the Color Model -- cgit v1.2.3 From f1f2e65712d7c5a163dd6fdbd8f5911555c3f377 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 17:46:23 -0700 Subject: finishing to replace all id with data-montage-id Signed-off-by: Valerio Virgillito --- js/panels/properties.reel/properties.html | 16 ++++++++-------- js/panels/properties.reel/section.reel/section.html | 6 +++--- .../custom-rows/color-select.reel/color-select.html | 6 +++--- .../sections/custom-rows/dual-row.reel/dual-row.html | 6 +++--- .../custom-rows/single-row.reel/single-row.html | 4 ++-- .../properties.reel/sections/custom.reel/custom.html | 6 +++--- .../position-and-size.reel/position-and-size.html | 18 +++++++++--------- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'js/panels/properties.reel') diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html index 554d1477..3a1ae880 100755 --- a/js/panels/properties.reel/properties.html +++ b/js/panels/properties.reel/properties.html @@ -105,26 +105,26 @@ -
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
\ No newline at end of file diff --git a/js/panels/properties.reel/section.reel/section.html b/js/panels/properties.reel/section.reel/section.html index e6f68751..c9b14565 100755 --- a/js/panels/properties.reel/section.reel/section.html +++ b/js/panels/properties.reel/section.reel/section.html @@ -36,12 +36,12 @@ -
-

+
+

-
+
\ No newline at end of file diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html index 990dc739..cef44f31 100755 --- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html +++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html @@ -38,11 +38,11 @@ -
+
-
-
+
+
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html index d1b5f28b..bdcbff7f 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html @@ -44,17 +44,17 @@ -
+
-
+
-
+
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html index b606e5db..88f12186 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html @@ -31,11 +31,11 @@ -
+
-
+
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html index cc48d2e7..cfc5208c 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.html +++ b/js/panels/properties.reel/sections/custom.reel/custom.html @@ -49,9 +49,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
-
-
+
+
+
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html index 59bbe346..93aea50e 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html +++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html @@ -92,33 +92,33 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
-
- +
+
+
-
+
- +
-
+
- +
-
+
@@ -126,7 +126,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+

-- cgit v1.2.3 From d3288216b62621b149fa032ff8a1b415e450b61f Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 22:28:20 -0700 Subject: Fixing the lock button css Signed-off-by: Valerio Virgillito --- .../sections/position-and-size.reel/position-and-size.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/properties.reel') diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html index 93aea50e..a7aac84e 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html +++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html @@ -113,7 +113,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
- +
-- cgit v1.2.3