1 files changed, 8 insertions, 449 deletions

diff --git a/node_modules/montage/ui/button.reel/button.js b/node_modules/montage/ui/button.reel/button.js
index 91b6304d..46ffc3a2 100644
--- a/node_modules/montage/ui/button.reel/button.js
+++ b/node_modules/montage/ui/button.reel/button.js
@@ -3,463 +3,22 @@
  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*/
-
-/**
-    @module "montage/ui/button.reel"
-    @requires montage/core/core
-    @requires montage/ui/component
-    @requires montage/ui/native-control
-    @requires montage/ui/composer/press-composer
-*/
+/*global require,exports */
 var Montage = require("montage").Montage,
     Component = require("ui/component").Component,
-    NativeControl = require("ui/native-control").NativeControl,
-    PressComposer = require("ui/composer/press-composer").PressComposer;
-
-/**
-    Wraps a native <code>&lt;button></code> or <code>&lt;input[type="button"]></code> HTML element. The element's standard attributes are exposed as bindable properties.
-    @class module:"montage/ui/button.reel".Button
-    @extends module:montage/native-control.NativeControl
-    @example
-<caption>JavaScript example</caption>
-var b1 = Button.create();
-b1.element = document.querySelector("btnElement");
-b1.addEventListener("action", function(event) {
-    console.log("Got event 'action' event");
-});
-    @example
-<caption>Serialized example</caption>
-{
-    "aButton": {
-        "prototype": "ui/button.reel",
-        "properties": {
-            "element": {"#": "btnElement"}
-        },
-        "listeners": [
-            {
-                "type": "action",
-                "listener": {"@": "appListener"}
-            }
-        ]
-    },
-    "listener": {
-        "prototype": "appListener"
-    }
-}
-&lt;button data-montage-id="btnElement"></button>
-*/
-var Button = exports.Button = Montage.create(NativeControl, /** @lends module:"montage/ui/button.reel".Button# */ {
-
-    _preventFocus: {
-        enumerable: false,
-        value: false
-    },
+    NativeButton = require("ui/native/button.reel/button").Button;
 
 /**
-    Specifies whether the button should receive focus or not.
-    @type {boolean}
-    @default false
-    @event longpress
-*/
-    preventFocus: {
-        get: function () {
-            return this._preventFocus;
-        },
-        set: function (value) {
-            if (value === true) {
-                this._preventFocus = true;
-            } else {
-                this._preventFocus = false;
-            }
-        }
-    },
-
-
-/**
-    Enables or disables the Button from user input. When this property is set to <code>false</code>, the "disabled" CSS style is applied to the button's DOM element during the next draw cycle. When set to <code>true</code> the "disabled" CSS class is removed from the element's class list.
-*/
-    //TODO we should prefer positive properties like enabled vs disabled, get rid of disabled
-    enabled: {
-        dependencies: ["disabled"],
-        get: function () {
-            return !this._disabled;
-        },
-        set: function (value) {
-            this.disabled = !value;
-        }
-    },
-
-    /**
-        A Montage converter object used to convert or format the label displayed by the Button instance. When a new value is assigned to <code>label</code>, the converter object's <code>convert()</code> method is invoked, passing it the newly assigned label value.
-        @type {Property}
-        @default null
-    */
-    converter: {
-        value: null
-    },
-
-    /**
-      Stores the node that contains this button's value. Only used for
-      non-`<input>` elements.
-      @private
-    */
-    _labelNode: {value:undefined, enumerable: false},
-
-    _label: { value: undefined, enumerable: false },
-
-    /**
-        The label for the button. In an &lt;input> element this is taken from the element's <code>value</code> attribute. On any other element (including &lt;button>) this is the first child node which is a text node. If one isn't found then it will be created.
-
-        If the button has a non-null <code>converter</code> property, the converter object's <code>convert()</code> method is called on the value before being assigned to the button instance.
-
-        @type {string}
-        @default undefined
-    */
-    label: {
-        get: function() {
-            return this._label;
-        },
-        set: function(value) {
-            if (value && value.length > 0 && this.converter) {
-                try {
-                    value = this.converter.convert(value);
-                    if (this.error) {
-                        this.error = null;
-                    }
-                } catch(e) {
-                    // unable to convert - maybe error
-                    this.error = e;
-                }
-            }
-
-            this._label = value;
-            if (this._isInputElement) {
-                this._value = value;
-            }
-
-            this.needsDraw = true;
-        }
-    },
-
-    /**
-        The amount of time in milliseconds the user must press and hold the button a <code>hold</code> event is dispatched. The default is 1 second.
-        @type {number}
-        @default 1000
-    */
-    holdThreshold: {
-        get: function() {
-            return this._pressComposer.longPressThreshold;
-        },
-        set: function(value) {
-            this._pressComposer.longPressThreshold = value;
-        }
-    },
-
-    _pressComposer: {
-        enumberable: false,
-        value: null
-    },
-
-    _active: {
-        enumerable: false,
-        value: false
-    },
-
-    /**
-        This property is true when the button is being interacted with, either through mouse click or touch event, otherwise false.
-        @type {boolean}
-        @default false
-    */
-    active: {
-        get: function() {
-            return this._active;
-        },
-        set: function(value) {
-            this._active = value;
-            this.needsDraw = true;
-        }
-    },
-
-    // HTMLInputElement/HTMLButtonElement methods
-
-    blur: { value: function() { this._element.blur(); } },
-    focus: { value: function() { this._element.focus(); } },
-    // click() deliberately omitted (it isn't available on <button> anyways)
-
-    didCreate: {
-        value: function() {
-            this._pressComposer = PressComposer.create();
-            this.addComposer(this._pressComposer);
-        }
-    },
-
-    prepareForActivationEvents: {
-        value: function() {
-            this._pressComposer.addEventListener("pressStart", this, false);
-            this._pressComposer.addEventListener("press", this, false);
-            this._pressComposer.addEventListener("pressCancel", this, false);
-        }
-    },
-
-    // Optimisation
-    addEventListener: {
-        value: function(type, listener, useCapture) {
-            NativeControl.addEventListener.call(this, type, listener, useCapture);
-            if (type === "hold") {
-                this._pressComposer.addEventListener("longPress", this, false);
-            }
-        }
-    },
-
-    // Handlers
-
+ * Montage Button
+ */
+exports.Button = Montage.create(NativeButton, {