aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/tag-properties.reel/tag-properties.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel/tag-properties.js')
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js21
1 files changed, 15 insertions, 6 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js
index 9ff23a41..603d8dbe 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.js
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js
@@ -29,9 +29,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 30</copyright> */
31 31
32var Montage = require("montage/core/core").Montage; 32var Montage = require("montage/core/core").Montage,
33var Component = require("montage/ui/component").Component; 33 ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
34var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
35 34
36var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { 35var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
37 divElement: { 36 divElement: {
@@ -71,6 +70,11 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
71 } 70 }
72 }, 71 },
73 72
73 elementPosition: {
74 value: null,
75 serializable: true
76 },
77
74 _subPrepare: { 78 _subPrepare: {
75 value: function() { 79 value: function() {
76 this.customName.style["display"] = "none"; 80 this.customName.style["display"] = "none";
@@ -81,6 +85,8 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
81 this.videoElement.addEventListener("click", this, false); 85 this.videoElement.addEventListener("click", this, false);
82 this.canvasElement.addEventListener("click", this, false); 86 this.canvasElement.addEventListener("click", this, false);
83 this.customElement.addEventListener("click", this, false); 87 this.customElement.addEventListener("click", this, false);
88
89 this.elementPosition.disabled = true;
84 } 90 }
85 }, 91 },
86 92
@@ -107,7 +113,6 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
107 handleFillColorChange: { 113 handleFillColorChange: {
108 value: function (e) { 114 value: function (e) {
109 this.fill = e._event; 115 this.fill = e._event;
110// this.fill.webGlColor = this.application.ninja.colorController.colorModel.colorToWebGl(e._event.color);
111 } 116 }
112 }, 117 },
113 118
@@ -130,8 +135,12 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
130 }, 135 },
131 136
132 selectedElement: { 137 selectedElement: {
133 get: function() { return this._selectedElement;}, 138 get: function() {
134 set: function(value) { this._selectedElement = value; } 139 return this._selectedElement;
140 },
141 set: function(value) {
142 this._selectedElement = value;
143 }
135 } 144 }
136 145
137}); 146});