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 <mqg734@motorola.com>
---
.../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
</script>
</head>
<body>
-<section id="section" class="sectional">
- <section id="axisMode" class="fieldCol rotation">
+<section data-montage-id="section" class="sectional">
+ <section data-montage-id="axisMode" class="fieldCol rotation">
<label>Axis:</label>
<article class="fieldRow">
<div class="inputField">
- <div id="rdioLocal"></div>
+ <div data-montage-id="rdioLocal"></div>
</div>
</article>
<article class="fieldRow">
<div class="inputField">
- <div id="rdioGlobal"></div>
+ <div data-montage-id="rdioGlobal"></div>
</div>
</article>
</section>
<hr />
<section class="fieldCol">
- <label id="lblthreeDX">X:</label>
+ <label data-montage-id="lblthreeDX">X:</label>
<article class="fieldRow threeCol">
<div>
<div class="inputField">
- <div id="threeDPosX"></div>
+ <div data-montage-id="threeDPosX"></div>
</div>
</div>
<div>
<div>
- <label id="lblthreeDY">Y: </label>
+ <label data-montage-id="lblthreeDY">Y: </label>
</div>
<div class="inputField">
- <div id="threeDPosY"></div>
+ <div data-montage-id="threeDPosY"></div>
</div>
</div>
<div>
<div>
- <label id="lblthreeDZ">Z: </label>
+ <label data-montage-id="lblthreeDZ">Z: </label>
</div>
<div class="inputField">
- <div id="threeDPosZ"></div>
+ <div data-montage-id="threeDPosZ"></div>
</div>
</div>
</article>
@@ -306,7 +306,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
<article class="fieldRow threeCol">
<div>
<div class="inputField">
- <div id="threeDRotX"></div>
+ <div data-montage-id="threeDRotX"></div>
</div>
</div>
<div>
@@ -314,7 +314,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
<label>Y: </label>
</div>
<div class="inputField">
- <div id="threeDRotY"></div>
+ <div data-montage-id="threeDRotY"></div>
</div>
</div>
<div>
@@ -322,7 +322,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
<label>Z: </label>
</div>
<div class="inputField">
- <div id="threeDRotZ"></div>
+ <div data-montage-id="threeDRotZ"></div>
</div>
</div>
</article>
@@ -336,7 +336,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
<label style="padding-right:14px;">Perspective Distance: </label>
</div>
<div class="inputField" >
- <div id="threeDPerspectiveDistance"></div>
+ <div data-montage-id="threeDPerspectiveDistance"></div>
</div>
</div>
</article>
@@ -347,7 +347,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
<article class="fieldRow oneCol checkbox">
<div>
<div class="inputField">
- <input id="flattenCh" class="nj-skinned" type="checkbox" />
+ <input data-montage-id="flattenCh" class="nj-skinned" type="checkbox" />
</div>
<div>
<label> Flatten</label>
--
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 <valerio@motorola.com>
---
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 <valerio@motorola.com>
---
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 @@
</script>
</head>
<body>
- <section id="propertiesPanel" class="propertiesPanel">
+ <section data-montage-id="propertiesPanel" class="propertiesPanel">
<section class="sectional">
<section class="fieldCol">
<label>Element:</label>
- <article class="fieldRow"><input type="text" id="elementName" class="nj-skinned" readonly="readonly"></article>
+ <article class="fieldRow"><input type="text" data-montage-id="elementName" class="nj-skinned" readonly="readonly"></article>
</section>
<section class="fieldCol">
<label>ID:</label>
- <article class="fieldRow"><input type="text" id="elementId" class="nj-skinned" /></article>
+ <article class="fieldRow"><input type="text" data-montage-id="elementId" class="nj-skinned" /></article>
</section>
<section class="fieldCol">
<label>Class:</label>
- <article class="fieldRow"><input type="text" id="elementClass" class="nj-skinned" /></article>
+ <article class="fieldRow"><input type="text" data-montage-id="elementClass" class="nj-skinned" /></article>
</section>
</section>
- <section id="PosSize"></section>
- <section id="customSections">
- <div id="customSection"></div>
+ <section data-montage-id="PosSize"></section>
+ <section data-montage-id="customSections">
+ <div data-montage-id="customSection"></div>
</section>
- <section id="threeD"></section>
+ <section data-montage-id="threeD"></section>
</section>
</body>
</html>
\ 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 @@
</script>
</head>
<body>
- <div id="section">
- <h2 id="sectionSplitter" class="subSectionHeader">
+ <div data-montage-id="section">
+ <h2 data-montage-id="sectionSplitter" class="subSectionHeader">
<section class="arrow"><div class="arrowIcon animated"></div></section>
<section class="title"></section>
</h2>
- <div id="sectionSlot" class="animated"></div>
+ <div data-montage-id="sectionSlot" class="animated"></div>
</div>
</body>
</html>
\ 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 @@
</script>
</head>
<body>
- <div id="section">
+ <div data-montage-id="section">
<section class="fieldCol">
<article class="fieldRow colorSelect">
- <div id="Stroke"></div>
- <div id="Fill"></div>
+ <div data-montage-id="Stroke"></div>
+ <div data-montage-id="Fill"></div>
</article>
</section>
</div>
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 @@
</script>
</head>
<body>
- <div id="section">
+ <div data-montage-id="section">
<section class="fieldCol">
<label class="lbl"></label>
<article class="fieldRow">
- <div id="slotElement" class="inputField">
+ <div data-montage-id="slotElement" class="inputField">
</div>
</article>
<label class="lbl"></label>
<article class="fieldRow">
- <div id="slotElement2" class="inputField">
+ <div data-montage-id="slotElement2" class="inputField">
</div>
</article>
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 @@
</script>
</head>
<body>
- <div id="section">
+ <div data-montage-id="section">
<section class="fieldCol">
<label><span class="lbl"></span></label>
<article class="fieldRow">
- <div id="slotElement" class="inputField">
+ <div data-montage-id="slotElement" class="inputField">
</div>
</article>
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
</script>
</head>
<body>
- <div id="section" class="sectional">
- <div id="repetitionContainer">
- <div id="repeitionContent"></div>
+ <div data-montage-id="section" class="sectional">
+ <div data-montage-id="repetitionContainer">
+ <div data-montage-id="repeitionContent"></div>
</div>
</div>
</body>
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
</script>
</head>
<body>
- <div id="section" class="sectional">
- <section id="position" class="fieldCol">
- <label id="labelX">Left:</label>
+ <div data-montage-id="section" class="sectional">
+ <section data-montage-id="position" class="fieldCol">
+ <label data-montage-id="labelX">Left:</label>
<article class="fieldRow twoCol">
<div>
<div class="inputField">
- <div id="PosX"></div>
+ <div data-montage-id="PosX"></div>
</div>
</div>
<div>
<div>
- <label id="labelY">Top:</label>
+ <label data-montage-id="labelY">Top:</label>
</div>
<div class="inputField">
- <div id="PosY"></div>
+ <div data-montage-id="PosY"></div>
</div>
</div>
</article>
</section>
<hr />
<section class="fieldCol">
- <button id="posBound" class="unlock"></button>
+ <button data-montage-id="posBound" class="unlock"></button>
<label>Width:</label>
<article class="fieldRow twoCol">
<div>
<div class="inputField">
- <div id="PosW"></div>
+ <div data-montage-id="PosW"></div>
</div>
</div>
<div>
@@ -126,7 +126,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
<label>Height:</label>
</div>
<div class="inputField">
- <div id="PosH"></div>
+ <div data-montage-id="PosH"></div>
</div>
</div>
</article>
--
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 <valerio@motorola.com>
---
.../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
</section>
<hr />
<section class="fieldCol">
- <button data-montage-id="posBound" class="unlock"></button>
+ <button data-montage-id="posBound" id="posBound" class="unlock"></button>
<label>Width:</label>
<article class="fieldRow twoCol">
<div>
--
cgit v1.2.3
From ec886fe3c46f6e3e54fe4e1df769dabed5588063 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Fri, 11 May 2012 11:34:06 -0700
Subject: fixed bug introduced when we removed the color toolbar. The styling
of the color chips in the PI was broken due to a reliance on a css class from
the colortoolbar reel. The requried class was copied to the properties.css
file as a temporary fix.
---
js/panels/properties.reel/properties.css | 15 +++++++++++++++
1 file changed, 15 insertions(+)
(limited to 'js/panels/properties.reel')
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 0928da3a..eee44561 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -4,6 +4,21 @@
(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
</copyright> */
+/* Cleanup TODO - now that we removed the color toolbar from the tools panel, we no longer load the colortoolbar reel.
+ Currently the color chips in the property inspector rely on the colortoolbar button style so we
+ copied the class here. When we do the color feature cleanup we should remove this dependency.
+*/
+.colortoolbar button {
+ float: left;
+ clear: both;
+ width: 27px;
+ height: 27px;
+ background: black;
+ border: 1px solid #000;
+ padding: 0;
+ margin: 0px;
+}
+
.propertiesPanel {
color:#FFF;
overflow-x: hidden;
--
cgit v1.2.3