Repository: flex-asjs Updated Branches: refs/heads/develop 85988f92f -> 861ca2b9a
Fixed jslint and jshint issues. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/861ca2b9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/861ca2b9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/861ca2b9 Branch: refs/heads/develop Commit: 861ca2b9a361d8b00ee2487bc71c49d907430d14 Parents: 85988f9 Author: Peter Ent <[email protected]> Authored: Tue Oct 21 11:45:20 2014 -0400 Committer: Peter Ent <[email protected]> Committed: Tue Oct 21 11:45:20 2014 -0400 ---------------------------------------------------------------------- .../FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js | 11 +++++++---- .../src/org/apache/flex/core/graphics/GraphicShape.js | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/861ca2b9/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js index cfe550d..9813730 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js @@ -67,20 +67,23 @@ org.apache.flex.core.SimpleStatesImpl.prototype.set_strand = if (this.strand_.addEventListener) { this.strand_.addEventListener('currentStateChanged', goog.bind(this.stateChangeHandler_, this)); - this.strand_.addEventListener('initComplete', - goog.bind(this.initialStateHandler_, this)); + this.strand_.addEventListener('initComplete', + goog.bind(this.initialStateHandler_, this)); } } }; + /** * @private * @param {Object} event The event. */ org.apache.flex.core.SimpleStatesImpl.prototype.initialStateHandler_ = function(event) { - this.dispatchEvent(new org.apache.flex.events.ValueChangeEvent('currentStateChanged', null, this.strand_.get_currentState())); -}; + this.dispatchEvent(new org.apache.flex.events.ValueChangeEvent('currentStateChanged', null, + this.strand_.get_currentState())); + }; + /** * @private http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/861ca2b9/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js index 3d09161..6e0f9de 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js @@ -124,6 +124,8 @@ org.apache.flex.core.graphics.GraphicShape.prototype.set_stroke = function(value org.apache.flex.core.graphics.GraphicShape.prototype.addedToParent = function() { this.draw(); var bbox = this.element.getBBox(); + if (bbox.width === 0 && !isNaN(this.get_width())) bbox.width = this.get_width(); + if (bbox.height === 0 && !isNaN(this.get_height())) bbox.height = this.get_height(); this.resize(this.get_x(), this.get_y(), bbox); };
