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 8B9D6200CF9 for ; Sun, 17 Sep 2017 14:11:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8A10D1609D8; Sun, 17 Sep 2017 12:11:17 +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 D051E1609BF for ; Sun, 17 Sep 2017 14:11:16 +0200 (CEST) Received: (qmail 66430 invoked by uid 500); 17 Sep 2017 12:11:15 -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 66418 invoked by uid 99); 17 Sep 2017 12:11:15 -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; Sun, 17 Sep 2017 12:11:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9024FE967F; Sun, 17 Sep 2017 12:11:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yishayw@apache.org To: commits@flex.apache.org Message-Id: <62a72035b64e461aab2c9b2188ec84a4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-asjs] [refs/heads/develop] - Make sure index and item are sychronized. Date: Sun, 17 Sep 2017 12:11:14 +0000 (UTC) archived-at: Sun, 17 Sep 2017 12:11:17 -0000 Repository: flex-asjs Updated Branches: refs/heads/develop 5109c4022 -> 814b90d7d Make sure index and item are sychronized. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/814b90d7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/814b90d7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/814b90d7 Branch: refs/heads/develop Commit: 814b90d7db56d50a2336dfbd61b5bc77ad18a464 Parents: 5109c40 Author: DESKTOP-RH4S838\Yishay Authored: Sun Sep 17 15:10:11 2017 +0300 Committer: DESKTOP-RH4S838\Yishay Committed: Sun Sep 17 15:10:11 2017 +0300 ---------------------------------------------------------------------- .../flex/html/beads/models/ArrayListSelectionModel.as | 6 ++++-- .../flex/html/beads/models/ArraySelectionModel.as | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/814b90d7/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as index d2a2b4b..950e350 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as @@ -87,9 +87,11 @@ package org.apache.flex.html.beads.models if (value == _dataProvider) return; _dataProvider = value as IArrayList; + if(!_dataProvider || _selectedIndex >= _dataProvider.length) + _selectedIndex = -1; if (_selectedIndex != -1) - _selectedItem = (_dataProvider == null || _selectedIndex >= _dataProvider.length) ? null : - _dataProvider.getItemAt(_selectedIndex); + _selectedItem = _dataProvider.getItemAt(_selectedIndex); + dispatchEvent(new Event("dataProviderChanged")); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/814b90d7/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as index 7059ada..9e3b806 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as @@ -85,12 +85,14 @@ package org.apache.flex.html.beads.models */ public function set dataProvider(value:Object):void { - if (value == _dataProvider) return; - - _dataProvider = value; - if (_selectedIndex != -1) - _selectedItem = (_dataProvider == null || _selectedIndex >= _dataProvider.length) ? null : - _dataProvider[_selectedIndex]; + if (value == _dataProvider) return; + + _dataProvider = value; + if(!_dataProvider || _selectedIndex >= _dataProvider.length) + _selectedIndex = -1; + if (_selectedIndex != -1) + _selectedItem = _dataProvider[_selectedIndex]; + dispatchEvent(new Event("dataProviderChanged")); }