Merge branch 'components' of https://github.com/mencio/ninja-internal into integration

Conflicts:
	js/io/document/html-document.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 26 insertions, 0 deletions

diff --git a/node_modules/ninja-components/image2.reel/image2.js b/node_modules/ninja-components/image2.reel/image2.js
new file mode 100644
index 00000000..750b837a
--- /dev/null
+++ b/node_modules/ninja-components/image2.reel/image2.js
@@ -0,0 +1,26 @@
+/* <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;
+
+var Image2 = exports.Image2 = Montage.create(Component, {
+
+    _src: {value: null},
+    
+    src: {
+        set: function(value) {
+            this._src = value;
+            this.needsDraw = true;
+        }
+    },
+    
+    draw: {
+        value: function() {
+            this._element.style.background = "url(" + this._src + ")";
+        }
+    }
+});
\ No newline at end of file