You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/10/08 16:03:55 UTC
[40/62] [abbrv] [partial] Merged Apache Flex 4.9.0 release branch
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/nl_NL/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/nl_NL/textLayout.properties b/frameworks/projects/spark/bundles/nl_NL/textLayout.properties
deleted file mode 100644
index b4b87da..0000000
--- a/frameworks/projects/spark/bundles/nl_NL/textLayout.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-################################################################################
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-################################################################################
-
-## Developer RTE Section
-
-missingStringResource=Geen tekenreeks voor resource {0}
-
-# Core errors
-
-invalidFlowElementConstruct=Poging tot samenstellen van ongeldige FlowElement-subklasse
-invalidSplitAtPosition=Ongeldige parameter naar splitAtPosition
-badMXMLChildrenArgument=Ongeldig element van type {0} doorgegeven aan mxmlChildren
-badReplaceChildrenIndex=Index naar FlowGroupElement.replaceChildren buiten bereik
-invalidChildType=NewElement niet van een type dat dit als bovenliggend element kan hebben
-badRemoveChild=Te verwijderen onderliggend element niet gevonden
-invalidSplitAtIndex=Ongeldige parameter naar splitAtIndex
-badShallowCopyRange=Ongeldig bereik in shallowCopy
-badSurrogatePairCopy=Alleen de helft van een vervangend paar in SpanElement.shallowCopy wordt gekopieerd
-invalidReplaceTextPositions=Ongeldige posities doorgegeven aan SpanElement.replaceText
-invalidSurrogatePairSplit=Ongeldige splitsing van een vervangend paar
-badPropertyValue=Waarde {1} van eigenschap {0} valt buiten bereik
-
-# Selection/editing
-
-illegalOperation=Ongeldige poging om {0}-bewerking uit te voeren
-
-# Shared import errors
-
-unexpectedXMLElementInSpan=Onverwacht element {0} binnen een span
-unexpectedNamespace=Onverwachte naamruimte {0}
-unknownElement=Onbekend element {0}
-unknownAttribute=Kenmerk {0] niet toegestaan in element {1}
-
-# TEXT_FIELD_HTML_FORMAT import errors
-
-malformedTag=Onjuist ingedeelde code {0}
-malformedMarkup=Onjuist ingedeelde markering {0}
-
-# TEXT_LAYOUT_FORMAT import errors
-
-missingTextFlow=Er is geen TextFlow om te parseren
-expectedExactlyOneTextLayoutFormat=Er werd slechts één, en niet meer dan één, TextLayoutFormat in {0} verwacht
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/pt_BR/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/pt_BR/textLayout.properties b/frameworks/projects/spark/bundles/pt_BR/textLayout.properties
deleted file mode 100644
index caa602d..0000000
--- a/frameworks/projects/spark/bundles/pt_BR/textLayout.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-################################################################################
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-################################################################################
-
-## Developer RTE Section
-
-missingStringResource=Nenhuma string para o recurso {0}
-
-# Core errors
-
-invalidFlowElementConstruct=Tentativa de construção de uma subclasse FlowElement inválida
-invalidSplitAtPosition=Parâmetro inválido para splitAtPosition
-badMXMLChildrenArgument=Elemento incorreto do tipo {0} passado para mxmlChildren
-badReplaceChildrenIndex=Índice fora de intervalo para FlowGroupElement.replaceChildren
-invalidChildType=NewElement não é de um tipo do qual este possa ser pai
-badRemoveChild=O filho a ser removido não foi encontrado
-invalidSplitAtIndex=Parâmetro inválido para splitAtIndex
-badShallowCopyRange=Intervalo incorreto em shallowCopy
-badSurrogatePairCopy=Copiando somente metade de um par substituto em SpanElement.shallowCopy
-invalidReplaceTextPositions=Posições inválidas passadas para SpanElement.replaceText
-invalidSurrogatePairSplit=Divisão inválida de um par substituto
-badPropertyValue=O valor {1) da propriedade {0} está fora de intervalo
-
-# Selection/editing
-
-illegalOperation=Tentativa ilegal de executar a operação {0}
-
-# Shared import errors
-
-unexpectedXMLElementInSpan=Elemento inesperado {0} dentro de uma expansão
-unexpectedNamespace=Namespace inesperado {0}
-unknownElement=Elemento desconhecido {0}
-unknownAttribute=Atributo {0} não permitido no elemento {1}
-
-# TEXT_FIELD_HTML_FORMAT import errors
-
-malformedTag=Marca mal formada {0}
-malformedMarkup=Marcação mal formada {0}
-
-# TEXT_LAYOUT_FORMAT import errors
-
-missingTextFlow=Nenhum TextFlow para analisar
-expectedExactlyOneTextLayoutFormat=Era esperado um e somente um TextLayoutFormat em {0}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/pt_PT/components.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/pt_PT/components.properties b/frameworks/projects/spark/bundles/pt_PT/components.properties
index d81d803..330b81b 100644
--- a/frameworks/projects/spark/bundles/pt_PT/components.properties
+++ b/frameworks/projects/spark/bundles/pt_PT/components.properties
@@ -1,11 +1,19 @@
################################################################################
##
-## ADOBE SYSTEMS INCORPORATED
-## Copyright 2006-2007 Adobe Systems Incorporated
-## All Rights Reserved.
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
##
-## NOTICE: Adobe permits you to use, modify, and distribute this file
-## in accordance with the terms of the license agreement accompanying it.
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
##
################################################################################
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/pt_PT/layout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/pt_PT/layout.properties b/frameworks/projects/spark/bundles/pt_PT/layout.properties
index 20a7e4a..f6c8f1a 100644
--- a/frameworks/projects/spark/bundles/pt_PT/layout.properties
+++ b/frameworks/projects/spark/bundles/pt_PT/layout.properties
@@ -1,11 +1,19 @@
################################################################################
##
-## ADOBE SYSTEMS INCORPORATED
-## Copyright 2006-2007 Adobe Systems Incorporated
-## All Rights Reserved.
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
##
-## NOTICE: Adobe permits you to use, modify, and distribute this file
-## in accordance with the terms of the license agreement accompanying it.
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
##
################################################################################
@@ -19,4 +27,4 @@ basicLayoutNotVirtualized=BasicLayout não suporta virtualização.
columnNotFound=A ConstraintColumn '[[0]]' não foi encontrada.
constraintLayoutNotVirtualized=O ConstraintLayout não suporta virtualização.
invalidBaselineOnRow=Valor de base inválido na linha [[0]]: '[[1]]'. Deve ser um Number ou estar na forma 'maxAscent:x'.
-rowNotFound=A ConstraintRow '[[0]]' não foi encontrada.
\ No newline at end of file
+rowNotFound=A ConstraintRow '[[0]]' não foi encontrada.
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/pt_PT/osmf.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/pt_PT/osmf.properties b/frameworks/projects/spark/bundles/pt_PT/osmf.properties
index 25ca7aa..48acb1a 100644
--- a/frameworks/projects/spark/bundles/pt_PT/osmf.properties
+++ b/frameworks/projects/spark/bundles/pt_PT/osmf.properties
@@ -1,11 +1,19 @@
################################################################################
##
-## ADOBE SYSTEMS INCORPORATED
-## Copyright 2009 Adobe Systems Incorporated
-## All Rights Reserved.
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
##
-## NOTICE: Adobe permits you to use, modify, and distribute this file
-## in accordance with the terms of the license agreement accompanying it.
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
##
################################################################################
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/pt_PT/sparkEffects.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/pt_PT/sparkEffects.properties b/frameworks/projects/spark/bundles/pt_PT/sparkEffects.properties
index 964bb57..3f7cd2f 100644
--- a/frameworks/projects/spark/bundles/pt_PT/sparkEffects.properties
+++ b/frameworks/projects/spark/bundles/pt_PT/sparkEffects.properties
@@ -1,11 +1,19 @@
################################################################################
##
-## ADOBE SYSTEMS INCORPORATED
-## Copyright 2006-2007 Adobe Systems Incorporated
-## All Rights Reserved.
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
##
-## NOTICE: Adobe permits you to use, modify, and distribute this file
-## in accordance with the terms of the license agreement accompanying it.
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
##
################################################################################
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/pt_PT/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/pt_PT/textLayout.properties b/frameworks/projects/spark/bundles/pt_PT/textLayout.properties
deleted file mode 100644
index 6fc5985..0000000
--- a/frameworks/projects/spark/bundles/pt_PT/textLayout.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-################################################################################
-##
-## ADOBE SYSTEMS INCORPORATED
-## Copyright 2009 Adobe Systems Incorporated
-## All Rights Reserved.
-##
-## NOTICE: Adobe permits you to use, modify, and distribute this file
-## in accordance with the terms of the license agreement accompanying it.
-##
-################################################################################
-
-## Developer RTE Section
-
-missingStringResource=Náo existe nenhuma string para o recurso [[0]]
-
-# Core errors
-
-invalidFlowElementConstruct=Tentativa inválida de construção da subclasse FlowElement
-invalidSplitAtPosition=Parâmetro inválido para splitAtPosition
-badMXMLChildrenArgument=Elemento do tipo [[0]] errado passsado ao mxmlChildren
-badReplaceChildrenIndex=Index para FlowGroupElement.replaceChildren está fora do alcance
-invalidChildType=NewElement não é de um tipo de que este possa ser pai
-badRemoveChild=Child para remover não encontrada
-invalidSplitAtIndex=Parâmetro inválido para splitAtIndex
-badShallowCopyRange=Intervalo errado em shallowCopy
-badSurrogatePairCopy=A copiar somente metade de um par substituto em SpanElement.shallowCopy
-invalidReplaceTextPositions=Posições inválidas passadas a SpanElement.replaceText
-invalidSurrogatePairSplit=Divisão inválida de um par subsituto
-badPropertyValue=Propriedade [[0]] valor [[1]] está for do alcance
-
-# Selection/editing
-
-illegalOperation=Tentativa ilegal de executar a operação [[0]]
-
-# Shared import errors
-
-unexpectedXMLElementInSpan=Elemento [[0]] inesperado dentro de um span
-unexpectedNamespace=Namespace [[0]] inesperado
-unknownElement=Elemento [[0]] desconhecido
-unknownAttribute=Atributo [[0]] não é permtido no elemento [[1]]
-
-# TEXT_FIELD_HTML_FORMAT import errors
-
-malformedTag=Tag [[0]] malformada
-malformedMarkup=Markup [[0]] malformado
-
-# TEXT_LAYOUT_FORMAT import errors
-
-missingTextFlow=Não existe nenhum TextFlow para analisar
-expectedExactlyOneTextLayoutFormat=Esperado um, e só um, TextLayoutFormat em [[0]]
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/ru_RU/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/ru_RU/textLayout.properties b/frameworks/projects/spark/bundles/ru_RU/textLayout.properties
deleted file mode 100644
index c699f32..0000000
--- a/frameworks/projects/spark/bundles/ru_RU/textLayout.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-################################################################################
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-################################################################################
-
-## Developer RTE Section
-
-missingStringResource=Отсутствует строка для ресурса {0}
-
-# Core errors
-
-invalidFlowElementConstruct=Выполнена попытка создания недопустимого подкласса FlowElement
-invalidSplitAtPosition=Недействительный параметр для splitAtPosition
-badMXMLChildrenArgument=Недопустимый элемент типа {0} передан в mxmlChildren
-badReplaceChildrenIndex=Индекс для FlowGroupElement.replaceChildren находится за пределами допустимого диапазона
-invalidChildType=NewElement не является возможным нижестоящим типом для данного элемента
-badRemoveChild=Не найден нижестоящий элемент для удаления
-invalidSplitAtIndex=Недействительный параметр для splitAtIndex
-badShallowCopyRange=Недопустимый диапазон в shallowCopy
-badSurrogatePairCopy=Выполняется копирование только половины суррогатной пары в SpanElement.shallowCopy
-invalidReplaceTextPositions=Недействительные позиции переданы в SpanElement.replaceText
-invalidSurrogatePairSplit=Недействительное разделение суррогатной пары
-badPropertyValue=Указанное для свойства {0} значение {1} находится за пределами допустимого диапазона
-
-# Selection/editing
-
-illegalOperation=Недопустимая попытка выполнения операции {0}
-
-# Shared import errors
-
-unexpectedXMLElementInSpan=Непредвиденный элемент {0} в диапазоне
-unexpectedNamespace=Непредвиденное пространство имен {0}
-unknownElement=Неизвестный элемент {0}
-unknownAttribute=Атрибут {0} не разрешен для элемента {1}
-
-# TEXT_FIELD_HTML_FORMAT import errors
-
-malformedTag=Недопустимый тег {0}
-malformedMarkup=Недопустимая разметка {0}
-
-# TEXT_LAYOUT_FORMAT import errors
-
-missingTextFlow=Отсутствует TextFlow для анализа
-expectedExactlyOneTextLayoutFormat=Ожидался только один TextLayoutFormat в {0}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/sv_SE/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/sv_SE/textLayout.properties b/frameworks/projects/spark/bundles/sv_SE/textLayout.properties
deleted file mode 100644
index 4e841aa..0000000
--- a/frameworks/projects/spark/bundles/sv_SE/textLayout.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-################################################################################
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-################################################################################
-
-## Developer RTE Section
-
-missingStringResource=Sträng saknas för resurs {0}
-
-# Core errors
-
-invalidFlowElementConstruct=Försök att konstruera ogiltig FlowElement-underklass
-invalidSplitAtPosition=Ogiltig parameter till splitAtPosition
-badMXMLChildrenArgument=Felaktigt element av typen {0} skickades till mxmlChildren
-badReplaceChildrenIndex=Index utanför intervallet: FlowGroupElement.replaceChildren
-invalidChildType=Typen som NewElement tillhör innebär att detta inte kan vara överordnat
-badRemoveChild=Underordnad som ska tas bort hittades inte
-invalidSplitAtIndex=Ogiltig parameter till splitAtIndex
-badShallowCopyRange=Felaktigt intervall i shallowCopy
-badSurrogatePairCopy=Endast hälften av surrogatparet i SpanElement.shallowCopy kopieras
-invalidReplaceTextPositions=Ogiltiga positioner skickades till SpanElement.replaceText
-invalidSurrogatePairSplit=Ogiltig delning av surrogatpar
-badPropertyValue=Egenskapen {0} och värde {1} är utanför intervallet
-
-# Selection/editing
-
-illegalOperation=Ogiltigt försök att köra åtgärden {0}
-
-# Shared import errors
-
-unexpectedXMLElementInSpan=Oväntat element {0} inom intervall
-unexpectedNamespace=Oväntat namnutrymme {0}
-unknownElement=Okänt element: {0}
-unknownAttribute=Attributet {0} är inte tillåtet i element {1}
-
-# TEXT_FIELD_HTML_FORMAT import errors
-
-malformedTag=Felaktig tagg {0}
-malformedMarkup=Felaktig markering {0}
-
-# TEXT_LAYOUT_FORMAT import errors
-
-missingTextFlow=Det finns inget TextFlow som kan tolkas
-expectedExactlyOneTextLayoutFormat=Endast en TextLayoutFormat förväntades i {0}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/zh_CN/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/zh_CN/textLayout.properties b/frameworks/projects/spark/bundles/zh_CN/textLayout.properties
deleted file mode 100644
index 5898d55..0000000
--- a/frameworks/projects/spark/bundles/zh_CN/textLayout.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-################################################################################
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-################################################################################
-
-## Developer RTE Section
-
-missingStringResource=资源 {0} 没有字符串
-
-# Core errors
-
-invalidFlowElementConstruct=尝试构造无效 FlowElement 子类
-invalidSplitAtPosition=splitAtPosition 的参数无效
-badMXMLChildrenArgument=传递给 mxmlChildren 的类型 {0} 的元素错误
-badReplaceChildrenIndex=FlowGroupElement.replaceChildren 的索引超出范围
-invalidChildType=NewElement 不属于此项可作为其父代的类型
-badRemoveChild=找不到要删除的子代
-invalidSplitAtIndex=splitAtIndex 的参数无效
-badShallowCopyRange=shallowCopy 的范围错误
-badSurrogatePairCopy=仅复制了 SpanElement.shallowCopy 中代理对的一半
-invalidReplaceTextPositions=传递给 SpanElement.replaceText 的位置无效
-invalidSurrogatePairSplit=分割代理对无效
-badPropertyValue=属性 {0} 值 {1} 超出范围
-
-# Selection/editing
-
-illegalOperation=尝试执行 {0} 操作非法
-
-# Shared import errors
-
-unexpectedXMLElementInSpan=跨距中有意外元素 {0}
-unexpectedNamespace=意外命名空间 {0}
-unknownElement=未知元素 {0}
-unknownAttribute=元素 {1} 中不允许有属性 {0}
-
-# TEXT_FIELD_HTML_FORMAT import errors
-
-malformedTag=标签 {0} 格式不正确
-malformedMarkup=标记 {0} 格式不正确
-
-# TEXT_LAYOUT_FORMAT import errors
-
-missingTextFlow=没有要分析的 TextFlow
-expectedExactlyOneTextLayoutFormat={0} 中应有且仅有一个 TextLayoutFormat
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/bundles/zh_TW/textLayout.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/bundles/zh_TW/textLayout.properties b/frameworks/projects/spark/bundles/zh_TW/textLayout.properties
deleted file mode 100644
index ed0fe19..0000000
--- a/frameworks/projects/spark/bundles/zh_TW/textLayout.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-################################################################################
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-################################################################################
-
-## Developer RTE Section
-
-missingStringResource=資源 {0} 沒有字串
-
-# Core errors
-
-invalidFlowElementConstruct=嘗試建構無效的 FlowElement 子類別
-invalidSplitAtPosition=splitAtPosition 的參數無效
-badMXMLChildrenArgument=傳遞到 mxmlChildren 的類型 {0} 的元素錯誤
-badReplaceChildrenIndex=FlowGroupElement.replaceChildren 索引超出範圍
-invalidChildType=NewElement 不屬於此項目可做為其父項的類型
-badRemoveChild=找不到要移除的子項
-invalidSplitAtIndex=splitAtIndex 的參數無效
-badShallowCopyRange=shallowCopy 的範圍錯誤
-badSurrogatePairCopy=SpanElement.shallowCopy 的替代配對只複製一半
-invalidReplaceTextPositions=傳遞到 SpanElement.replaceText 的位置無效
-invalidSurrogatePairSplit=替代配對分割無效
-badPropertyValue=屬性 {0} 值 {1} 超出範圍
-
-# Selection/editing
-
-illegalOperation=執行 {0} 作業的嘗試不合法
-
-# Shared import errors
-
-unexpectedXMLElementInSpan=跨距內有非預期的元素 {0}
-unexpectedNamespace=非預期的命名空間 {0}
-unknownElement=不明元素 {0}
-unknownAttribute=元素 {1} 中不允許有屬性 {0}
-
-# TEXT_FIELD_HTML_FORMAT import errors
-
-malformedTag=格式錯誤的標籤 {0}
-malformedMarkup=格式錯誤的標記 {0}
-
-# TEXT_LAYOUT_FORMAT import errors
-
-missingTextFlow=沒有 TextFlow 可剖析
-expectedExactlyOneTextLayoutFormat={0} 應該有一個且只有一個 TextLayoutFormat
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/compile-config.xml b/frameworks/projects/spark/compile-config.xml
new file mode 100644
index 0000000..e752fda
--- /dev/null
+++ b/frameworks/projects/spark/compile-config.xml
@@ -0,0 +1,86 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>true</accessible>
+
+ <external-library-path>
+ <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+ <path-element>../../libs/framework.swc</path-element>
+ <path-element>../../libs/mx/mx.swc</path-element>
+ <path-element>../../libs/osmf.swc</path-element>
+ <path-element>../../libs/textLayout.swc</path-element>
+ </external-library-path>
+
+ <keep-as3-metadata>
+ <name>SkinPart</name>
+ </keep-as3-metadata>
+
+ <mxml>
+ <minimum-supported-version>4.0.0</minimum-supported-version>
+ </mxml>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.adobe.com/flex/spark</uri>
+ <manifest>manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>src</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-classes>
+ <class>SparkClasses</class>
+ </include-classes>
+
+ <include-file>
+ <name>version.properties</name>
+ <path>../../version.properties</path>
+ </include-file>
+ <include-file>
+ <name>defaults.css</name>
+ <path>defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>assets/ErrorIndicator.png</name>
+ <path>assets/ErrorIndicator.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/RequiredIndicator.png</name>
+ <path>assets/RequiredIndicator.png</path>
+ </include-file>
+
+ <include-namespaces>
+ <uri>library://ns.adobe.com/flex/spark</uri>
+ </include-namespaces>
+
+ <resource-bundle-list>bundles.properties</resource-bundle-list>
+
+ <target-player>${playerglobal.version}</target-player>
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/accessibility/RichEditableTextAccImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/accessibility/RichEditableTextAccImpl.as b/frameworks/projects/spark/src/spark/accessibility/RichEditableTextAccImpl.as
index 8e62055..f44e0d3 100644
--- a/frameworks/projects/spark/src/spark/accessibility/RichEditableTextAccImpl.as
+++ b/frameworks/projects/spark/src/spark/accessibility/RichEditableTextAccImpl.as
@@ -24,10 +24,12 @@ import flash.accessibility.Accessibility;
import flash.events.Event;
import flash.events.FocusEvent;
-import mx.accessibility.AccImpl;
import mx.accessibility.AccConst;
+import mx.accessibility.AccImpl;
import mx.core.UIComponent;
import mx.core.mx_internal;
+import mx.utils.StringUtil;
+
import spark.components.RichEditableText;
use namespace mx_internal;
@@ -313,7 +315,12 @@ public class RichEditableTextAccImpl extends AccImpl
*/
override public function get_accValue(childID:uint):String
{
- return RichEditableText(master).text;
+ var richEditableText:RichEditableText = RichEditableText(master);
+ if (richEditableText.displayAsPassword)
+ {
+ return StringUtil.repeat("*", richEditableText.text.length);
+ }
+ return richEditableText.text;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Application.as b/frameworks/projects/spark/src/spark/components/Application.as
index d94b042..740c3f0 100644
--- a/frameworks/projects/spark/src/spark/components/Application.as
+++ b/frameworks/projects/spark/src/spark/components/Application.as
@@ -1825,6 +1825,10 @@ public class Application extends SkinnableContainer
*/
private function softKeyboardActivateHandler(event:SoftKeyboardEvent):void
{
+ // Add a listener for the softKeyboard deactivate event to the event target
+ event.target.addEventListener(SoftKeyboardEvent.SOFT_KEYBOARD_DEACTIVATE,
+ softKeyboardDeactivateHandler);
+
if (this === FlexGlobals.topLevelApplication)
{
if (softKeyboardTarget && softKeyboardTarget != event.target)
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/ComboBox.as b/frameworks/projects/spark/src/spark/components/ComboBox.as
index ff0dd65..a37f52a 100644
--- a/frameworks/projects/spark/src/spark/components/ComboBox.as
+++ b/frameworks/projects/spark/src/spark/components/ComboBox.as
@@ -29,6 +29,7 @@ import flash.events.KeyboardEvent;
import flash.events.MouseEvent;
import flash.ui.Keyboard;
+import flashx.textLayout.operations.CompositeOperation;
import flashx.textLayout.operations.CutOperation;
import flashx.textLayout.operations.DeleteTextOperation;
import flashx.textLayout.operations.FlowOperation;
@@ -140,7 +141,7 @@ use namespace mx_internal;
* <p>The ComboBox control also searches the item list as the user
* enters characters into the prompt area. As the user enters characters,
* the drop-down area of the control opens.
- * It then and scrolls to and highlights the closest match in the item list.</p>
+ * It then scrolls to and highlights the closest match in the item list.</p>
*
* <p>To use this component in a list-based component, such as a List or DataGrid,
* create an item renderer.
@@ -553,6 +554,23 @@ public class ComboBox extends DropDownListBase implements IIMESupport
}
//--------------------------------------------------------------------------
+ // selectedItem
+ //--------------------------------------------------------------------------
+
+ /**
+ * @private
+ */
+ override public function set selectedItem(value:*):void
+ {
+ // If selectedItem set to null or undefined make sure the label display gets cleared.
+ // The code at the bottom of commitProperties checks for this case.
+ if (value == null)
+ selectedIndex = NO_SELECTION;
+
+ super.selectedItem = value;
+ }
+
+ //--------------------------------------------------------------------------
// typicalItem
//--------------------------------------------------------------------------
@@ -731,7 +749,7 @@ public class ComboBox extends DropDownListBase implements IIMESupport
{
_proposedSelectedIndex = NO_PROPOSED_SELECTION;
}
-
+
super.commitProperties();
if (textInput)
@@ -865,6 +883,22 @@ public class ComboBox extends DropDownListBase implements IIMESupport
return false;
}
+ /**
+ * @private
+ */
+ override mx_internal function setSelectedIndex(value:int, dispatchChangeEvent:Boolean = false, changeCaret:Boolean = true):void
+ {
+ // It is possible that the label display changed but the selection didn't. If this is
+ // the case, the label has to be updated since the setSelectedIndex code will short-circuit
+ // and not commit the selection.
+ // An example is if the label is deleted and then the first item is chosen from the
+ // dropdown, the selectedIndex is still 0.
+ if (userTypedIntoText && value == selectedIndex)
+ updateLabelDisplay();
+
+ super.setSelectedIndex(value, dispatchChangeEvent, changeCaret);
+ }
+
// If the TextInput is in focus, listen for keyDown events in the capture phase so that
// we can process the navigation keys (UP/DOWN, PGUP/PGDN, HOME/END). If the ComboBox is in
// focus, just handle keyDown events in the bubble phase
@@ -1048,12 +1082,28 @@ public class ComboBox extends DropDownListBase implements IIMESupport
userTypedIntoText = true;
var operation:FlowOperation = event.operation;
-
- // Close the dropDown if we press delete or cut the selected text
- if (operation is DeleteTextOperation || operation is CutOperation)
+
+ // TLF is batching some operations so it can undo them. If it is a composite operation
+ // look at the last one to figure out if it was a delete.
+ var deleteText:Boolean = (operation is DeleteTextOperation || operation is CutOperation);
+ if (operation is CompositeOperation)
{
- super.changeHighlightedSelection(CUSTOM_SELECTED_ITEM);
+ const operations:Array = CompositeOperation(operation).operations;
+ if (operations.length && operations[operations.length-1] is DeleteTextOperation)
+ deleteText = true;
}
+
+ // If deleting text do not want to do item completion or it isn't possible to delete
+ // individual characters. If the combo is open, leave it open, even if all the text
+ // is deleted.
+ if (deleteText)
+ {
+ // To commit the selection correctly on close, applySelection needs this set.
+ actualProposedSelectedIndex = CUSTOM_SELECTED_ITEM;
+
+ // Update the selected item in the list.
+ super.changeHighlightedSelection(CUSTOM_SELECTED_ITEM);
+ }
else if (previousTextInputText != textInput.text)
{
if (openOnInput)
@@ -1068,7 +1118,7 @@ public class ComboBox extends DropDownListBase implements IIMESupport
}
processInputField();
- }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/Group.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Group.as b/frameworks/projects/spark/src/spark/components/Group.as
index 629b4ef..7068fc5 100644
--- a/frameworks/projects/spark/src/spark/components/Group.as
+++ b/frameworks/projects/spark/src/spark/components/Group.as
@@ -23,9 +23,9 @@ package spark.components
import flash.display.BlendMode;
import flash.display.DisplayObject;
import flash.geom.Rectangle;
+import flash.utils.Dictionary;
import mx.core.FlexVersion;
-import mx.styles.IAdvancedStyleClient;
import mx.core.IFlexModule;
import mx.core.IFontContextComponent;
import mx.core.IUIComponent;
@@ -43,6 +43,8 @@ import mx.graphics.shaderClasses.HueShader;
import mx.graphics.shaderClasses.LuminosityShader;
import mx.graphics.shaderClasses.SaturationShader;
import mx.graphics.shaderClasses.SoftLightShader;
+import mx.styles.AdvancedStyleClient;
+import mx.styles.IAdvancedStyleClient;
import mx.styles.ISimpleStyleClient;
import mx.styles.IStyleClient;
import mx.styles.StyleProtoChain;
@@ -239,6 +241,7 @@ public class Group extends GroupBase implements IVisualElementContainer,
private var needsDisplayObjectAssignment:Boolean = false;
private var layeringMode:uint = ITEM_ORDERED_LAYERING;
private var numGraphicElements:uint = 0;
+ private var deferredStyleClients:Dictionary = null; // of IAdvancedStyleClient
private static const ITEM_ORDERED_LAYERING:uint = 0;
private static const SPARSE_LAYERING:uint = 1;
@@ -841,6 +844,37 @@ public class Group extends GroupBase implements IVisualElementContainer,
/**
* @private
+ * Defer adding IAdvancedStyleClients until createChildren() time. The AdvancedStyleClient's
+ * styleName might be a component's show inclusion in the IVisualElement hierarchy was also
+ * deferred.
+ */
+ override public function addStyleClient(styleClient:IAdvancedStyleClient):void
+ {
+ if (!createChildrenCalled)
+ {
+ if (!deferredStyleClients)
+ deferredStyleClients = new Dictionary(true);
+ deferredStyleClients[styleClient] = true;
+ }
+ else
+ {
+ super.addStyleClient(styleClient);
+ }
+ }
+
+ /**
+ * @private
+ */
+ override public function removeStyleClient(styleClient:IAdvancedStyleClient):void
+ {
+ if (deferredStyleClients && !createChildrenCalled)
+ delete deferredStyleClients[styleClient];
+ else
+ super.removeStyleClient(styleClient);
+ }
+
+ /**
+ * @private
* Whether createChildren() has been called or not.
* We use this in the setter for mxmlContent to know
* whether to validate the value immediately, or just
@@ -862,6 +896,17 @@ public class Group extends GroupBase implements IVisualElementContainer,
mxmlContentChanged = false;
setMXMLContent(_mxmlContent);
}
+
+ if (deferredStyleClients)
+ {
+ for (var obj:Object in deferredStyleClients)
+ {
+ var styleClient:IAdvancedStyleClient = obj as IAdvancedStyleClient;
+ if (styleClient)
+ super.addStyleClient(styleClient);
+ }
+ deferredStyleClients = null;
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Label.as b/frameworks/projects/spark/src/spark/components/Label.as
index af236bf..087d8a9 100644
--- a/frameworks/projects/spark/src/spark/components/Label.as
+++ b/frameworks/projects/spark/src/spark/components/Label.as
@@ -188,9 +188,6 @@ include "../styles/metadata/BasicNonInheritingTextStyles.as"
*
* <pre>
* <s:Label
- * <strong>Properties</strong>
- * fontContext=""
- *
* <strong>Styles</strong>
* alignmentBaseline="baseline"
* baselineShift="0"
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/NumericStepper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/NumericStepper.as b/frameworks/projects/spark/src/spark/components/NumericStepper.as
index ebb9840..3708da0 100644
--- a/frameworks/projects/spark/src/spark/components/NumericStepper.as
+++ b/frameworks/projects/spark/src/spark/components/NumericStepper.as
@@ -25,14 +25,14 @@ import flash.display.InteractiveObject;
import flash.events.Event;
import flash.events.FocusEvent;
import flash.events.KeyboardEvent;
-import flash.globalization.LocaleID;
-import flash.globalization.NumberFormatter;
import mx.core.IIMESupport;
import mx.core.mx_internal;
import mx.events.FlexEvent;
import mx.managers.IFocusManagerComponent;
+import spark.formatters.NumberFormatter;
+
use namespace mx_internal;
//--------------------------------------
@@ -791,7 +791,10 @@ public class NumericStepper extends Spinner
else
{
if (dataFormatter == null)
- dataFormatter = new NumberFormatter(LocaleID.DEFAULT);
+ {
+ dataFormatter = new NumberFormatter();
+ addStyleClient(dataFormatter);
+ }
inputValue = dataFormatter.parseNumber(textDisplay.text);
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/RadioButtonGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/RadioButtonGroup.as b/frameworks/projects/spark/src/spark/components/RadioButtonGroup.as
index 93d4f55..e562a8a 100644
--- a/frameworks/projects/spark/src/spark/components/RadioButtonGroup.as
+++ b/frameworks/projects/spark/src/spark/components/RadioButtonGroup.as
@@ -22,6 +22,7 @@ package spark.components
import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
+import flash.display.InteractiveObject;
import flash.events.Event;
import flash.events.EventDispatcher;
@@ -481,8 +482,8 @@ public class RadioButtonGroup extends EventDispatcher implements IMXMLObject
radioButtons.push(instance);
- // Apply group indices in "breadth-first" order.
- radioButtons.sort(breadthOrderCompare);
+ // Apply group indices in "tab order" or "breadth-first" order.
+ radioButtons.sort(readOrderCompare);
for (var i:int = 0; i < radioButtons.length; i++)
radioButtons[i].indexNumber = i;
@@ -613,22 +614,25 @@ public class RadioButtonGroup extends EventDispatcher implements IMXMLObject
/**
* @private
- * Sandbox root of RadioButton "a" in breadthOrderCompare().
+ * Sandbox root of RadioButton "a" in readOrderCompare().
*/
private var aSbRoot:DisplayObject;
/**
* @private
- * Sandbox root of RadioButton "b" in breadthOrderCompare().
+ * Sandbox root of RadioButton "b" in readOrderCompare().
*/
private var bSbRoot:DisplayObject;
/**
* @private
+ * Comparison function used to sort items as they are added to the radioButtons array.
+ * Compares by tabIndex or if neither item defines a tabIndex, by "breadthOrder."
+ *
* Returns -1 if a is before b in sort order, 0 if a and b have same
* sort order and 1 if a after b in sort order.
*/
- private function breadthOrderCompare(a:DisplayObject, b:DisplayObject):Number
+ private function readOrderCompare(a:DisplayObject, b:DisplayObject):Number
{
var aParent:DisplayObjectContainer = a.parent;
var bParent:DisplayObjectContainer = b.parent;
@@ -649,7 +653,23 @@ public class RadioButtonGroup extends EventDispatcher implements IMXMLObject
// If reached the sandbox root of either then done.
if (aParent == aSbRoot || bParent == bSbRoot)
return 0;
-
+
+ // first check to see if we can compare by tabIndex
+ var aTabIndex:int = (a is InteractiveObject) ? InteractiveObject(a).tabIndex : -1;
+ var bTabIndex:int = (b is InteractiveObject) ? InteractiveObject(b).tabIndex : -1;
+
+ // if one of the items being compared has a defined tabIndex, compare by tabIndex
+ if(aTabIndex > -1 || bTabIndex > -1)
+ {
+ if (aTabIndex > bTabIndex)
+ return (bTabIndex == -1) ? -1 : 1; // items with assigned tabIndex come before those without
+ if (aTabIndex < bTabIndex)
+ return (aTabIndex == -1) ? 1 : -1; // items without assigned tabIndex come after those without
+ if (a == b)
+ return 0;
+ }
+
+ // if neither item has a defined tabIndex, compare by "breadthOrder"
var aNestLevel:int = (a is UIComponent) ? UIComponent(a).nestLevel : -1;
var bNestLevel:int = (b is UIComponent) ? UIComponent(b).nestLevel : -1;
@@ -676,7 +696,7 @@ public class RadioButtonGroup extends EventDispatcher implements IMXMLObject
else if (a == b)
return 0;
else // Nest levels are identical, compare ancestors.
- return breadthOrderCompare(aParent, bParent);
+ return readOrderCompare(aParent, bParent);
}
//--------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/RichEditableText.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/RichEditableText.as b/frameworks/projects/spark/src/spark/components/RichEditableText.as
index db2b9d4..5f4cdcb 100644
--- a/frameworks/projects/spark/src/spark/components/RichEditableText.as
+++ b/frameworks/projects/spark/src/spark/components/RichEditableText.as
@@ -241,8 +241,8 @@ package spark.components
* and it does not support drawing a border.</p>
*
* <p>RichEditableText uses the Text Layout Framework (TLF) library,
- * which in turn builds on the new Flash Text Engine (FTE)
- * in Flash Player 10. In combination, these layers provide text editing with
+ * which in turn builds on the Flash Text Engine (FTE)
+ * introduced in Flash Player 10. In combination, these layers provide text editing with
* high-quality international typography and layout.</p>
*
* <p>The Spark architecture provides three text "primitives" --
@@ -624,10 +624,15 @@ package spark.components
// This TextContainerManager instance persists for the lifetime
// of the component.
_textContainerManager = createTextContainerManager();
+
+ // Turn on TextField-like behavior which preserves the selection when text is set.
+ // If the new text is shorter than the exisiting text, the selection may change.
+ if (FlexVersion.compatibilityVersion > FlexVersion.VERSION_4_8)
+ _textContainerManager.preserveSelectionOnSetText = true;
// Add event listeners on this component.
addEventListener(Event.REMOVED_FROM_STAGE, removedFromStageHandler);
-
+
// The focusInHandler is called by the TCMContainer focusInHandler.
// The focusOutHandler is called by the TCMContainer focusOutHandler.
// The keyDownHandler is called by the TCMContainer keyDownHandler.
@@ -748,11 +753,6 @@ package spark.components
/**
* @private
*/
- mx_internal var preserveSelectionOnSetText:Boolean = false;
-
- /**
- * @private
- */
mx_internal var passwordChar:String = "*";
/**
@@ -2084,6 +2084,10 @@ package spark.components
* with exactly the text specified. If there is whitespace and line
* breaks in the text, they will remain, regardless of the settings of
* the lineBreak and whiteSpaceCollapse styles.
+ *
+ * Similiar to TextField, the selection is preserved when the text is set.
+ * If the new text length is less than the existing text length, the selection
+ * may change.
*/
public function set text(value:String):void
{
@@ -2536,9 +2540,6 @@ package spark.components
if (textChanged)
{
- if (FlexVersion.compatibilityVersion > FlexVersion.VERSION_4_5)
- preserveSelectionOnSetText = true;
-
// If the text has linebreaks (CR, LF, or CF+LF)
// create a multi-paragraph TextFlow from it
// and use the TextFlowTextLineFactory to render it.
@@ -2594,8 +2595,6 @@ package spark.components
// not the underlying text.
if (displayAsPasswordChanged)
{
- preserveSelectionOnSetText = true;
-
// If there is any text, convert it to the passwordChar.
if (displayAsPassword)
{
@@ -2624,25 +2623,6 @@ package spark.components
displayAsPasswordChanged = false;
}
- if (preserveSelectionOnSetText)
- {
- preserveSelectionOnSetText = false;
-
- if (oldAnchorPosition != -1)
- {
- // This will return null if editingMode = readOnly which is true when either
- // editable is false and/or enabled is false.
- var selManager:ISelectionManager = _textContainerManager.beginInteraction();
-
- // The visible selection will be refreshed during the update.
- if (selManager)
- {
- selManager.selectRange(oldAnchorPosition, oldActivePosition);
- _textContainerManager.endInteraction();
- }
- }
- }
-
if (clipAndEnableScrollingChanged)
{
// The TLF code seems to check for !off.
@@ -2679,6 +2659,14 @@ package spark.components
verticalScrollPositionChanged = false;
}
+
+ // Updating the text programatically removes all child TextLine elements
+ // before rebuilding the TextFlow, effectively removing all visual elements
+ // from the display list. This causes any accessibilityImplementation that
+ // was assigned to the component to be removed. The following line restores
+ // the accessibilityImplementation if it no longer exists.
+ if (!accessibilityImplementation)
+ initializeAccessibility();
}
/**
@@ -4634,9 +4622,6 @@ package spark.components
private function textContainerManager_selectionChangeHandler(
event:SelectionEvent):void
{
- if (preserveSelectionOnSetText)
- return;
-
var oldAnchor:int = _selectionAnchorPosition;
var oldActive:int = _selectionActivePosition;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/RichText.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/RichText.as b/frameworks/projects/spark/src/spark/components/RichText.as
index 2e8c333..4e843ef 100644
--- a/frameworks/projects/spark/src/spark/components/RichText.as
+++ b/frameworks/projects/spark/src/spark/components/RichText.as
@@ -213,7 +213,6 @@ include "../styles/metadata/AdvancedNonInheritingTextStyles.as"
* <pre>
* <s:RichText
* <strong>Properties</strong>
- * fontContext="<i>IFlexModuleFactory</i>"
* luminosityClip="false"
* luminosityInvert="false"
* maskType="MaskType.CLIP"
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/Scroller.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Scroller.as b/frameworks/projects/spark/src/spark/components/Scroller.as
index 8e3ff36..9f91412 100644
--- a/frameworks/projects/spark/src/spark/components/Scroller.as
+++ b/frameworks/projects/spark/src/spark/components/Scroller.as
@@ -49,6 +49,7 @@ import mx.events.FlexEvent;
import mx.events.FlexMouseEvent;
import mx.events.PropertyChangeEvent;
import mx.events.TouchInteractionEvent;
+import mx.managers.IFocusManager;
import mx.managers.IFocusManagerComponent;
import mx.styles.IStyleClient;
@@ -412,6 +413,8 @@ include "../styles/metadata/SelectionFormatTextStyles.as"
* <strong>Properties</strong>
* measuredSizeIncludesScrollBars="true"
* minViewportInset="0"
+ * pageScrollingEnabled="false"
+ * scrollSnappingMode="none"
* viewport="null"
*
* <strong>Styles</strong>
@@ -2141,10 +2144,12 @@ public class Scroller extends SkinnableComponent
{
super.focusInHandler(event);
+ var fm:IFocusManager = focusManager;
+
// When we gain focus, make sure the focused element is visible
- if (viewport && ensureElementIsVisibleForSoftKeyboard)
+ if (fm && viewport && ensureElementIsVisibleForSoftKeyboard)
{
- var elt:IVisualElement = focusManager.getFocus() as IVisualElement;
+ var elt:IVisualElement = fm.getFocus() as IVisualElement;
lastFocusedElement = elt;
}
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/VideoPlayer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/VideoPlayer.as b/frameworks/projects/spark/src/spark/components/VideoPlayer.as
index 2a8b452..eed6357 100644
--- a/frameworks/projects/spark/src/spark/components/VideoPlayer.as
+++ b/frameworks/projects/spark/src/spark/components/VideoPlayer.as
@@ -1854,7 +1854,7 @@ public class VideoPlayer extends SkinnableComponent
}
else if (instance == muteButton)
{
- playButton.removeEventListener(FlexEvent.MUTED_CHANGE, muteButton_mutedChangeHandler);
+ muteButton.removeEventListener(FlexEvent.MUTED_CHANGE, muteButton_mutedChangeHandler);
}
else if (instance == volumeBar)
{
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
index b267ffe..350aac0 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
@@ -276,7 +276,7 @@ public class GridColumn extends EventDispatcher
//----------------------------------
private var _dataField:String = null;
- private var dataFieldPath:Array = [];
+ mx_internal var dataFieldPath:Array = [];
[Bindable("dataFieldChanged")]
@@ -1587,7 +1587,7 @@ public class GridColumn extends EventDispatcher
* Common logic for itemToLabel(), itemToDataTip(). Logically this code is
* similar to (not the same as) LabelUtil.itemToLabel().
*/
- private function itemToString(item:Object, labelPath:Array, labelFunction:Function, formatter:IFormatter):String
+ mx_internal function itemToString(item:Object, labelPath:Array, labelFunction:Function, formatter:IFormatter):String
{
if (!item)
return ERROR_TEXT;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as
index 33276a6..9bb452b 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as
@@ -24,7 +24,6 @@ import flash.events.MouseEvent;
import flash.geom.Point;
import flash.utils.describeType;
-
import mx.collections.ICollectionView;
import mx.collections.ISort;
import mx.core.IIMESupport;
@@ -32,12 +31,11 @@ import mx.core.IInvalidating;
import mx.core.IVisualElement;
import mx.core.IVisualElementContainer;
import mx.core.mx_internal;
-import mx.core.UIComponent;
import mx.validators.IValidatorListener;
-import spark.components.gridClasses.GridColumn;
import spark.components.DataGrid;
import spark.components.Group;
+import spark.components.gridClasses.GridColumn;
use namespace mx_internal;
@@ -79,7 +77,7 @@ use namespace mx_internal;
public class GridItemEditor extends Group implements IGridItemEditor
{
include "../../core/Version.as";
-
+
//--------------------------------------------------------------------------
//
// Constructor
@@ -183,7 +181,11 @@ public class GridItemEditor extends Group implements IGridItemEditor
if (_data && column.dataField)
{
- this.value = _data[column.dataField];
+ // If complex field reference need to dig the data value out of the correct object.
+ var dataFieldPath:Array = column.dataFieldPath;
+ this.value = column.dataFieldPath.length == 1 ?
+ _data[column.dataField] :
+ column.itemToString(_data, dataFieldPath, null, null);
}
}
@@ -458,9 +460,20 @@ public class GridItemEditor extends Group implements IGridItemEditor
return false;
var newData:Object = value;
- var property:String = column.dataField;
+ var property:String;
var data:Object = data;
var typeInfo:String = "";
+
+ // If a complex field reference need to get the parent object where the property
+ // will be updated. It is a complex field reference if dataFieldPath.length > 1.
+ // Note that if the path is incorrect there will be a ReferenceError either here or
+ // when accessing the invalid property below.
+ var dataFieldPath:Array = column.dataFieldPath;
+ for (var i:int = 0; i < dataFieldPath.length - 1; i++)
+ data = data[dataFieldPath[i]];
+
+ property = dataFieldPath[i];
+
for each(var variable:XML in describeType(data).variable)
{
if (property == variable.@name.toString())
@@ -501,7 +514,7 @@ public class GridItemEditor extends Group implements IGridItemEditor
}
}
}
-
+
if (property && data[property] !== newData)
{
// If the data is sorted, turn off the sort for the edited data.
@@ -515,7 +528,7 @@ public class GridItemEditor extends Group implements IGridItemEditor
dataProvider.sort = null;
}
}
-
+
var oldData:Object = data[property];
data[property] = newData;
dataGrid.dataProvider.itemUpdated(data, property, oldData, newData);
@@ -663,4 +676,4 @@ public class GridItemEditor extends Group implements IGridItemEditor
event.stopPropagation();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
index 5d6023e..db2682c 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridSelection.as
@@ -1376,7 +1376,7 @@ public class GridSelection
private function dataProviderCollectionMove(event:CollectionEvent):void
{
const oldRowIndex:int = event.oldLocation;
- const newRowIndex:int = event.location;
+ var newRowIndex:int = event.location;
handleRowRemove(oldRowIndex);
@@ -1636,7 +1636,7 @@ public class GridSelection
return;
const oldColumnIndex:int = event.oldLocation;
- const newColumnIndex:int = event.location;
+ var newColumnIndex:int = event.location;
handleColumnRemove(oldColumnIndex);
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
index 077bc90..dfe82ba 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as
@@ -105,7 +105,8 @@ public class DropDownController extends EventDispatcher
_openButton = value;
- _openButton.disableMinimumDownStateTime = true;
+ if (_openButton)
+ _openButton.disableMinimumDownStateTime = true;
addOpenTriggers();
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as b/frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as
index c482bb2..42337ae 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as
@@ -349,6 +349,7 @@ public class ItemRenderer extends DataRenderer implements IItemRenderer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
+ [Bindable]
public var labelDisplay:TextBase;
//----------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as b/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
index cdeedfd..6b85f1b 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
@@ -934,7 +934,7 @@ public class ListBase extends SkinnableDataContainer
else
_proposedSelectedIndex = NO_SELECTION;
- if (allowCustomSelectedItem && _proposedSelectedIndex == -1)
+ if (allowCustomSelectedItem && _proposedSelectedIndex == -1 && _pendingSelectedItem != null)
{
_proposedSelectedIndex = CUSTOM_SELECTED_ITEM;
_selectedItem = _pendingSelectedItem;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/supportClasses/Range.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/Range.as b/frameworks/projects/spark/src/spark/components/supportClasses/Range.as
index 18fad5e..8b31eab 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/Range.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/Range.as
@@ -451,8 +451,7 @@ public class Range extends SkinnableComponent
var maxValue:Number = maximum - minimum;
var scale:Number = 1;
-
- value -= minimum;
+ var offset:Number = minimum; // the offset from 0.
// If interval isn't an integer, there's a possibility that the floating point
// approximation of value or value/interval will be slightly larger or smaller
@@ -463,20 +462,26 @@ public class Range extends SkinnableComponent
// we scale by the implicit precision of the interval and then round. For
// example if interval=0.01, then we scale by 100.
- if (interval != Math.round(interval))
- {
+ if (interval != Math.round(interval))
+ {
+ // calculate scale and compute new scaled values.
const parts:Array = (new String(1 + interval)).split(".");
scale = Math.pow(10, parts[1].length);
maxValue *= scale;
- value = Math.round(value * scale);
+ offset *= scale;
interval = Math.round(interval * scale);
- }
-
+ value = Math.round((value * scale) - offset);
+ }
+ else
+ {
+ value -= offset;
+ }
+
var lower:Number = Math.max(0, Math.floor(value / interval) * interval);
var upper:Number = Math.min(maxValue, Math.floor((value + interval) / interval) * interval);
var validValue:Number = ((value - lower) >= ((upper - lower) / 2)) ? upper : lower;
- return (validValue / scale) + minimum;
+ return (validValue + offset) / scale;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as b/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as
index 5bd13fa..fad5878 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as
@@ -80,6 +80,18 @@ use namespace tlf_internal;
*/
public class RichEditableTextContainerManager extends TextContainerManager
{
+ //--------------------------------------------------------------------------
+ //
+ // Class Variables
+ //
+ //--------------------------------------------------------------------------
+ /**
+ * @private
+ * Disables blinking cursor so mustella test snapshots don't get intermittent
+ * cursors.
+ */
+ mx_internal static var hideCursor:Boolean = false;
+
/**
* Constructor.
*
@@ -251,7 +263,7 @@ public class RichEditableTextContainerManager extends TextContainerManager
// If not editable, then no insertion point.
return new SelectionFormat(
selectionColor, 1.0, BlendMode.NORMAL,
- 0x000000, focusedPointAlpha, BlendMode.INVERT);
+ 0x000000, hideCursor ? 0 : focusedPointAlpha, BlendMode.INVERT);
}
/**
@@ -282,16 +294,23 @@ public class RichEditableTextContainerManager extends TextContainerManager
var inactiveSelectionColor:* = textDisplay.getStyle(
"inactiveTextSelectionColor");
+ var inactivePointAlpha:Number =
+ editingMode == EditingMode.READ_WRITE ?
+ 1.0 :
+ 0.0;
+
var inactiveAlpha:Number =
textDisplay.selectionHighlighting ==
TextSelectionHighlighting.ALWAYS ?
1.0 :
0.0;
- // No insertion point when not active.
+ // Inactive is not unfocused so show an insertion point if there is one.
+ // This is consistent with TextField.
+
return new SelectionFormat(
inactiveSelectionColor, inactiveAlpha, BlendMode.NORMAL,
- inactiveSelectionColor, 0.0);
+ inactiveSelectionColor, inactivePointAlpha, BlendMode.INVERT);
}
/**
@@ -364,7 +383,7 @@ public class RichEditableTextContainerManager extends TextContainerManager
controller.requiredFocusInHandler(null);
- if (!textDisplay.preserveSelectionOnSetText)
+ if (!preserveSelectionOnSetText)
im.selectRange(0, 0);
endInteraction();
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as b/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as
index efc2a2c..d0489be 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as
@@ -445,8 +445,13 @@ public class SkinnableComponent extends UIComponent
if (!skipReload)
{
if (skin)
- detachSkin();
- attachSkin();
+ {
+ detachSkin();
+ // If there is an error skin remove it since it has to go on top of the new skin.
+ removeErrorSkin();
+ }
+ attachSkin();
+ updateErrorSkin();
}
}
@@ -831,12 +836,20 @@ public class SkinnableComponent extends UIComponent
}
else
{
- if (errorObj)
- super.removeChild(errorObj);
-
+ removeErrorSkin();
+ }
+ }
+
+ private function removeErrorSkin():void
+ {
+ if (errorObj)
+ {
+ super.removeChild(errorObj);
errorObj = null;
}
+
}
+
//--------------------------------------------------------------------------
//
// Methods - Parts
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/components/supportClasses/SliderBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/SliderBase.as b/frameworks/projects/spark/src/spark/components/supportClasses/SliderBase.as
index 4a15e10..90df795 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/SliderBase.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/SliderBase.as
@@ -34,7 +34,6 @@ import mx.core.IFactory;
import mx.core.UIComponent;
import mx.core.mx_internal;
import mx.events.FlexEvent;
-import mx.formatters.NumberFormatter;
import mx.managers.IFocusManagerComponent;
import spark.effects.animation.Animation;
@@ -42,6 +41,7 @@ import spark.effects.animation.MotionPath;
import spark.effects.animation.SimpleMotionPath;
import spark.effects.easing.Sine;
import spark.events.TrackBaseEvent;
+import spark.formatters.NumberFormatter;
use namespace mx_internal;
@@ -572,9 +572,13 @@ public class SliderBase extends TrackBase implements IFocusManagerComponent
else
{
if (dataFormatter == null)
+ {
dataFormatter = new NumberFormatter();
+ addStyleClient(dataFormatter);
+ }
- dataFormatter.precision = dataTipPrecision;
+ dataFormatter.fractionalDigits = dataTipPrecision;
+ dataFormatter.trailingZeros = true;
formattedValue = dataFormatter.format(value);
}
@@ -697,7 +701,11 @@ public class SliderBase extends TrackBase implements IFocusManagerComponent
}
if (dataTipInstance && showDataTip)
- {
+ {
+ // If showing the dataTip, we need to validate to
+ // make sure the thumb is in the right position.
+ //validateNow();
+
dataTipInstance.data = formatDataTipText(pendingValue);
// Force the dataTip to render so that we have the correct size since
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/primitives/BitmapImage.as b/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
index d04f8b7..8377107 100644
--- a/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
+++ b/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
@@ -242,6 +242,8 @@ public class BitmapImage extends GraphicElement
*/
public function get bitmapData():BitmapData
{
+ //We return a copy because when the source of the data changes we destroy the bitmap
+ //If a developer is holding a reference to the actual bitmap they will have an invalid reference
return _bitmapData ? _bitmapData.clone() : _bitmapData;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/skins/spark/ImageSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/ImageSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/ImageSkin.mxml
index 150b915..c70cb89 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/ImageSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/ImageSkin.mxml
@@ -90,6 +90,7 @@
<s:BitmapImage id="imageDisplay" left="0" top="0" right="0" bottom="0"/>
<!--- Progress indicator skin part. -->
+ <!--- ToDo: replace with ProgressBar. Range is meant to be a base class and shouldn't be used directly. -->
<s:Range id="progressIndicator" skinClass="spark.skins.spark.ImageLoadingSkin" verticalCenter="0" horizontalCenter="0" includeIn="loading" layoutDirection="ltr" />
<!--- Icon that appears in place of the image when an invalid image is loaded. -->
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/spark/src/spark/styles/metadata/AdvancedInheritingTextStyles.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/styles/metadata/AdvancedInheritingTextStyles.as b/frameworks/projects/spark/src/spark/styles/metadata/AdvancedInheritingTextStyles.as
index 1e2f337..3f52d3b 100644
--- a/frameworks/projects/spark/src/spark/styles/metadata/AdvancedInheritingTextStyles.as
+++ b/frameworks/projects/spark/src/spark/styles/metadata/AdvancedInheritingTextStyles.as
@@ -70,6 +70,74 @@
[Style(name="clearFloats", type="String", enumeration="start,end,left,right,both,none", inherit="yes")]
/**
+ * Controls column break after the element.
+ *
+ * <p><b>For the Spark theme, see
+ * flashx.textLayout.formats.ITextLayoutFormat.columnBreakAfter.</b></p>
+ *
+ * <p><b>For the Mobile theme, this is not supported.</b></p>
+ *
+ * @see flashx.textLayout.formats.ITextLayoutFormat#columnBreakAfter
+ *
+ * @langversion 3.0
+ * @playerversion Flash 11
+ * @playerversion AIR 3
+ * @productversion Flex 5.0
+ */
+[Style(name="columnBreakAfter", type="String", enumeration="auto,always", inherit="yes")]
+
+/**
+ * Controls column break before the element.
+ *
+ * <p><b>For the Spark theme, see
+ * flashx.textLayout.formats.ITextLayoutFormat.columnBreakBefore.</b></p>
+ *
+ * <p><b>For the Mobile theme, this is not supported.</b></p>
+ *
+ * @see flashx.textLayout.formats.ITextLayoutFormat#columnBreakBefore
+ *
+ * @langversion 3.0
+ * @playerversion Flash 11
+ * @playerversion AIR 3
+ * @productversion Flex 5.0
+ */
+[Style(name="columnBreakBefore", type="String", enumeration="auto,always", inherit="yes")]
+
+/**
+ * Controls container break after the element.
+ *
+ * <p><b>For the Spark theme, see
+ * flashx.textLayout.formats.ITextLayoutFormat.containerBreakAfter.</b></p>
+ *
+ * <p><b>For the Mobile theme, this is not supported.</b></p>
+ *
+ * @see flashx.textLayout.formats.ITextLayoutFormat#containerBreakAfter
+ *
+ * @langversion 3.0
+ * @playerversion Flash 11
+ * @playerversion AIR 3
+ * @productversion Flex 5.0
+ */
+[Style(name="containerBreakAfter", type="String", enumeration="auto,always", inherit="yes")]
+
+/**
+ * Controls container break before the element.
+ *
+ * <p><b>For the Spark theme, see
+ * flashx.textLayout.formats.ITextLayoutFormat.containerBreakBefore.</b></p>
+ *
+ * <p><b>For the Mobile theme, this is not supported.</b></p>
+ *
+ * @see flashx.textLayout.formats.ITextLayoutFormat#containerBreakBefore
+ *
+ * @langversion 3.0
+ * @playerversion Flash 11
+ * @playerversion AIR 3
+ * @productversion Flex 5.0
+ */
+[Style(name="containerBreakBefore", type="String", enumeration="auto,always", inherit="yes")]
+
+/**
* Specifies the baseline position of the first line in the container.
*
* <p><b>For the Spark theme, see