From c066fb41ebee85bacf9b2155366b16831af41d76 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Tue, 7 Feb 2012 13:46:05 -0800
Subject: Tree Components - Added copyright comments
---
js/components/treeview/branch.reel/branch.css | 6 ++++++
js/components/treeview/branch.reel/branch.html | 5 +++++
js/components/treeview/leaf.reel/leaf.css | 6 ++++++
js/components/treeview/leaf.reel/leaf.html | 5 +++++
js/components/treeview/ninja-branch.reel/ninja-branch.css | 6 ++++++
js/components/treeview/ninja-branch.reel/ninja-branch.html | 5 +++++
js/components/treeview/ninja-leaf.reel/ninja-leaf.css | 6 ++++++
js/components/treeview/ninja-leaf.reel/ninja-leaf.html | 5 +++++
js/components/treeview/treeview.reel/treeview.css | 8 +++++---
js/components/treeview/treeview.reel/treeview.html | 5 +++++
10 files changed, 54 insertions(+), 3 deletions(-)
(limited to 'js/components')
diff --git a/js/components/treeview/branch.reel/branch.css b/js/components/treeview/branch.reel/branch.css
index 5998e0f0..0f4e4a87 100644
--- a/js/components/treeview/branch.reel/branch.css
+++ b/js/components/treeview/branch.reel/branch.css
@@ -1,3 +1,9 @@
+/*
+ This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
+ */
+
.treeRoot > .branch > ul {
margin-top: 0;
}
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html
index 31a4cf18..b44a54c5 100644
--- a/js/components/treeview/branch.reel/branch.html
+++ b/js/components/treeview/branch.reel/branch.html
@@ -1,4 +1,9 @@
+
diff --git a/js/components/treeview/leaf.reel/leaf.css b/js/components/treeview/leaf.reel/leaf.css
index fea5a2c4..41fb02ff 100644
--- a/js/components/treeview/leaf.reel/leaf.css
+++ b/js/components/treeview/leaf.reel/leaf.css
@@ -1,3 +1,9 @@
+/*
+ This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
+ */
+
.leaf > .leaf-label {
opacity: 0.8;
cursor: pointer;
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html
index 991a4323..cf0b4e40 100644
--- a/js/components/treeview/leaf.reel/leaf.html
+++ b/js/components/treeview/leaf.reel/leaf.html
@@ -1,4 +1,9 @@
+
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index 698fcd21..6a458cc7 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.css
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -1,3 +1,9 @@
+/*
+ This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
+ */
+
.treeRoot > .branch > ul {
margin-top: 0;
}
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 6e239855..4d557a94 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -1,4 +1,9 @@
+
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
index 0ad10c4c..b2f427b5 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -1,3 +1,9 @@
+/*
+ This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
+ */
+
.treeRoot .leaf-label {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAIAAAD9iXMrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEQzcwMEU1RjQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEQzcwMEU2MDQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkRDNzAwRTVENDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkRDNzAwRTVFNDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2BUcaK3QAAANFJREFUeNqMULEOREAQdYjvuE%2FYWlSUQqKQ7A%2FsD6n0SoVCFHpRa0SllvgFlpvzZO9OcfGSnbx9M%2FNmMpp2Dw96VVX9L%2FJ93wRrmkZJIKrZcRyK%2Bs25p5%2BU8pK4KCakMAzxL4oCJIqivu8Nw0DDu25ZFtW3ritIkiS0tGVZtm1%2F6rZtu4yr67osSyJBEJx3ybKsbVukOecU4zh2XRfKMAzTNJmYpWxgPM%2BzEIIxRrzrOs%2FzdMyVvyAxTdPxAJFzv%2BeBbz8cfN93kDzPb55ZewkwAF0Ddf6ATSsHAAAAAElFTkSuQmCC);
background-position: 3px center;
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
index 0a8fdac0..bd8e8acd 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
@@ -1,4 +1,9 @@
+
diff --git a/js/components/treeview/treeview.reel/treeview.css b/js/components/treeview/treeview.reel/treeview.css
index 1e3965ef..018448f1 100644
--- a/js/components/treeview/treeview.reel/treeview.css
+++ b/js/components/treeview/treeview.reel/treeview.css
@@ -1,3 +1,5 @@
-
-
-{}
+/*
+ This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
+ */
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index 3d5d75c4..d70b016c 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -1,4 +1,9 @@
+
--
cgit v1.2.3
From 329a859e2666716c3a1d99c6bd2679e10c81fc8d Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 7 Feb 2012 15:25:11 -0800
Subject: Added ability to toggle combobox's visibility so we can show/hide
materials comboboxes in the tool options.
Signed-off-by: Nivesh Rajbhandari
---
js/components/combobox.reel/combobox.js | 28 ++++++++++++++
.../shape-properties.reel/shape-properties.js | 43 ++++++++++++----------
2 files changed, 51 insertions(+), 20 deletions(-)
(limited to 'js/components')
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index 3200b01c..bc433f52 100644
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -104,6 +104,26 @@ exports.Combobox = Montage.create(Component, {
}
},
+ _visible: {
+ enumerable: false,
+ value: true
+ },
+
+ visible: {
+ enumerable: true,
+ serializable: true,
+ get: function() {
+ return this._visible;
+ },
+ set: function(value) {
+ if(value !== this._visible)
+ {
+ this._visible = value;
+ this.needsDraw = true;
+ }
+ }
+ },
+
handleChange:
{
value:function(event)
@@ -158,6 +178,14 @@ exports.Combobox = Montage.create(Component, {
this.element.appendChild(optionItem);
}
this.element.disabled = !this._enabled;
+ if(this._visible)
+ {
+ this.element.style.visibility = "visible";
+ }
+ else
+ {
+ this.element.style.visibility = "hidden";
+ }
}
}
},
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 345e361c..79567453 100644
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -45,13 +45,16 @@ exports.ShapeProperties = Montage.create(ToolProperties, {
this._selectedSubTool = value;
this[this._selectedSubTool.properties].visible = true;
-// if(this._selectedSubTool.id === "LineTool") {
-// this._fillIcon.style["display"] = "none";
-// this._fillMaterial.style["display"] = "none";
-// } else {
-// this._fillIcon.style["display"] = "";
-// this._fillMaterial.style["display"] = "";
-// }
+ if(this._useWebGL.checked)
+ {
+ if(this._selectedSubTool.id === "LineTool") {
+ this._fillIcon.style["display"] = "none";
+ this._fillMaterial.visible = false;
+ } else {
+ this._fillIcon.style["display"] = "";
+ this._fillMaterial.visible = true;
+ }
+ }
}
}
@@ -62,23 +65,23 @@ exports.ShapeProperties = Montage.create(ToolProperties, {
if(this._useWebGL.checked)
{
this._use3D = true;
-// this._materialLabel.style["display"] = "";
-// this._strokeIcon.style["display"] = "";
-// this._strokeMaterial.style["display"] = "";
-// if(this.selectedSubTool.id !== "LineTool")
-// {
-// this._fillIcon.style["display"] = "";
-// this._fillMaterial.style["display"] = "";
-// }
+ this._materialLabel.style["display"] = "";
+ this._strokeIcon.style["display"] = "";
+ this._strokeMaterial.visible = true;
+ if(this.selectedSubTool.id !== "LineTool")
+ {
+ this._fillIcon.style["display"] = "";
+ this._fillMaterial.visible = true;
+ }
}
else
{
this._use3D = false;
-// this._materialLabel.style["display"] = "none";
-// this._strokeIcon.style["display"] = "none";
-// this._strokeMaterial.style["display"] = "none";
-// this._fillIcon.style["display"] = "none";
-// this._fillMaterial.style["display"] = "none";
+ this._materialLabel.style["display"] = "none";
+ this._strokeIcon.style["display"] = "none";
+ this._strokeMaterial.visible = false;
+ this._fillIcon.style["display"] = "none";
+ this._fillMaterial.visible = false;
}
}
}
--
cgit v1.2.3
From 9a404b8a717d0aac0eabb828a4d3cdc8c9c3eed8 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 7 Feb 2012 17:42:04 -0800
Subject: IKNINJA - 1084: Fixing the custom tag.
Signed-off-by: Valerio Virgillito
---
.../tools-properties/tag-properties.reel/tag-properties.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'js/components')
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index c7588b9e..2b81bb71 100644
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -56,9 +56,9 @@
--
cgit v1.2.3