Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

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

1 files changed, 33 insertions, 0 deletions

diff --git a/node_modules/montage/ui/autocomplete/result-item.reel/result-item.js b/node_modules/montage/ui/autocomplete/result-item.reel/result-item.js
new file mode 100644
index 00000000..61b71afa
--- /dev/null
+++ b/node_modules/montage/ui/autocomplete/result-item.reel/result-item.js
@@ -0,0 +1,33 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+var Montage = require("montage").Montage,
+    Component = require("ui/component").Component,
+    DynamicText = require("ui/dynamic-text.reel").DynamicText;
+
+exports.ResultItem = Montage.create(DynamicText, {
+    
+    textPropertyPath: {value: null},
+    
+    _object: {value: null},
+    object: {
+        get: function() {
+            return this._object;
+        },
+        set: function(aValue) {
+            if(aValue) {
+               this._object = aValue;                
+            }
+            if(this._object) {
+                if(this.textPropertyPath) {
+                    this.value = this._object[this.textPropertyPath];
+                } else {
+                    this.value = this._object;
+                }
+            }
+        }
+    }
+
+});