From f9f8fdc3000042ba5b4504d91870dc9a32ef25eb Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 16 May 2012 01:00:22 -0700
Subject: Squashed master into dom-architecture

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../materials-library-panel.reel/materials-library-panel.html        | 2 +-
 js/panels/presets/animations-presets.reel/animations-presets.html    | 5 ++---
 js/panels/presets/style-presets.reel/style-presets.html              | 2 +-
 js/panels/presets/transitions-presets.reel/transitions-presets.html  | 5 ++---
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'js/panels')

diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 7fc48a55..b5d7a869 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -50,7 +50,7 @@
                 "prototype": "js/panels/Materials/materials-popup.reel"
             },
             "materialsController" : {
-                "prototype": "js/controllers/tree-controller",
+                "prototype": "js/components/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "label",
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html
index 347e5497..2b5a33d6 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.html
+++ b/js/panels/presets/animations-presets.reel/animations-presets.html
@@ -13,12 +13,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "owner": {
                 "prototype" : "js/panels/presets/animations-presets.reel[AnimationsLibrary]",
                 "properties" : {
-                    "element" : {"#" : "animationsLibrary"},
-                    "treeList" : {"@" : "treeList"}
+                    "element" : {"#" : "animationsLibrary"}
                 }
             },
             "presetsController" : {
-                "prototype": "js/controllers/tree-controller",
+                "prototype": "js/components/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "text",
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html
index a3d718bb..bebff22d 100644
--- a/js/panels/presets/style-presets.reel/style-presets.html
+++ b/js/panels/presets/style-presets.reel/style-presets.html
@@ -17,7 +17,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "presetsController" : {
-                "prototype": "js/controllers/tree-controller",
+                "prototype": "js/components/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "text",
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index a6b98aeb..add43ee7 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -13,12 +13,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "owner": {
                 "prototype" : "js/panels/presets/transitions-presets.reel[TransitionsLibrary]",
                 "properties" : {
-                    "element" : {"#" : "transitionsLibrary"},
-                    "treeList" : {"@" : "treeList"}
+                    "element" : {"#" : "transitionsLibrary"}
                 }
             },
             "presetsController" : {
-                "prototype": "js/controllers/tree-controller",
+                "prototype": "js/components/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "text",
-- 
cgit v1.2.3