1 files changed, 79 insertions, 14 deletions

diff --git a/node_modules/montage/ui/check-input.js b/node_modules/montage/ui/check-input.js
index 6338c42c..42538c02 100644
--- a/node_modules/montage/ui/check-input.js
+++ b/node_modules/montage/ui/check-input.js
@@ -3,10 +3,11 @@
  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> */
-
+/*global require, exports */
 var Montage = require("montage").Montage,
     Component = require("ui/component").Component,
-    NativeControl = require("ui/native-control").NativeControl;
+    NativeControl = require("ui/native-control").NativeControl,
+    PressComposer = require("ui/composer/press-composer").PressComposer;
 
 var CheckInput = exports.CheckInput =  Montage.create(NativeControl, {
 
@@ -14,33 +15,97 @@ var CheckInput = exports.CheckInput =  Montage.create(NativeControl, {
     draw: {
         value: function() {
             // Call super
-            Object.getPrototypeOf(CheckInput).draw.call(this);
+            NativeControl.draw.call(this);
             this._element.setAttribute("aria-checked", this._checked);
         }
     },
 
+    _pressComposer: {
+        enumerable: false,
+        value: null
+    },
+
+    prepareForActivationEvents: {
+        value: function() {
+            var pressComposer = this._pressComposer = PressComposer.create();
+            this.addComposer(pressComposer);
+            pressComposer.addEventListener("pressstart", this, false);
+            pressComposer.addEventListener("press", this, false);
+        }
+    },
+
+    prepareForDraw: {
+        enumerable: false,
+        value: function() {
+            this._element.addEventListener('change', this);
+        }
+    },
+
+
+
     /**
-        Description TODO
-        @function
+    Fake the checking of the element.
+
+    Changes the checked property of the element and dispatches a change event.
+    Radio button overrides this.
+
+    @private
     */
-    prepareForDraw: {
+    _fakeCheck: {
         enumerable: false,
         value: function() {
-            this.element.addEventListener('change', this);
+            var changeEvent;
+            // NOTE: this may be BAD, modifying the element outside of
+            // the draw loop, but it's what a click/touch would
+            // actually have done
+            this._element.checked = !this._element.checked;
+            changeEvent = document.createEvent("HTMLEvents");
+            changeEvent.initEvent("change", true, true);
+            this._element.dispatchEvent(changeEvent);
         }
     },
 
-/**
-    Description TODO
-    @function
-    @param {Event Handler} event TODO
+    /**
+    Stores if we need to fake checking.
+
+    When preventDefault is called on touchstart and touchend events (e.g. by
+    the scrollview component) the checkbox doesn't check itself, so we need
+    to fake it later.
+
+    @default false
+    @private
     */
+    _shouldFakeCheck: {
+        enumerable: false,
+        value: false
+    },
+
+    // Handlers
+
+    handlePressstart: {
+        value: function(event) {
+            this._shouldFakeCheck = event.defaultPrevented;
+        }
+    },
+
+
+    handlePress: {
+        value: function(event) {
+            if (this._shouldFakeCheck) {
+                this._shouldFakeCheck = false;
+                this._fakeCheck();
+            }
+        }
+    },
+
     handleChange: {
         enumerable: false,
         value: function(event) {
-            Object.getPropertyDescriptor(this, "checked").set.call(this,
-                this.element.checked, true);
-            this._dispatchActionEvent();
+            if (!this._pressComposer || this._pressComposer.state !== PressComposer.CANCELLED) {
+                Object.getPropertyDescriptor(this, "checked").set.call(this,
+                    this.element.checked, true);
+                this._dispatchActionEvent();
+            }
         }
     }
 });