Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A516E200C6F for ; Tue, 25 Apr 2017 05:58:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9B4D3160BA5; Tue, 25 Apr 2017 03:58:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E23ED160B99 for ; Tue, 25 Apr 2017 05:58:51 +0200 (CEST) Received: (qmail 79112 invoked by uid 500); 25 Apr 2017 03:58:50 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 79101 invoked by uid 99); 25 Apr 2017 03:58:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2017 03:58:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C9DFDFFAB; Tue, 25 Apr 2017 03:58:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Message-Id: <34383d91895e4eaf8f9b2e819d184ad7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-asjs] [refs/heads/dual] - sync up a change to UIHTMLWrapper Date: Tue, 25 Apr 2017 03:58:50 +0000 (UTC) archived-at: Tue, 25 Apr 2017 03:58:52 -0000 Repository: flex-asjs Updated Branches: refs/heads/dual 086505252 -> 8d8ba2f25 sync up a change to UIHTMLWrapper Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8d8ba2f2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8d8ba2f2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8d8ba2f2 Branch: refs/heads/dual Commit: 8d8ba2f256ee6b4287d6b455ac654457f8b976d9 Parents: 0865052 Author: Alex Harui Authored: Mon Apr 24 20:58:42 2017 -0700 Committer: Alex Harui Committed: Mon Apr 24 20:58:42 2017 -0700 ---------------------------------------------------------------------- .../src/main/flex/org/apache/flex/core/HTMLElementWrapper.as | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8d8ba2f2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as index 6ba908d..d67686e 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as @@ -108,7 +108,7 @@ package org.apache.flex.core /** * allow access from overrides */ - protected var _model:IBeadModel; + protected var _model:Object; /** * @flexjsignorecoercion Class @@ -127,11 +127,15 @@ package org.apache.flex.core return _model; } + [Bindable("modelChanged")] public function set model(value:Object):void { if (_model != value) { - addBead(value as IBead); + if (value is IBead) + addBead(value as IBead); + else + _model = value; dispatchEvent(new org.apache.flex.events.Event("modelChanged")); } }