more sed removal of staticControls
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9fecc957 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9fecc957 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9fecc957 Branch: refs/heads/develop Commit: 9fecc9579646741ce2fda007513794dba2ba0380 Parents: 15b80b8 Author: Alex Harui <[email protected]> Authored: Tue Mar 25 11:33:20 2014 -0700 Committer: Alex Harui <[email protected]> Committed: Tue Mar 25 11:33:20 2014 -0700 ---------------------------------------------------------------------- .../src/org/apache/flex/createjs/Application.as | 2 +- .../src/org/apache/flex/createjs/CheckBox.as | 4 +- .../src/org/apache/flex/createjs/Label.as | 4 +- .../src/org/apache/flex/createjs/TextButton.as | 4 +- .../src/org/apache/flex/createjs/core/UIBase.as | 2 +- .../org/apache/flex/createjs/core/ViewBase.as | 2 +- .../src/org/apache/flex/jquery/Application.as | 2 +- .../src/org/apache/flex/jquery/CheckBox.as | 4 +- .../src/org/apache/flex/jquery/RadioButton.as | 4 +- .../src/org/apache/flex/jquery/TextButton.as | 4 +- .../src/org/apache/flex/svg/TextButton.as | 4 +- .../src/org/apache/flex/createjs/CheckBox.js | 24 +++++----- .../src/org/apache/flex/createjs/Label.js | 12 ++--- .../src/org/apache/flex/createjs/TextButton.js | 16 +++---- .../src/org/apache/flex/jquery/CheckBox.js | 16 +++---- .../src/org/apache/flex/jquery/RadioButton.js | 48 ++++++++++---------- .../src/org/apache/flex/jquery/TextButton.js | 12 ++--- .../src/org/apache/flex/svg/TextButton.js | 18 ++++---- 18 files changed, 91 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as index dd3ed37..fd78f89 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Application.as @@ -137,4 +137,4 @@ package org.apache.flex.createjs addChild(c as DisplayObject); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as index b4dc469..2a36d05 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as @@ -16,11 +16,11 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.createjs.staticControls +package org.apache.flex.createjs { import org.apache.flex.html.staticControls.CheckBox; public class CheckBox extends org.apache.flex.html.staticControls.CheckBox { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as index fb8fb7e..099c5b0 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as @@ -16,7 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.createjs.staticControls +package org.apache.flex.createjs { import org.apache.flex.html.staticControls.Label; @@ -24,4 +24,4 @@ package org.apache.flex.createjs.staticControls { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as index 3ad2e66..6f4dc74 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as @@ -16,7 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.createjs.staticControls +package org.apache.flex.createjs { import org.apache.flex.core.ITextModel; import org.apache.flex.html.staticControls.Button; @@ -47,4 +47,4 @@ package org.apache.flex.createjs.staticControls } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as index d0761a0..dcb1e7c 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/UIBase.as @@ -138,4 +138,4 @@ package org.apache.flex.createjs.core } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as index 40c1e14..120d22e 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as @@ -87,4 +87,4 @@ package org.apache.flex.createjs.core } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as index e2a3113..88e21b3 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/Application.as @@ -28,4 +28,4 @@ package org.apache.flex.jquery super(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as index a2f3a01..83ca32a 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as @@ -16,11 +16,11 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.jquery.staticControls +package org.apache.flex.jquery { import org.apache.flex.html.staticControls.CheckBox; public class CheckBox extends org.apache.flex.html.staticControls.CheckBox { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as index a94739a..6fc0c8f 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as @@ -16,11 +16,11 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.jquery.staticControls +package org.apache.flex.jquery { import org.apache.flex.html.staticControls.RadioButton; public class RadioButton extends org.apache.flex.html.staticControls.RadioButton { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as index fb78c83..9528f66 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as @@ -16,7 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.jquery.staticControls +package org.apache.flex.jquery { import org.apache.flex.html.staticControls.TextButton; @@ -27,4 +27,4 @@ package org.apache.flex.jquery.staticControls super(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as index bb278bf..ae8af52 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as @@ -16,7 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.svg.staticControls +package org.apache.flex.svg { import org.apache.flex.html.staticControls.TextButton; @@ -27,4 +27,4 @@ package org.apache.flex.svg.staticControls super(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/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 f342f1d..284ff7b 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js @@ -12,7 +12,7 @@ * limitations under the License. */ -goog.provide('org.apache.flex.createjs.staticControls.CheckBox'); +goog.provide('org.apache.flex.createjs.CheckBox'); goog.require('org.apache.flex.createjs.core.UIBase'); @@ -22,10 +22,10 @@ goog.require('org.apache.flex.createjs.core.UIBase'); * @constructor * @extends {org.apache.flex.createjs.core.UIBase} */ -org.apache.flex.createjs.staticControls.CheckBox = function() { +org.apache.flex.createjs.CheckBox = function() { goog.base(this); }; -goog.inherits(org.apache.flex.createjs.staticControls.CheckBox, +goog.inherits(org.apache.flex.createjs.CheckBox, org.apache.flex.createjs.core.UIBase); @@ -33,14 +33,14 @@ goog.inherits(org.apache.flex.createjs.staticControls.CheckBox, * @expose * @type {Object} */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMark = null; +org.apache.flex.createjs.CheckBox.prototype.checkMark = null; /** * @expose * @type {Object} */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMarkBackground = +org.apache.flex.createjs.CheckBox.prototype.checkMarkBackground = null; @@ -48,13 +48,13 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.checkMarkBackground = * @expose * @type {Object} */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.checkBoxLabel = null; +org.apache.flex.createjs.CheckBox.prototype.checkBoxLabel = null; /** * @override */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.createElement = +org.apache.flex.createjs.CheckBox.prototype.createElement = function() { this.checkMarkBackground = new createjs.Shape(); this.checkMarkBackground.name = 'checkmarkbackground'; @@ -97,7 +97,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.createElement = * @expose * @return {string} The text getter. */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.get_text = +org.apache.flex.createjs.CheckBox.prototype.get_text = function() { return this.checkBoxLabel.text; }; @@ -107,7 +107,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.get_text = * @expose * @param {string} value The text setter. */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.set_text = +org.apache.flex.createjs.CheckBox.prototype.set_text = function(value) { this.checkBoxLabel.text = value; }; @@ -117,7 +117,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.set_text = * @expose * @return {bool} The selected getter. */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.get_selected = +org.apache.flex.createjs.CheckBox.prototype.get_selected = function() { return this.selected; }; @@ -127,7 +127,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.get_selected = * @expose * @param {bool} value The selected setter. */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.set_selected = +org.apache.flex.createjs.CheckBox.prototype.set_selected = function(value) { this.checkMark.visible = this.selected = value; this.element.getStage().update(); @@ -138,7 +138,7 @@ org.apache.flex.createjs.staticControls.CheckBox.prototype.set_selected = * @expose * @param {string|Object|goog.events.Event} event The event. */ -org.apache.flex.createjs.staticControls.CheckBox.prototype.clickHandler = +org.apache.flex.createjs.CheckBox.prototype.clickHandler = function(event) { this.set_selected(!this.get_selected()); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js index c6b5243..d97b38e 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/Label.js @@ -12,7 +12,7 @@ * limitations under the License. */ -goog.provide('org.apache.flex.createjs.staticControls.Label'); +goog.provide('org.apache.flex.createjs.Label'); goog.require('org.apache.flex.createjs.core.UIBase'); @@ -22,17 +22,17 @@ goog.require('org.apache.flex.createjs.core.UIBase'); * @constructor * @extends {org.apache.flex.createjs.core.UIBase} */ -org.apache.flex.createjs.staticControls.Label = function() { +org.apache.flex.createjs.Label = function() { org.apache.flex.createjs.core.UIBase.call(this); }; -goog.inherits(org.apache.flex.createjs.staticControls.Label, +goog.inherits(org.apache.flex.createjs.Label, org.apache.flex.createjs.core.UIBase); /** * @override */ -org.apache.flex.createjs.staticControls.Label.prototype.createElement = +org.apache.flex.createjs.Label.prototype.createElement = function(p) { goog.base(this, 'createElement'); @@ -51,7 +51,7 @@ org.apache.flex.createjs.staticControls.Label.prototype.createElement = * @expose * @return {string} The text getter. */ -org.apache.flex.createjs.staticControls.Label.prototype.get_text = function() { +org.apache.flex.createjs.Label.prototype.get_text = function() { return this.element.text; }; @@ -60,7 +60,7 @@ org.apache.flex.createjs.staticControls.Label.prototype.get_text = function() { * @expose * @param {string} value The text setter. */ -org.apache.flex.createjs.staticControls.Label.prototype.set_text = +org.apache.flex.createjs.Label.prototype.set_text = function(value) { this.element.text = value; this.element.getStage().update(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js index 147b6f9..5ac4f21 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/TextButton.js @@ -12,7 +12,7 @@ * limitations under the License. */ -goog.provide('org.apache.flex.createjs.staticControls.TextButton'); +goog.provide('org.apache.flex.createjs.TextButton'); goog.require('org.apache.flex.createjs.core.UIBase'); @@ -22,10 +22,10 @@ goog.require('org.apache.flex.createjs.core.UIBase'); * @constructor * @extends {org.apache.flex.createjs.core.UIBase} */ -org.apache.flex.createjs.staticControls.TextButton = function() { +org.apache.flex.createjs.TextButton = function() { org.apache.flex.createjs.core.UIBase.call(this); }; -goog.inherits(org.apache.flex.createjs.staticControls.TextButton, +goog.inherits(org.apache.flex.createjs.TextButton, org.apache.flex.createjs.core.UIBase); @@ -33,21 +33,21 @@ goog.inherits(org.apache.flex.createjs.staticControls.TextButton, * @expose * @type {Object} */ -org.apache.flex.createjs.staticControls.TextButton.prototype.buttonLabel = null; +org.apache.flex.createjs.TextButton.prototype.buttonLabel = null; /** * @expose * @type {Object} */ -org.apache.flex.createjs.staticControls.TextButton.prototype.buttonBackground = +org.apache.flex.createjs.TextButton.prototype.buttonBackground = null; /** * @override */ -org.apache.flex.createjs.staticControls.TextButton.prototype.createElement = +org.apache.flex.createjs.TextButton.prototype.createElement = function(p) { this.buttonBackground = new createjs.Shape(); @@ -79,7 +79,7 @@ org.apache.flex.createjs.staticControls.TextButton.prototype.createElement = * @expose * @return {string} The text getter. */ -org.apache.flex.createjs.staticControls.TextButton.prototype.get_text = +org.apache.flex.createjs.TextButton.prototype.get_text = function() { return this.buttonLabel.text; }; @@ -89,7 +89,7 @@ org.apache.flex.createjs.staticControls.TextButton.prototype.get_text = * @expose * @param {string} value The text setter. */ -org.apache.flex.createjs.staticControls.TextButton.prototype.set_text = +org.apache.flex.createjs.TextButton.prototype.set_text = function(value) { this.buttonLabel.text = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js index 0d54eee..ba28a73 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/CheckBox.js @@ -12,7 +12,7 @@ * limitations under the License. */ -goog.provide('org.apache.flex.jquery.staticControls.CheckBox'); +goog.provide('org.apache.flex.jquery.CheckBox'); goog.require('org.apache.flex.core.UIBase'); @@ -22,18 +22,18 @@ goog.require('org.apache.flex.core.UIBase'); * @constructor * @extends {org.apache.flex.core.UIBase} */ -org.apache.flex.jquery.staticControls.CheckBox = function() { +org.apache.flex.jquery.CheckBox = function() { goog.base(this); }; -goog.inherits(org.apache.flex.jquery.staticControls.CheckBox, +goog.inherits(org.apache.flex.jquery.CheckBox, org.apache.flex.core.UIBase); /** * @override */ -org.apache.flex.jquery.staticControls.CheckBox.prototype.createElement = +org.apache.flex.jquery.CheckBox.prototype.createElement = function() { var cb, d, lb; @@ -61,7 +61,7 @@ org.apache.flex.jquery.staticControls.CheckBox.prototype.createElement = * @expose * @return {string} The text getter. */ -org.apache.flex.jquery.staticControls.CheckBox.prototype.get_text = function() { +org.apache.flex.jquery.CheckBox.prototype.get_text = function() { return this.element.childNodes.item(1).value; }; @@ -70,7 +70,7 @@ org.apache.flex.jquery.staticControls.CheckBox.prototype.get_text = function() { * @expose * @param {string} value The text setter. */ -org.apache.flex.jquery.staticControls.CheckBox.prototype.set_text = +org.apache.flex.jquery.CheckBox.prototype.set_text = function(value) { this.element.childNodes.item(1).appendChild(document.createTextNode(value)); }; @@ -80,7 +80,7 @@ org.apache.flex.jquery.staticControls.CheckBox.prototype.set_text = * @expose * @return {bool} The selected getter. */ -org.apache.flex.jquery.staticControls.CheckBox.prototype.get_selected = +org.apache.flex.jquery.CheckBox.prototype.get_selected = function() { return this.element.childNodes.item(0).checked; }; @@ -90,7 +90,7 @@ org.apache.flex.jquery.staticControls.CheckBox.prototype.get_selected = * @expose * @param {bool} value The selected setter. */ -org.apache.flex.jquery.staticControls.CheckBox.prototype.set_selected = +org.apache.flex.jquery.CheckBox.prototype.set_selected = function(value) { this.element.childNodes.item(0).checked = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js index e0d8c29..89b6d77 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/RadioButton.js @@ -12,7 +12,7 @@ * limitations under the License. */ -goog.provide('org.apache.flex.jquery.staticControls.RadioButton'); +goog.provide('org.apache.flex.jquery.RadioButton'); goog.require('org.apache.flex.core.UIBase'); @@ -22,14 +22,14 @@ goog.require('org.apache.flex.core.UIBase'); * @constructor * @extends {org.apache.flex.core.UIBase} */ -org.apache.flex.jquery.staticControls.RadioButton = function() { +org.apache.flex.jquery.RadioButton = function() { goog.base(this); org.apache.flex.core.UIBase.call(this); - org.apache.flex.jquery.staticControls.RadioButton.radioCounter++; + org.apache.flex.jquery.RadioButton.radioCounter++; }; -goog.inherits(org.apache.flex.jquery.staticControls.RadioButton, +goog.inherits(org.apache.flex.jquery.RadioButton, org.apache.flex.core.UIBase); @@ -37,40 +37,40 @@ goog.inherits(org.apache.flex.jquery.staticControls.RadioButton, * @expose * The name of the radioGroup. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.radioGroupName = null; +org.apache.flex.jquery.RadioButton.prototype.radioGroupName = null; /** * @expose * Used to provide ids to the radio buttons. */ -org.apache.flex.jquery.staticControls.RadioButton.radioCounter = 0; +org.apache.flex.jquery.RadioButton.radioCounter = 0; /** * @expose * Used to manage groups on the radio buttons. */ -org.apache.flex.jquery.staticControls.RadioButton.groups = { }; +org.apache.flex.jquery.RadioButton.groups = { }; /** * Flag to make sure the event handler is set only once. */ -org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet = false; +org.apache.flex.jquery.RadioButton.groupHandlerSet = false; /** * @override */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.createElement = +org.apache.flex.jquery.RadioButton.prototype.createElement = function() { var input = document.createElement('input'); input.type = 'radio'; input.name = 'radio'; input.id = 'radio' + - org.apache.flex.jquery.staticControls.RadioButton.radioCounter; + org.apache.flex.jquery.RadioButton.radioCounter; var label = document.createElement('label'); label.htmlFor = input.id; @@ -87,11 +87,11 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.createElement = * @override * @param {Object} doc the document for this item. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.setDocument = +org.apache.flex.jquery.RadioButton.prototype.setDocument = function(doc, id) { - if (!org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet) + if (!org.apache.flex.jquery.RadioButton.groupHandlerSet) { - org.apache.flex.jquery.staticControls.RadioButton.groupHandlerSet = + org.apache.flex.jquery.RadioButton.groupHandlerSet = true; doc.addEventListener('initComplete', goog.bind(this.initHandler, this)); @@ -102,9 +102,9 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.setDocument = /** * @param {Event} event The event. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.initHandler = +org.apache.flex.jquery.RadioButton.prototype.initHandler = function(event) { - var divtags = org.apache.flex.jquery.staticControls.RadioButton.groups; + var divtags = org.apache.flex.jquery.RadioButton.groups; for (var name in divtags) { var div = divtags[name]; @@ -117,7 +117,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.initHandler = * @expose * @return {string} The groupName getter. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.get_groupName = +org.apache.flex.jquery.RadioButton.prototype.get_groupName = function() { return this.radioGroupName; }; @@ -127,7 +127,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.get_groupName = * @expose * @param {string} value The groupName setter. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName = +org.apache.flex.jquery.RadioButton.prototype.set_groupName = function(value) { /* @@ -146,8 +146,8 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName = var div; - if (org.apache.flex.jquery.staticControls.RadioButton.groups[value]) { - div = org.apache.flex.jquery.staticControls.RadioButton.groups[value]; + if (org.apache.flex.jquery.RadioButton.groups[value]) { + div = org.apache.flex.jquery.RadioButton.groups[value]; div.appendChild(this.element); div.appendChild(this.labelFor); } @@ -157,7 +157,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName = div.appendChild(this.element); div.appendChild(this.labelFor); - org.apache.flex.jquery.staticControls. + org.apache.flex.jquery. RadioButton.groups[String(value)] = div; } @@ -169,7 +169,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.set_groupName = * @expose * @return {string} The text getter. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.get_text = +org.apache.flex.jquery.RadioButton.prototype.get_text = function() { return this.labelFor.innerHTML; }; @@ -179,7 +179,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.get_text = * @expose * @param {string} value The text setter. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.set_text = +org.apache.flex.jquery.RadioButton.prototype.set_text = function(value) { this.labelFor.innerHTML = value; }; @@ -189,7 +189,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.set_text = * @expose * @return {bool} The selected getter. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.get_selected = +org.apache.flex.jquery.RadioButton.prototype.get_selected = function() { return this.element.checked; }; @@ -199,7 +199,7 @@ org.apache.flex.jquery.staticControls.RadioButton.prototype.get_selected = * @expose * @param {bool} value The selected setter. */ -org.apache.flex.jquery.staticControls.RadioButton.prototype.set_selected = +org.apache.flex.jquery.RadioButton.prototype.set_selected = function(value) { this.element.checked = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js index 6e98f82..2518062 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/jquery/TextButton.js @@ -12,7 +12,7 @@ * limitations under the License. */ -goog.provide('org.apache.flex.jquery.staticControls.TextButton'); +goog.provide('org.apache.flex.jquery.TextButton'); goog.require('org.apache.flex.core.UIBase'); @@ -22,17 +22,17 @@ goog.require('org.apache.flex.core.UIBase'); * @constructor * @extends {org.apache.flex.core.UIBase} */ -org.apache.flex.jquery.staticControls.TextButton = function() { +org.apache.flex.jquery.TextButton = function() { goog.base(this); }; -goog.inherits(org.apache.flex.jquery.staticControls.TextButton, +goog.inherits(org.apache.flex.jquery.TextButton, org.apache.flex.core.UIBase); /** * @override */ -org.apache.flex.jquery.staticControls.TextButton.prototype.createElement = +org.apache.flex.jquery.TextButton.prototype.createElement = function() { this.element = document.createElement('button'); this.element.setAttribute('type', 'button'); @@ -47,7 +47,7 @@ org.apache.flex.jquery.staticControls.TextButton.prototype.createElement = * @expose * @return {string} The text getter. */ -org.apache.flex.jquery.staticControls.TextButton.prototype.get_text = +org.apache.flex.jquery.TextButton.prototype.get_text = function() { return this.element.innerHTML; }; @@ -57,7 +57,7 @@ org.apache.flex.jquery.staticControls.TextButton.prototype.get_text = * @expose * @param {string} value The text setter. */ -org.apache.flex.jquery.staticControls.TextButton.prototype.set_text = +org.apache.flex.jquery.TextButton.prototype.set_text = function(value) { this.element.innerHTML = value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fecc957/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js index 04325ef..d43edd9 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js @@ -12,7 +12,7 @@ * limitations under the License. */ -goog.provide('org.apache.flex.svg.staticControls.TextButton'); +goog.provide('org.apache.flex.svg.TextButton'); goog.require('org.apache.flex.core.UIBase'); @@ -22,10 +22,10 @@ goog.require('org.apache.flex.core.UIBase'); * @constructor * @extends {org.apache.flex.core.UIBase} */ -org.apache.flex.svg.staticControls.TextButton = function() { +org.apache.flex.svg.TextButton = function() { goog.base(this); }; -goog.inherits(org.apache.flex.svg.staticControls.TextButton, +goog.inherits(org.apache.flex.svg.TextButton, org.apache.flex.core.UIBase); @@ -34,15 +34,15 @@ goog.inherits(org.apache.flex.svg.staticControls.TextButton, * * @type {Object.<string, Array.<Object>>} */ -org.apache.flex.svg.staticControls.TextButton.prototype.FLEXJS_CLASS_INFO = +org.apache.flex.svg.TextButton.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'TextButton', - qName: 'org.apache.flex.svg.staticControls.TextButton'}] }; + qName: 'org.apache.flex.svg.TextButton'}] }; /** * @override */ -org.apache.flex.svg.staticControls.TextButton.prototype.createElement = +org.apache.flex.svg.TextButton.prototype.createElement = function() { this.element = document.createElement('embed'); this.element.setAttribute('src', 'org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg'); @@ -56,7 +56,7 @@ org.apache.flex.svg.staticControls.TextButton.prototype.createElement = /** * @override */ -org.apache.flex.svg.staticControls.TextButton.prototype.finalizeElement = +org.apache.flex.svg.TextButton.prototype.finalizeElement = function() { var listenersArray; if (goog.events.hasListener(this.element, goog.events.EventType.CLICK)) { @@ -78,7 +78,7 @@ org.apache.flex.svg.staticControls.TextButton.prototype.finalizeElement = * @expose * @return {string} The text getter. */ -org.apache.flex.svg.staticControls.TextButton.prototype.get_text = +org.apache.flex.svg.TextButton.prototype.get_text = function() { return this.element.getAttribute('label'); }; @@ -88,7 +88,7 @@ org.apache.flex.svg.staticControls.TextButton.prototype.get_text = * @expose * @param {string} value The text setter. */ -org.apache.flex.svg.staticControls.TextButton.prototype.set_text = +org.apache.flex.svg.TextButton.prototype.set_text = function(value) { this.element.setAttribute('label', value); };
