You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/05/04 20:19:47 UTC
[5/9] git commit: [flex-asjs] [refs/heads/develop] - Merge
remote-tracking branch 'origin/goog.events' into develop
Merge remote-tracking branch 'origin/goog.events' into develop
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Conflicts:
frameworks/js/FlexJS/src/org/apache/flex/binding/ConstantBinding.js
frameworks/js/FlexJS/src/org/apache/flex/binding/SimpleBinding.js
frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e07e28a0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e07e28a0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e07e28a0
Branch: refs/heads/develop
Commit: e07e28a01374a505acb142e308da97b71fe5ac76
Parents: 9934402 26e97b2
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sat May 4 07:45:17 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sat May 4 07:45:17 2013 +0200
----------------------------------------------------------------------
.../js/FlexJS/src/org/apache/flex/FlexGlobal.js | 61 --
.../js/FlexJS/src/org/apache/flex/FlexObject.js | 26 -
.../src/org/apache/flex/binding/BindingBase.js | 78 ++
.../src/org/apache/flex/binding/ConstantBinding.js | 59 +-
.../src/org/apache/flex/binding/SimpleBinding.js | 79 +--
.../FlexJS/src/org/apache/flex/core/Application.js | 66 +--
.../src/org/apache/flex/core/HTMLElementWrapper.js | 174 ++--
.../FlexJS/src/org/apache/flex/core/IDocument.js | 28 -
.../js/FlexJS/src/org/apache/flex/core/ListBase.js | 185 ++++
.../org/apache/flex/core/SimpleCSSValuesImpl.js | 7 +-
.../src/org/apache/flex/core/SimpleValuesImpl.js | 7 +-
.../js/FlexJS/src/org/apache/flex/core/UIBase.js | 119 +--
.../src/org/apache/flex/core/ValuesManager.js | 8 +-
.../src/org/apache/flex/events/CustomEvent.js | 19 +-
.../js/FlexJS/src/org/apache/flex/events/Event.js | 22 +-
.../src/org/apache/flex/events/EventDispatcher.js | 100 +--
.../apache/flex/html/staticControls/CheckBox.js | 55 +-
.../apache/flex/html/staticControls/ComboBox.js | 307 +++----
.../flex/html/staticControls/DropDownList.js | 129 +---
.../org/apache/flex/html/staticControls/Label.js | 20 +-
.../org/apache/flex/html/staticControls/List.js | 124 +---
.../apache/flex/html/staticControls/RadioButton.js | 66 +-
.../apache/flex/html/staticControls/TextArea.js | 27 +-
.../apache/flex/html/staticControls/TextButton.js | 24 +-
.../apache/flex/html/staticControls/TextInput.js | 29 +-
.../apache/flex/html5/staticControls/CheckBox.js | 55 +-
.../apache/flex/html5/staticControls/ComboBox.js | 306 +++----
.../flex/html5/staticControls/DropDownList.js | 129 +---
.../org/apache/flex/html5/staticControls/Label.js | 23 +-
.../org/apache/flex/html5/staticControls/List.js | 121 +---
.../flex/html5/staticControls/RadioButton.js | 66 +-
.../apache/flex/html5/staticControls/TextArea.js | 27 +-
.../apache/flex/html5/staticControls/TextButton.js | 27 +-
.../apache/flex/html5/staticControls/TextInput.js | 29 +-
.../src/org/apache/flex/jquery/Application.js | 96 +--
.../apache/flex/jquery/staticControls/CheckBox.js | 72 +-
.../flex/jquery/staticControls/RadioButton.js | 68 +-
.../flex/jquery/staticControls/TextButton.js | 29 +-
.../FlexJS/src/org/apache/flex/net/HTTPHeader.js | 26 +-
.../FlexJS/src/org/apache/flex/net/HTTPService.js | 451 +++++------
.../src/org/apache/flex/net/JSONInputParser.js | 8 +-
.../src/org/apache/flex/net/JSONItemConverter.js | 9 +-
.../flex/net/dataConverters/LazyCollection.js | 159 ++--
.../FlexJS/src/org/apache/flex/utils/IE8Utils.js | 104 ---
.../org/apache/flex/utils/MXMLDataInterpreter.js | 675 ++++++++-------
.../js/FlexJS/src/org/apache/flex/utils/Timer.js | 126 ++--
46 files changed, 1890 insertions(+), 2535 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e07e28a0/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
----------------------------------------------------------------------
diff --cc frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
index 27ab22e,1df194f..ece05d2
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/RadioButton.js
@@@ -98,60 -111,7 +111,61 @@@ org.apache.flex.html.staticControls.Rad
* @this {org.apache.flex.html.staticControls.RadioButton}
* @param {bool} value The selected setter.
*/
- org.apache.flex.html.staticControls.RadioButton.prototype.set_selected = function(value) {
- this.element.childNodes.item(0).checked = value;
+ org.apache.flex.html.staticControls.RadioButton.prototype.set_selected =
+ function(value) {
+ this.element.childNodes.item(0).checked = value;
};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.RadioButton}
+ * @return {Object} The value getter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_value = function() {
+ return this.element.childNodes.item(0).value;
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.RadioButton}
+ * @param {Object} value The value setter.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_value = function(value) {
+ this.element.childNodes.item(0).value = value;
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.RadioButton}
+ * @return {Object} The value of the selected RadioButton.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.get_selectedValue = function() {
+ var groupName = this.element.childNodes.item(0).name;
+ var buttons = document.getElementsByName(groupName);
+ var n = buttons.length;
+ for (var i = 0; i < n; i++)
+ {
+ if (buttons[i].checked)
+ return buttons[i].value;
+ }
+ return null;
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.RadioButton}
+ * @param {Object} value The value of the selected RadioButton.
+ */
+org.apache.flex.html.staticControls.RadioButton.prototype.set_selectedValue = function(value) {
+ var groupName = this.element.childNodes.item(0).name;
+ var buttons = document.getElementsByName(groupName);
+ var n = buttons.length;
+ for (var i = 0; i < n; i++)
+ {
+ if (buttons[i].value == value)
+ {
+ buttons[i].checked = true;
+ break;
+ }
+ }
+};