Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into integration

3 files changed, 12 insertions, 1 deletions

diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
index b4d4cffd..b4d4cffd 100644..100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css
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 50a1d61d..0bb79873 100644..100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -21,6 +21,11 @@
                     "boundObject": {"@": "repetition1"},
                     "boundObjectPropertyPath": "objectAtCurrentIteration",
                     "oneway": true
+                },
+                "selectedUri": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "selected",
+                    "oneway": true
                 }
             }
         },
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 56eb57c3..d36aa40f 100644..100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
@@ -15,11 +15,17 @@ var IconsList = exports.IconsList = Montage.create(Component, {
     },
 
     iconsViewDataObject:{
-         writable:true,
+        writable:true,
         enumerable:true,
         value:[]
     },
 
+    selected:{
+        writable:true,
+        enumerable:true,
+        value:null
+    },
+
     willDraw: {
         enumerable: false,
         value: function() {