Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

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

1 files changed, 46 insertions, 0 deletions

diff --git a/node_modules/montage/ui/check-input.js b/node_modules/montage/ui/check-input.js
new file mode 100644
index 00000000..6338c42c
--- /dev/null
+++ b/node_modules/montage/ui/check-input.js
@@ -0,0 +1,46 @@
+/* <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,
+    NativeControl = require("ui/native-control").NativeControl;
+
+var CheckInput = exports.CheckInput =  Montage.create(NativeControl, {
+
+    // Callbacks
+    draw: {
+        value: function() {
+            // Call super
+            Object.getPrototypeOf(CheckInput).draw.call(this);
+            this._element.setAttribute("aria-checked", this._checked);
+        }
+    },
+
+    /**
+        Description TODO
+        @function
+    */
+    prepareForDraw: {
+        enumerable: false,
+        value: function() {
+            this.element.addEventListener('change', this);
+        }
+    },
+
+/**
+    Description TODO
+    @function
+    @param {Event Handler} event TODO
+    */
+    handleChange: {
+        enumerable: false,
+        value: function(event) {
+            Object.getPropertyDescriptor(this, "checked").set.call(this,
+                this.element.checked, true);
+            this._dispatchActionEvent();
+        }
+    }
+});