From dad4e3aa51b9f2b370f20f13bdb00ccc33f8d891 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Fri, 25 May 2012 16:34:52 -0700
Subject: Object component - Minor cleanup
---
js/panels/objects/object.reel/object.js | 32 +++++---------------------------
1 file changed, 5 insertions(+), 27 deletions(-)
(limited to 'js/panels/objects/object.reel')
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js
index 953c1baf..43abafad 100644
--- a/js/panels/objects/object.reel/object.js
+++ b/js/panels/objects/object.reel/object.js
@@ -57,41 +57,19 @@ exports.Object = Montage.create(Component, {
get: function() {
return this._montageLabel;
},
- set: function(value) {
- if(this._montageMetaData === value) { return false; }
+ set: function(data) {
+ if(this._montageMetaData === data) { return false; }
- this._montageMetaData = value;
+ this._montageMetaData = data;
- if(!this.identifier && value.label) {
- this.label = value.label;
+ if(!this.identifier && data.label) {
+ this.label = data.label;
this.needsDraw = true;
}
}
},
- templateDidLoad: {
- value: function() {
- console.log('object loaded');
- }
- },
-
- prepareForDraw : {
- value: function() {
-
- }
- },
-
- willDraw : {
- value: function() {
- if(this._needsPropertyInspection) {
-
- }
-
- console.log("This label ", this.label);
- }
- },
-
draw : {
value: function() {
--
cgit v1.2.3
From 1be5495b77c1dd426be3a6be05555254856de6ba Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Fri, 25 May 2012 16:35:17 -0700
Subject: Object Component - Enable native dragging
---
js/panels/objects/object.reel/object.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/objects/object.reel')
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html
index efc66d79..a072ab5e 100644
--- a/js/panels/objects/object.reel/object.html
+++ b/js/panels/objects/object.reel/object.html
@@ -38,7 +38,7 @@
-
+
--
cgit v1.2.3