From a40184e08a7ee2f189f133fd7bd83480e4bfc7f2 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 16 May 2012 22:19:34 -0700
Subject: Objects Panel - Add object component
---
js/panels/objects/object.reel/object.html | 47 +++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 js/panels/objects/object.reel/object.html
(limited to 'js/panels/objects/object.reel/object.html')
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html
new file mode 100644
index 00000000..efc66d79
--- /dev/null
+++ b/js/panels/objects/object.reel/object.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
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/object.html')
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
From 3a2b178e93767b6e4f463fbc0a44e4b0d00ceec9 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 13 Jun 2012 19:07:54 -0700
Subject: Objects Panel - Fix CSS to simplify showing object icons in other
panels
---
js/panels/objects/object.reel/object.html | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'js/panels/objects/object.reel/object.html')
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html
index a072ab5e..6274f480 100644
--- a/js/panels/objects/object.reel/object.html
+++ b/js/panels/objects/object.reel/object.html
@@ -14,7 +14,8 @@
"owner": {
"prototype": "js/panels/objects/object.reel",
"properties": {
- "element": {"#": "object"}
+ "element": {"#": "object"},
+ "iconElement": { "#": "object-icon"}
}
},
"labelText": {
@@ -39,7 +40,7 @@
-
+
--
cgit v1.2.3
From e9783135c3a6c95b7ccc3a6e45f40a030a2a067c Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 20 Jun 2012 11:40:17 -0700
Subject: Objects Tray - Use label instead of identifier for object name
---
js/panels/objects/object.reel/object.html | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
(limited to 'js/panels/objects/object.reel/object.html')
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html
index 6274f480..f9de1499 100644
--- a/js/panels/objects/object.reel/object.html
+++ b/js/panels/objects/object.reel/object.html
@@ -21,14 +21,10 @@
"labelText": {
"prototype": "montage/ui/dynamic-text.reel",
"properties": {
- "element": {"#": "label" }
+ "element": {"#": "name" }
},
"bindings": {
- "value" : {
- "boundObject": {"@": "owner"},
- "boundObjectPropertyPath": "label",
- "oneway": true
- }
+ "value" : {"<-": "@owner.name"}
}
}
@@ -41,7 +37,7 @@
-
+
--
cgit v1.2.3