You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/08/08 19:31:56 UTC
[2/2] git commit: [flex-asjs] [refs/heads/develop] - fix
TextPromptBead in JS
fix TextPromptBead in 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/55cd7ee0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/55cd7ee0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/55cd7ee0
Branch: refs/heads/develop
Commit: 55cd7ee06f9c9caa7f4562f649a40669fbc7555b
Parents: 44b65a1
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 8 10:31:30 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 8 10:31:44 2013 -0700
----------------------------------------------------------------------
.../FlexJS/src/org/apache/flex/core/UIBase.js | 2 +-
.../html/staticControls/beads/TextPromptBead.js | 32 +++++++++++++++++---
2 files changed, 29 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/55cd7ee0/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 f8e212d..acfc314 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js
@@ -130,7 +130,7 @@ org.apache.flex.core.UIBase.prototype.addBead = function(bead) {
this.beads_ = new Array();
}
this.beads_.push(bead);
- bead.strand = this;
+ bead.set_strand(this);
};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/55cd7ee0/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextPromptBead.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextPromptBead.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextPromptBead.js
index ea695d8..fb1b65b 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextPromptBead.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextPromptBead.js
@@ -20,7 +20,32 @@ goog.provide('org.apache.flex.html.staticControls.beads.TextPromptBead');
* @constructor
*/
org.apache.flex.html.staticControls.beads.TextPromptBead = function() {
-
+
+ /**
+ * @private
+ * @type {Object}
+ */
+ this.promptElement;
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.beads.TextPromptBead}
+ * @return {string} value The new prompt.
+ */
+org.apache.flex.html.staticControls.beads.TextPromptBead.prototype.get_prompt =
+ function() {
+ return this.prompt;
+};
+
+/**
+ * @expose
+ * @this {org.apache.flex.html.staticControls.beads.TextPromptBead}
+ * @param {string} value The new prompt.
+ */
+org.apache.flex.html.staticControls.beads.TextPromptBead.prototype.set_prompt =
+ function(value) {
+ this.prompt = value;
};
/**
@@ -32,7 +57,6 @@ org.apache.flex.html.staticControls.beads.TextPromptBead.prototype.set_strand =
function(value) {
if (this.strand_ !== value) {
this.strand_ = value;
- //this.strand_.addEventListener('childrenAdded',
- // goog.bind(this.changeHandler, this));
+ value.element.placeholder = this.prompt;
}
-};
\ No newline at end of file
+};