replace set_xxx(value) with xxx = value
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9c7b2ef3 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9c7b2ef3 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9c7b2ef3 Branch: refs/heads/develop Commit: 9c7b2ef33c1d930975617b6ba87fb1bbc7953fd1 Parents: 4aed23b Author: Alex Harui <aha...@apache.org> Authored: Thu Jan 29 14:47:44 2015 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Thu Jan 29 14:47:44 2015 -0800 ---------------------------------------------------------------------- .../charts/supportClasses/ChartAxisGroup.js | 34 ++++++++++---------- .../charts/supportClasses/ChartDataGroup.js | 2 +- .../src/org/apache/flex/core/FilledRectangle.js | 8 ++--- .../org/apache/flex/core/HTMLElementWrapper.js | 2 +- .../js/FlexJS/src/org/apache/flex/core/IBead.js | 2 +- .../FlexJS/src/org/apache/flex/core/ListBase.js | 6 ++-- .../FlexJS/src/org/apache/flex/core/UIBase.js | 6 ++-- .../src/org/apache/flex/createjs/CheckBox.js | 2 +- .../js/FlexJS/src/org/apache/flex/html/Alert.js | 18 +++++------ .../src/org/apache/flex/html/ButtonBar.js | 6 ++-- .../src/org/apache/flex/html/CloseButton.js | 4 +-- .../FlexJS/src/org/apache/flex/html/ComboBox.js | 2 +- .../src/org/apache/flex/html/DropDownList.js | 8 ++--- .../js/FlexJS/src/org/apache/flex/html/Image.js | 2 +- .../js/FlexJS/src/org/apache/flex/html/List.js | 12 +++---- .../src/org/apache/flex/html/NumericStepper.js | 20 ++++++------ .../js/FlexJS/src/org/apache/flex/html/Panel.js | 4 +-- .../src/org/apache/flex/html/SimpleList.js | 8 ++--- .../FlexJS/src/org/apache/flex/html/Slider.js | 12 +++---- .../FlexJS/src/org/apache/flex/html/Spinner.js | 4 +-- .../FlexJS/src/org/apache/flex/html/TitleBar.js | 6 ++-- .../org/apache/flex/html/ToggleTextButton.js | 4 +-- .../DataItemRendererFactoryForArrayData.js | 8 ++--- .../src/org/apache/flex/html/beads/ListView.js | 12 +++---- .../src/org/apache/flex/html/beads/PanelView.js | 6 ++-- .../TextItemRendererFactoryForArrayData.js | 2 +- .../controllers/ItemRendererMouseController.js | 4 +-- .../ListSingleSelectionMouseController.js | 2 +- .../beads/controllers/SliderMouseController.js | 4 +-- .../beads/controllers/SpinnerMouseController.js | 4 +-- .../flex/html/beads/layouts/ButtonBarLayout.js | 10 +++--- .../flex/html/beads/layouts/TileLayout.js | 8 ++--- .../ButtonBarButtonItemRenderer.js | 4 +-- .../html/supportClasses/DataItemRenderer.js | 4 +-- .../html/supportClasses/NonVirtualDataGroup.js | 6 ++-- .../html/supportClasses/StringItemRenderer.js | 4 +-- .../src/org/apache/flex/html5/ComboBox.js | 2 +- .../org/apache/flex/jquery/ToggleTextButton.js | 4 +-- .../src/org/apache/flex/maps/google/Map.js | 4 +-- .../FlexJS/src/org/apache/flex/utils/UIUtils.js | 4 +-- 40 files changed, 132 insertions(+), 132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js index bf760e0..e12cb13 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js @@ -53,7 +53,7 @@ org_apache_flex_charts_supportClasses_ChartAxisGroup. prototype.createElement = function() { this.element = document.createElement('div'); this.element.flexjs_wrapper = this; - this.set_className('ChartAxisGroup'); + this.className = 'ChartAxisGroup'; this.positioner = this.element; @@ -74,9 +74,9 @@ org_apache_flex_charts_supportClasses_ChartAxisGroup.prototype.drawHorizontalTic function(text, xpos, ypos, boxWidth, boxHeight, tickFill) { var label = new org_apache_flex_html_Label(); this.addElement(label); - label.set_text(text); - label.set_x(xpos - label.width / 2); - label.set_y(ypos); + label.text = text; + label.x = xpos - label.width / 2; + label.y = ypos; }; @@ -93,9 +93,9 @@ org_apache_flex_charts_supportClasses_ChartAxisGroup.prototype.drawVerticalTickL function(text, xpos, ypos, boxWidth, boxHeight, tickFill) { var label = new org_apache_flex_html_Label(); this.addElement(label); - label.set_text(text); - label.set_x(xpos); - label.set_y(ypos - label.height / 2); + label.text = text; + label.x = xpos; + label.y = ypos - label.height / 2; }; @@ -111,12 +111,12 @@ function(text, xpos, ypos, boxWidth, boxHeight, tickFill) { org_apache_flex_charts_supportClasses_ChartAxisGroup.prototype.drawTickMarks = function(originX, originY, width, height, marks, tickStroke) { var tickPath = new org_apache_flex_core_graphics_Path(); - tickPath.set_x(0); - tickPath.set_y(0); - tickPath.set_width(this.width); - tickPath.set_height(this.height); + tickPath.x = 0; + tickPath.y = 0; + tickPath.width = this.width; + tickPath.height = this.height; this.addElement(tickPath); - tickPath.set_stroke(tickStroke); + tickPath.stroke = tickStroke; tickPath.drawPath(0, 0, marks); }; @@ -132,12 +132,12 @@ function(originX, originY, width, height, marks, tickStroke) { org_apache_flex_charts_supportClasses_ChartAxisGroup.prototype.drawAxisLine = function(originX, originY, width, height, lineStroke) { var axisPath = new org_apache_flex_core_graphics_Path(); - axisPath.set_x(0); - axisPath.set_y(0); - axisPath.set_width(this.width); - axisPath.set_height(this.height); + axisPath.x = 0; + axisPath.y = 0; + axisPath.width = this.width; + axisPath.height = this.height; this.addElement(axisPath); - axisPath.set_stroke(lineStroke); + axisPath.stroke = lineStroke; var pathLine = 'M ' + String(originX) + ' ' + String(originY) + ' l ' + String(width) + ' ' + String(height); axisPath.drawPath(0, 0, pathLine); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js index 960f1ea..14d03a4 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js @@ -51,7 +51,7 @@ org_apache_flex_charts_supportClasses_ChartDataGroup. prototype.createElement = function() { this.element = document.createElement('div'); this.element.flexjs_wrapper = this; - this.set_className('ChartDataGroup'); + this.className = 'ChartDataGroup'; this.positioner = this.element; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js b/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js index 85b67f9..a9719f3 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js @@ -81,8 +81,8 @@ org_apache_flex_core_UIBase.prototype.set_fillColor = function(value) { org_apache_flex_core_UIBase.prototype.drawRect = function(x, y, width, height) { this.element.style.position = 'absolute'; this.element.style.backgroundColor = '#' + this.fillColor_.toString(16); - if (!isNaN(x)) this.set_x(x); - if (!isNaN(y)) this.set_y(y); - if (!isNaN(width)) this.set_width(width); - if (!isNaN(height)) this.set_height(height); + if (!isNaN(x)) this.x = x; + if (!isNaN(y)) this.y = y; + if (!isNaN(width)) this.width = width; + if (!isNaN(height)) this.height = height; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js b/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js index 08658b0..bd4367a 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js @@ -72,7 +72,7 @@ org_apache_flex_core_HTMLElementWrapper.prototype.addBead = function(bead) { this.model = bead; } - bead.set_strand(this); + bead.strand = this; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js index 3586a37..f599591 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IBead.js @@ -41,7 +41,7 @@ org_apache_flex_core_IBead.prototype.FLEXJS_CLASS_INFO = /** - * set_strand() + * strand * * @expose * @param {org_apache_flex_core_IStrand} value The new host. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js index 375edba..e5af761 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js @@ -87,7 +87,7 @@ org_apache_flex_core_ListBase.prototype.get_dataProvider = */ org_apache_flex_core_ListBase.prototype.set_dataProvider = function(value) { - this.model.set_dataProvider(value); + this.model.dataProvider = value; }; @@ -107,7 +107,7 @@ org_apache_flex_core_ListBase.prototype.get_selectedIndex = */ org_apache_flex_core_ListBase.prototype.set_selectedIndex = function(value) { - this.model.set_selectedIndex(value); + this.model.selectedIndex = value; }; @@ -127,7 +127,7 @@ org_apache_flex_core_ListBase.prototype.get_selectedItem = */ org_apache_flex_core_ListBase.prototype.set_selectedItem = function(value) { - this.model.set_selectedItem(value); + this.model.selectedItem = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js index cb7a536..0cd35f5 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js @@ -320,7 +320,7 @@ org_apache_flex_core_UIBase.prototype.addBead = function(bead) { this.dispatchEvent(new org_apache_flex_events_Event('viewChanged')); } - bead.set_strand(this); + bead.strand = this; }; @@ -434,7 +434,7 @@ org_apache_flex_core_UIBase.prototype.get_y = function() { * @param {number} pixels The pixel count from the left edge. */ org_apache_flex_core_UIBase.prototype.set_width = function(pixels) { - this.set_explicitWidth(pixels); + this.explicitWidth = pixels; this.setWidth(pixels); }; @@ -507,7 +507,7 @@ org_apache_flex_core_UIBase.prototype.get_percentWidth = function() { * @param {number} pixels The pixel count from the top edge. */ org_apache_flex_core_UIBase.prototype.set_height = function(pixels) { - this.set_explicitHeight(pixels); + this.explicitHeight = pixels; this.setHeight(pixels); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js index 2f95955..ff0c40d 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js @@ -140,5 +140,5 @@ org_apache_flex_createjs_CheckBox.prototype.set_selected = */ org_apache_flex_createjs_CheckBox.prototype.clickHandler = function(event) { - this.set_selected(!this.selected); + this.selected = !this.selected; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js index 3edca01..7154dc4 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js @@ -105,9 +105,9 @@ org_apache_flex_html_Alert.show = var a = new org_apache_flex_html_Alert(); host.addElement(a); - a.set_title(title); - a.set_text(message); - a.set_flags(flags); + a.title = title; + a.text = message; + a.flags = flags; a.positioner.style.position = 'relative'; a.positioner.style.width = '200px'; @@ -131,7 +131,7 @@ org_apache_flex_html_Alert.prototype.get_title = function() org_apache_flex_html_Alert.prototype.set_title = function(value) { - this.titleBar.set_title(value); + this.titleBar.title = value; }; @@ -150,7 +150,7 @@ org_apache_flex_html_Alert.prototype.get_text = function() org_apache_flex_html_Alert.prototype.set_text = function(value) { - this.message.set_text(value); + this.message.text = value; }; @@ -175,28 +175,28 @@ org_apache_flex_html_Alert.prototype.set_flags = if (this.flags & org_apache_flex_html_Alert.OK) { var ok = new org_apache_flex_html_TextButton(); this.buttonArea.addElement(ok); - ok.set_text('OK'); + ok.text = 'OK'; goog.events.listen(/** @type {EventTarget} */ (ok.element), 'click', goog.bind(this.dismissAlert, this)); } if (this.flags & org_apache_flex_html_Alert.CANCEL) { var cancel = new org_apache_flex_html_TextButton(); this.buttonArea.addElement(cancel); - cancel.set_text('Cancel'); + cancel.text = 'Cancel'; goog.events.listen(/** @type {EventTarget} */ (cancel.element), 'click', goog.bind(this.dismissAlert, this)); } if (this.flags & org_apache_flex_html_Alert.YES) { var yes = new org_apache_flex_html_TextButton(); this.buttonArea.addElement(yes); - yes.set_text('YES'); + yes.text = 'YES'; goog.events.listen(/** @type {EventTarget} */ (yes.element), 'click', goog.bind(this.dismissAlert, this)); } if (this.flags & org_apache_flex_html_Alert.NO) { var nob = new org_apache_flex_html_TextButton(); this.buttonArea.addElement(nob); - nob.set_text('NO'); + nob.text = 'NO'; goog.events.listen(/** @type {EventTarget} */ (nob.element), 'click', goog.bind(this.dismissAlert, this)); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js index 88c8808..d01b39f 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js @@ -43,8 +43,8 @@ org_apache_flex_html_ButtonBar = function() { // this.itemRendererFactory = new // org_apache_flex_html_beads_ // DataItemRendererFactoryForArrayData(); - // this.itemRendererFactory.set_itemRendererClass('org_apache_flex_html_' + - // 'supportClasses.ButtonBarButtonItemRenderer'); + // this.itemRendererFactory.itemRendererClass = 'org_apache_flex_html_' + + // 'supportClasses_ButtonBarButtonItemRenderer'; // this.addBead(this.itemRendererFactory); // this.addBead(new @@ -79,7 +79,7 @@ org_apache_flex_html_ButtonBar.prototype.createElement = this.element.style.borderColor = '#333333'; this.positioner = this.element; - this.set_className('ButtonBar'); + this.className = 'ButtonBar'; this.element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/CloseButton.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/CloseButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/CloseButton.js index cad273d..54256da 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/CloseButton.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/CloseButton.js @@ -48,8 +48,8 @@ org_apache_flex_html_CloseButton.prototype.createElement = this.element.innerHTML = 'x'; this.element.style.padding = 0; - this.set_height(11); - this.set_width(11); + this.height = 11; + this.width = 11; return this.element; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js index ed4f452..800f7c1 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js @@ -90,7 +90,7 @@ org_apache_flex_html_ComboBox.prototype.selectChanged = select = event.currentTarget; - this.set_selectedItem(select.options[select.selectedIndex].value); + this.selectedItem = select.options[select.selectedIndex].value; this.popup.parentNode.removeChild(this.popup); this.popup = null; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js index e76e5be..f7e7762 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js @@ -65,7 +65,7 @@ org_apache_flex_html_DropDownList.prototype. set_dataProvider = function(value) { var dp, i, n, opt; - this.model.set_dataProvider(value); + this.model.dataProvider = value; dp = this.element.options; n = dp.length; @@ -88,7 +88,7 @@ org_apache_flex_html_DropDownList.prototype. */ org_apache_flex_html_DropDownList.prototype.changeHandler = function() { - this.model.set_selectedIndex(this.element.selectedIndex); + this.model.selectedIndex = this.element.selectedIndex; this.dispatchEvent('change'); }; @@ -99,7 +99,7 @@ org_apache_flex_html_DropDownList.prototype.changeHandler = */ org_apache_flex_html_DropDownList.prototype. set_selectedIndex = function(value) { - this.model.set_selectedIndex(value); + this.model.selectedIndex = value; this.element.selectedIndex = value; }; @@ -110,6 +110,6 @@ org_apache_flex_html_DropDownList.prototype. */ org_apache_flex_html_DropDownList.prototype. set_selectedItem = function(value) { - this.model.set_selectedItem(value); + this.model.selectedItem = value; this.element.selectedIndex = this.selectedIndex; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js index 8498c8a..22f85df 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js @@ -82,5 +82,5 @@ org_apache_flex_html_Image.prototype. */ org_apache_flex_html_Image.prototype. set_source = function(value) { - this.model.set_source(value); + this.model.source = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/List.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js index d4786f8..953e5e2 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/List.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js @@ -87,7 +87,7 @@ function() { */ org_apache_flex_html_List.prototype.set_labelField = function(value) { - this.model.set_labelField(value); + this.model.labelField = value; }; @@ -107,7 +107,7 @@ function() { */ org_apache_flex_html_List.prototype.set_rowHeight = function(value) { - this.presentationModel.set_rowHeight(value); + this.presentationModel.rowHeight = value; }; @@ -132,7 +132,7 @@ function() { org_apache_flex_html_List.prototype.createElement = function() { org_apache_flex_html_List.base(this, 'createElement'); - this.set_className('List'); + this.className = 'List'; return this.element; }; @@ -192,11 +192,11 @@ org_apache_flex_html_List.prototype.selectedHandler = for (i = 0; i < n; i++) { var test = this.renderers[i]; if (test == itemRenderer) { - this.model.set_selectedIndex(i); - itemRenderer.set_selected(true); + this.model.selectedIndex = i; + itemRenderer.selected = true; } else { - test.set_selected(false); + test.selected = false; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js index 131e49d..49ea822 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js @@ -79,9 +79,9 @@ org_apache_flex_html_NumericStepper.prototype.createElement = goog.bind(this.spinnerChange, this)); this.element.flexjs_wrapper = this; - this.set_className('NumericStepper'); + this.className = 'NumericStepper'; - this.input.set_text(String(this.spinner.value)); + this.input.text = String(this.spinner.value); return this.element; }; @@ -94,8 +94,8 @@ org_apache_flex_html_NumericStepper.prototype.spinnerChange = function(event) { var newValue = this.spinner.value; - this.set_value(newValue); - this.input.set_text(String(this.spinner.value)); + this.value = newValue; + this.input.text = String(this.spinner.value); this.dispatchEvent(new org_apache_flex_events_Event('valueChange')); }; @@ -116,7 +116,7 @@ org_apache_flex_html_NumericStepper.prototype.get_minimum = */ org_apache_flex_html_NumericStepper.prototype.set_minimum = function(value) { - this.model.set_minimum(value); + this.model.minimum = value; }; @@ -136,7 +136,7 @@ org_apache_flex_html_NumericStepper.prototype.get_maximum = */ org_apache_flex_html_NumericStepper.prototype.set_maximum = function(value) { - this.model.set_maximum(value); + this.model.maximum = value; }; @@ -156,8 +156,8 @@ org_apache_flex_html_NumericStepper.prototype.get_value = */ org_apache_flex_html_NumericStepper.prototype.set_value = function(newValue) { - this.model.set_value(newValue); - this.spinner.set_value(newValue); + this.model.value = newValue; + this.spinner.value = newValue; }; @@ -177,7 +177,7 @@ org_apache_flex_html_NumericStepper.prototype.get_snapInterval = */ org_apache_flex_html_NumericStepper.prototype.set_snapInterval = function(value) { - this.model.set_snapInterval(value); + this.model.snapInterval = value; }; @@ -197,6 +197,6 @@ org_apache_flex_html_NumericStepper.prototype.get_stepSize = */ org_apache_flex_html_NumericStepper.prototype.set_stepSize = function(value) { - this.model.set_stepSize(value); + this.model.stepSize = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js index a94a477..6477ca5 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js @@ -153,7 +153,7 @@ org_apache_flex_html_Panel.prototype.get_showCloseButton = function() { */ org_apache_flex_html_Panel.prototype.set_showCloseButton = function(value) { - this.model.set_showCloseButton(value); + this.model.showCloseButton = value; }; @@ -172,7 +172,7 @@ org_apache_flex_html_Panel.prototype.get_title = function() { */ org_apache_flex_html_Panel.prototype.set_title = function(value) { - this.model.set_title(value); + this.model.title = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js index 4445476..ddeec61 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js @@ -51,7 +51,7 @@ org_apache_flex_html_SimpleList.prototype. goog.events.listen(this.element, 'change', goog.bind(this.changeHandler, this)); this.positioner = this.element; - this.set_className('SimpleList'); + this.className = 'SimpleList'; return this.element; }; @@ -73,7 +73,7 @@ org_apache_flex_html_SimpleList.prototype. set_dataProvider = function(value) { var dp, i, n, opt; - this.model.set_dataProvider(value); + this.model.dataProvider = value; dp = this.element.options; n = dp.length; @@ -105,7 +105,7 @@ org_apache_flex_html_SimpleList.prototype. */ org_apache_flex_html_SimpleList.prototype. set_selectedIndex = function(value) { - this.model.set_selectedIndex(value); + this.model.selectedIndex = value; }; @@ -123,6 +123,6 @@ org_apache_flex_html_SimpleList.prototype. */ org_apache_flex_html_SimpleList.prototype. set_selectedItem = function(value) { - this.model.set_selectedItem(value); + this.model.selectedItem = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js index c4752c2..8aa17b8 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js @@ -67,7 +67,7 @@ org_apache_flex_html_Slider.prototype.createElement = this.positioner = this.element; this.element.flexjs_wrapper = this; - this.set_className('Slider'); + this.className = 'Slider'; return this.element; }; @@ -90,7 +90,7 @@ org_apache_flex_html_Slider.prototype.get_value = */ org_apache_flex_html_Slider.prototype.set_value = function(newValue) { - this.model.set_value(newValue); + this.model.value = newValue; this.setThumbFromValue(this.model.value); }; @@ -112,7 +112,7 @@ org_apache_flex_html_Slider.prototype.get_minimum = */ org_apache_flex_html_Slider.prototype.set_minimum = function(value) { - this.model.set_minimum(value); + this.model.minimum = value; }; @@ -133,7 +133,7 @@ org_apache_flex_html_Slider.prototype.get_maximum = */ org_apache_flex_html_Slider.prototype.set_maximum = function(value) { - this.model.set_maximum(value); + this.model.maximum = value; }; @@ -154,7 +154,7 @@ org_apache_flex_html_Slider.prototype.get_snapInterval = */ org_apache_flex_html_Slider.prototype.set_snapInterval = function(value) { - this.model.set_snapInterval(value); + this.model.snapInterval = value; }; @@ -175,7 +175,7 @@ org_apache_flex_html_Slider.prototype.get_stepSize = */ org_apache_flex_html_Slider.prototype.set_stepSize = function(value) { - this.model.set_stepSize(value); + this.model.stepSize = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js index 61d532c..873d651 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Spinner.js @@ -58,11 +58,11 @@ org_apache_flex_html_Spinner.prototype.createElement = this.element.style.verticalAlign = 'middle'; this.incrementButton = new org_apache_flex_html_TextButton(); - this.incrementButton.set_text('\u25B2'); + this.incrementButton.text = '\u25B2'; this.addElement(this.incrementButton); this.decrementButton = new org_apache_flex_html_TextButton(); - this.decrementButton.set_text('\u25BC'); + this.decrementButton.text = '\u25BC'; this.addElement(this.decrementButton); this.controller = new org_apache_flex_html_beads_controllers_SpinnerMouseController(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js index 19e46a1..65d92f7 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js @@ -54,7 +54,7 @@ org_apache_flex_html_TitleBar.prototype.createElement = this.positioner = this.element; this.element.flexjs_wrapper = this; - this.set_className('TitleBar'); + this.className = 'TitleBar'; return this.element; }; @@ -76,7 +76,7 @@ org_apache_flex_html_TitleBar.prototype.get_title = */ org_apache_flex_html_TitleBar.prototype.set_title = function(value) { - this.model.set_title(value); + this.model.title = value; }; @@ -96,5 +96,5 @@ org_apache_flex_html_TitleBar.prototype.get_showCloseButton = */ org_apache_flex_html_TitleBar.prototype.set_showCloseButton = function(value) { - this.model.set_showCloseButton(value); + this.model.showCloseButton = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js index 4aace7a..22bfda7 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ToggleTextButton.js @@ -88,11 +88,11 @@ org_apache_flex_html_ToggleTextButton.prototype.set_selected = var className = this.className; if (value) { if (className.indexOf(this.SELECTED) == className.length - this.SELECTED.length) - this.set_className(className.substring(0, className.length - this.SELECTED.length)); + this.className = className.substring(0, className.length - this.SELECTED.length); } else { if (className.indexOf(this.SELECTED) == -1) - this.set_className(className + this.SELECTED); + this.className = className + this.SELECTED; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js index 7c35505..0bd17f2 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js @@ -132,10 +132,10 @@ org_apache_flex_html_beads_DataItemRendererFactoryForArrayData. n = dp.length; for (i = 0; i < n; i++) { var ir = this.itemRendererFactory_.createItemRenderer(this.dataGroup); - ir.set_index(i); - ir.set_labelField(this.model.labelField); - ir.set_data(dp[i]); - if (presModel) ir.set_height(presModel.rowHeight); + ir.index = i; + ir.labelField = this.model.labelField; + ir.data = dp[i]; + if (presModel) ir.height = presModel.rowHeight; } var newEvent = new org_apache_flex_events_Event('itemsCreated'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js index f7f9e6e..9f7dd4a 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js @@ -77,14 +77,14 @@ org_apache_flex_html_beads_ListView.prototype.set_strand = getValue(this.strand_, 'iDataGroup'); this.dataGroup_ = new m2(); } - this.dataGroup_.set_strand(this); + this.dataGroup_.strand = this; this.strand_.addElement(this.dataGroup_); if (this.strand_.getBeadByType(org_apache_flex_core_IBeadLayout) == null) { var m3 = org_apache_flex_core_ValuesManager.valuesImpl.getValue(this.strand_, 'iBeadLayout'); this.layout_ = new m3(); this.strand_.addBead(this.layout_); - //this.layout_.set_strand(this.strand_); + //this.layout_.strand = this.strand_; } this.handleSizeChange(null); @@ -120,12 +120,12 @@ org_apache_flex_html_beads_ListView.prototype. var ir; if (this.lastSelectedIndex != -1) { ir = this.dataGroup_.getItemRendererForIndex(this.lastSelectedIndex); - if (ir) ir.set_selected(false); + if (ir) ir.selected = false; } if (this.model.selectedIndex != -1) { ir = this.dataGroup_.getItemRendererForIndex( this.model.selectedIndex); - if (ir) ir.set_selected(true); + if (ir) ir.selected = true; } this.lastSelectedIndex = this.model.selectedIndex; }; @@ -190,6 +190,6 @@ org_apache_flex_html_beads_ListView.prototype.get_resizeableView = function() { * @param {Object} event The event that triggered the resize. */ org_apache_flex_html_beads_ListView.prototype.handleSizeChange = function(event) { - this.dataGroup_.set_width(this.strand_.width); - this.dataGroup_.set_height(this.strand_.height); + this.dataGroup_.width = this.strand_.width; + this.dataGroup_.height = this.strand_.height; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js index d7ffb4c..b921f67 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js @@ -61,8 +61,8 @@ org_apache_flex_html_beads_PanelView.prototype.set_strand = this.titleBar_ = new org_apache_flex_html_TitleBar(); this.strand_.titleBar = this.titleBar_; - this.titleBar_.set_id('titleBar'); - this.titleBar_.set_model(this.strand_.model); + this.titleBar_.id = 'titleBar'; + this.titleBar_.model = this.strand_.model; this.strand_.controlBar = new org_apache_flex_html_ControlBar(); @@ -93,7 +93,7 @@ org_apache_flex_html_beads_PanelView.prototype.changeHandler = } if (event.type == 'titleChange') { - this.titleBar_.set_title(strand.model.title); + this.titleBar_.title = strand.model.title; } var p = this.strand_.positioner; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js index 33a8340..76c3544 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js @@ -83,7 +83,7 @@ org_apache_flex_html_beads_TextItemRendererFactoryForArrayData. opt = new org_apache_flex_html_supportClasses_StringItemRenderer(); this.dataGroup.addElement(opt); - opt.set_text(dp[i]); + opt.text = dp[i]; } var newEvent = new org_apache_flex_events_Event('itemsCreated'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js index 97282c9..fec6fad 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js @@ -64,7 +64,7 @@ org_apache_flex_html_beads_controllers_ItemRendererMouseController.prototype.set */ org_apache_flex_html_beads_controllers_ItemRendererMouseController.prototype.handleMouseOver = function(event) { - this.strand_.set_hovered(true); + this.strand_.hovered = true; var newEvent = new goog.events.Event('rollover'); newEvent.target = this.strand_; @@ -78,7 +78,7 @@ org_apache_flex_html_beads_controllers_ItemRendererMouseController.prototype.han */ org_apache_flex_html_beads_controllers_ItemRendererMouseController.prototype.handleMouseOut = function(event) { - this.strand_.set_hovered(false); + this.strand_.hovered = false; var newEvent = new goog.events.Event('rollout'); newEvent.target = this.strand_; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js index 9d5e3c0..6ee9dc6 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js @@ -67,7 +67,7 @@ org_apache_flex_html_beads_controllers_ListSingleSelectionMouseController.protot function(event) { var index = event.target.index; - this.model.set_selectedIndex(index); + this.model.selectedIndex = index; var newEvent = new org_apache_flex_events_Event('change'); this.strand_.dispatchEvent(newEvent); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js index 29b3f1f..4493ddc 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js @@ -73,7 +73,7 @@ org_apache_flex_html_beads_controllers_SliderMouseController. var n = p * (this.strand_.maximum - this.strand_.minimum) + this.strand_.minimum; - this.strand_.set_value(n); + this.strand_.value = n; this.origin = parseInt(this.thumb.element.style.left, 10); this.position = parseInt(this.thumb.element.style.left, 10); @@ -167,6 +167,6 @@ org_apache_flex_html_beads_controllers_SliderMouseController. this.thumb.element.style.left = String(newX - parseInt(this.thumb.element.style.width, 10) / 2) + 'px'; - this.strand_.set_value(n); + this.strand_.value = n; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js index 89d9375..5bce99c 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js @@ -66,7 +66,7 @@ org_apache_flex_html_beads_controllers_SpinnerMouseController. var newValue = this.strand_.snap(Math.min(this.strand_.maximum, this.strand_.value + this.strand_.stepSize)); - this.strand_.set_value(newValue); + this.strand_.value = newValue; }; @@ -81,5 +81,5 @@ org_apache_flex_html_beads_controllers_SpinnerMouseController. var newValue = this.strand_.snap(Math.max(this.strand_.minimum, this.strand_.value - this.strand_.stepSize)); - this.strand_.set_value(newValue); + this.strand_.value = newValue; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js index a4874ea..20e8977 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js @@ -105,16 +105,16 @@ org_apache_flex_html_beads_layouts_ButtonBarLayout. for (var i = 0; i < n; i++) { var ir = itemRendererParent.getElementAt(i); - ir.set_y(0); - ir.set_height(useHeight); - ir.set_x(xpos); + ir.y = 0; + ir.height = useHeight; + ir.x = xpos; ir.element.style['vertical-align'] = 'middle'; ir.element.style['text-align'] = 'center'; ir.element.style['left-margin'] = 'auto'; ir.element.style['right-margin'] = 'auto'; - if (this.buttonWidths_ && !isNaN(this.buttonWidths_[i])) ir.set_width(this.buttonWidths_[i]); - else ir.set_width(useWidth); + if (this.buttonWidths_ && !isNaN(this.buttonWidths_[i])) ir.width = this.buttonWidths_[i]; + else ir.width = useWidth; if (ir.element.style.display == 'none') ir.lastDisplay_ = 'inline-block'; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js index c9a2b9e..fa05b7c 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js @@ -143,10 +143,10 @@ org_apache_flex_html_beads_layouts_TileLayout. for (i = 0; i < n; i++) { var child = children[i].flexjs_wrapper; - child.set_width(useWidth); - child.set_height(useHeight); - child.set_x(xpos); - child.set_y(ypos); + child.width = useWidth; + child.height = useHeight; + child.x = xpos; + child.y = ypos; xpos += useWidth; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js index 38b707f..bca880d 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.js @@ -57,14 +57,14 @@ org_apache_flex_html_supportClasses_ButtonBarButtonItemRenderer. this.element.appendChild(this.button); this.element.flexjs_wrapper = this; - this.set_className('ButtonBarButtonItemRenderer'); + this.className = 'ButtonBarButtonItemRenderer'; // itemRenderers should provide something for the background to handle // the selection and highlight this.backgroundView = this.element; this.controller = new org_apache_flex_html_beads_controllers_ItemRendererMouseController(); - this.controller.set_strand(this); + this.controller.strand = this; return this.element; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js index d04d24d..0e4d912 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/DataItemRenderer.js @@ -56,14 +56,14 @@ org_apache_flex_html_supportClasses_DataItemRenderer. this.positioner = this.element; this.element.flexjs_wrapper = this; - this.set_className('DataItemRenderer'); + this.className = 'DataItemRenderer'; // itemRenderers should provide something for the background to handle // the selection and highlight this.backgroundView = this.element; this.controller = new org_apache_flex_html_beads_controllers_ItemRendererMouseController(); - this.controller.set_strand(this); + this.controller.strand = this; return this.element; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js index 07b29e3..970c693 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/NonVirtualDataGroup.js @@ -64,7 +64,7 @@ org_apache_flex_html_supportClasses_NonVirtualDataGroup. this.element.style.display = 'inline-block'; this.element.style.position = 'inherit'; this.element.flexjs_wrapper = this; - this.set_className('NonVirtualDataGroup'); + this.className = 'NonVirtualDataGroup'; this.positioner = this.element; @@ -82,8 +82,8 @@ org_apache_flex_html_supportClasses_NonVirtualDataGroup. var itemRenderer = org_apache_flex_utils_Language.as(value, org_apache_flex_html_supportClasses_DataItemRenderer); - itemRenderer.set_index(this.renderers.length); - itemRenderer.set_itemRendererParent(this); + itemRenderer.index = this.renderers.length; + itemRenderer.itemRendererParent = this; this.renderers.push(value); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js index cca3712..1d4a974 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js @@ -57,14 +57,14 @@ org_apache_flex_html_supportClasses_StringItemRenderer. this.positioner = this.element; this.element.flexjs_wrapper = this; - this.set_className('StringItemRenderer'); + this.className = 'StringItemRenderer'; // itemRenderers should provide something for the background to handle // the selection and highlight this.backgroundView = this.element; this.controller = new org_apache_flex_html_beads_controllers_ItemRendererMouseController(); - this.controller.set_strand(this); + this.controller.strand = this; return this.element; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js index 1e1f7e5..72dd41c 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js @@ -77,7 +77,7 @@ org_apache_flex_html5_ComboBox.prototype.selectChanged = var select; select = event.currentTarget; - this.set_selectedItem(select.value); + this.selectedItem = select.value; this.popup.parentNode.removeChild(this.popup); this.popup = null; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/jquery/ToggleTextButton.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/ToggleTextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/ToggleTextButton.js index 769768d..cb94fd3 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/ToggleTextButton.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/ToggleTextButton.js @@ -143,11 +143,11 @@ org_apache_flex_jquery_ToggleTextButton.prototype.set_selected = var className = this.className; if (value) { if (className.indexOf(this.SELECTED) == className.length - this.SELECTED.length) - this.set_className(className.substring(0, className.length - this.SELECTED.length)); + this.className = className.substring(0, className.length - this.SELECTED.length); } else { if (className.indexOf(this.SELECTED) == -1) - this.set_className(className + this.SELECTED); + this.className = className + this.SELECTED; } */ } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/maps/google/Map.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/maps/google/Map.js b/frameworks/js/FlexJS/src/org/apache/flex/maps/google/Map.js index b2f49db..eb99fc6 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/maps/google/Map.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/maps/google/Map.js @@ -70,7 +70,7 @@ org_apache_flex_maps_google_Map.prototype.createElement = this.addBead(model); this.element = document.createElement('div'); - this.set_className('Map'); + this.className = 'Map'; this.positioner = this.element; this.element.flexjs_wrapper = this; @@ -309,7 +309,7 @@ function(results, status) { this.markers.push(marker); } var model = this.model; - model.set_searchResults(this.searchResults); + model.searchResults = this.searchResults; } }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c7b2ef3/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js b/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js index dd51073..fe1eaaa 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js @@ -51,8 +51,8 @@ org_apache_flex_utils_UIUtils.center = var xpos = (rw - item.width) / 2; var ypos = (rh - item.height) / 2; - item.set_x(xpos); - item.set_y(ypos); + item.x = xpos; + item.y = ypos; };
