Merge branch 'master' into brushtool

3 files changed, 19 insertions, 19 deletions

diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 7d36bc59..cfda4a1a 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -7,7 +7,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
-var Icon = exports.Icon = Montage.create(Component, {
+exports.Icon = Montage.create(Component, {
+
+    iconImg: {
+        value: null,
+        serializable: true
+    },
+
+    iconLabel: {
+        value: null,
+        serializable: true
+    },
 
     _icondata:{
         enumerable : false,
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 05d3ea7d..9d4e0103 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -16,16 +16,8 @@
                 "element": {"#": "icon"}
             },
             "bindings": {
-                "icondata": {
-                    "boundObject": {"@": "repetition1"},
-                    "boundObjectPropertyPath": "objectAtCurrentIteration",
-                    "oneway": true
-                },
-                "selectedUri": {
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "selected",
-                    "oneway": true
-                }
+                "icondata": {"<-": "@repetition1.objectAtCurrentIteration"},
+                "selectedUri": {"<-": "@owner.selected"}
             }
         },
 
@@ -35,20 +27,14 @@
                 "element": {"#": "iconsView"}
             },
             "bindings": {
-                "objects": {
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "iconsViewDataObject",
-                    "oneway": true
-                }
+                "objects": {"<-": "@owner.iconsViewDataObject"}
             }
-
         },
 
         "owner" : {
             "prototype" : "js/components/ui/icon-list-basic/iconsList.reel",
             "properties" : {
-                "element" : {"#": "list"},
-                "components": [{"@": "repetition1"}]
+                "element" : {"#": "list"}
             }
         }
     }
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
index d36aa40f..230c7f64 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
@@ -9,6 +9,10 @@ var Component = require("montage/ui/component").Component;
 
 var IconsList = exports.IconsList = Montage.create(Component, {
 
+    components: {
+        value: null
+    },
+
     anItemData:{
         enumerable:true,
         value: null