Updated Branches: refs/heads/develop a1f8929b3 -> 426c2e1eb
Changed property name from "url" to "source" to be compatible with Flex and HTML. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/426c2e1e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/426c2e1e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/426c2e1e Branch: refs/heads/develop Commit: 426c2e1ebc17fc271b34aa856c2cfe6423240c4d Parents: a1f8929 Author: Peter Ent <p...@apache.org> Authored: Wed Sep 11 11:48:06 2013 -0400 Committer: Peter Ent <p...@apache.org> Committed: Wed Sep 11 11:48:06 2013 -0400 ---------------------------------------------------------------------- frameworks/as/src/org/apache/flex/core/IImageModel.as | 4 ++-- .../as/src/org/apache/flex/html/staticControls/Image.as | 8 ++++---- .../apache/flex/html/staticControls/beads/ImageView.as | 2 +- .../flex/html/staticControls/beads/models/ImageModel.as | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/426c2e1e/frameworks/as/src/org/apache/flex/core/IImageModel.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/core/IImageModel.as b/frameworks/as/src/org/apache/flex/core/IImageModel.as index 07dfd56..dc924eb 100644 --- a/frameworks/as/src/org/apache/flex/core/IImageModel.as +++ b/frameworks/as/src/org/apache/flex/core/IImageModel.as @@ -22,7 +22,7 @@ package org.apache.flex.core public interface IImageModel extends IEventDispatcher, IBeadModel { - function get url():String; - function set url(value:String):void; + function get source():String; + function set source(value:String):void; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/426c2e1e/frameworks/as/src/org/apache/flex/html/staticControls/Image.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/Image.as b/frameworks/as/src/org/apache/flex/html/staticControls/Image.as index 297e847..eebfe40 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/Image.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/Image.as @@ -28,14 +28,14 @@ package org.apache.flex.html.staticControls super(); } - public function get url():String + public function get source():String { - return IImageModel(model).url; + return IImageModel(model).source; } - public function set url(value:String):void + public function set source(value:String):void { - IImageModel(model).url = value; + IImageModel(model).source = value; } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/426c2e1e/frameworks/as/src/org/apache/flex/html/staticControls/beads/ImageView.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ImageView.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ImageView.as index 2fed3e6..bcb6044 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ImageView.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ImageView.as @@ -59,7 +59,7 @@ package org.apache.flex.html.staticControls.beads { loader = new Loader(); loader.contentLoaderInfo.addEventListener("complete",onComplete); - loader.load(new URLRequest(_model.url)); + loader.load(new URLRequest(_model.source)); } private function onComplete(event:Object):void http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/426c2e1e/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as index e5821f8..c6e3e80 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/models/ImageModel.as @@ -37,15 +37,15 @@ package org.apache.flex.html.staticControls.beads.models _strand = value; } - private var _url:String; - public function get url():String + private var _source:String; + public function get source():String { - return _url; + return _source; } - public function set url(value:String):void + public function set source(value:String):void { - if (value != _url) { - _url = value; + if (value != _source) { + _source = value; dispatchEvent( new Event("urlChanged") ); } }
