Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 4 insertions, 18 deletions

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"}
             }
         }
     }