Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7036F10A36 for ; Thu, 12 Sep 2013 19:19:35 +0000 (UTC) Received: (qmail 72546 invoked by uid 500); 12 Sep 2013 18:54:38 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 72387 invoked by uid 500); 12 Sep 2013 18:54:36 -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 72106 invoked by uid 99); 12 Sep 2013 18:54:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Sep 2013 18:54:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7EFFB16339; Thu, 12 Sep 2013 18:54:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: erikdebruin@apache.org To: commits@flex.apache.org Message-Id: <33bd0c00bdf849c3baf4cb420c94193f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-sdk] [refs/heads/develop] - FLEX-33306 Fix issue with identical names for base class property and local variable - this caused the compiler to complain there was no 'pop' method on the base class property Date: Thu, 12 Sep 2013 18:54:30 +0000 (UTC) Updated Branches: refs/heads/develop abc21ee4e -> 27885880b FLEX-33306 Fix issue with identical names for base class property and local variable - this caused the compiler to complain there was no 'pop' method on the base class property Signed-off-by: Erik de Bruin Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/27885880 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/27885880 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/27885880 Branch: refs/heads/develop Commit: 27885880b80811025547370a09b7ee5768853dd3 Parents: abc21ee Author: Erik de Bruin Authored: Thu Sep 12 20:39:39 2013 +0200 Committer: Erik de Bruin Committed: Thu Sep 12 20:39:39 2013 +0200 ---------------------------------------------------------------------- frameworks/projects/mx/src/mx/controls/List.as | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/27885880/frameworks/projects/mx/src/mx/controls/List.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/controls/List.as b/frameworks/projects/mx/src/mx/controls/List.as index d60e407..cd5fcf3 100644 --- a/frameworks/projects/mx/src/mx/controls/List.as +++ b/frameworks/projects/mx/src/mx/controls/List.as @@ -1526,16 +1526,16 @@ public class List extends ListBase implements IIMESupport listContent.setChildIndex(DisplayObject(itemEditorInstance), listContent.numChildren - 1); item = listItems[actualRowIndex][actualColIndex]; - var rowInfo:ListRowInfo = rowInfo[actualRowIndex]; + var listRowInfo:ListRowInfo = rowInfo[actualRowIndex]; if (item && !rendererIsEditor) { var dx:Number = editorXOffset; var dy:Number = editorYOffset; var dw:Number = editorWidthOffset; var dh:Number = editorHeightOffset; - layoutEditor(item.x + dx, rowInfo.y + dy, + layoutEditor(item.x + dx, listRowInfo.y + dy, Math.min(item.width + dw, listContent.width - listContent.x - itemEditorInstance.x), - Math.min(rowInfo.height + dh, listContent.height - listContent.y - itemEditorInstance.y)); + Math.min(listRowInfo.height + dh, listContent.height - listContent.y - itemEditorInstance.y)); } }