You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2019/12/30 16:26:41 UTC
[royale-asjs] branch develop updated: Code dedup (is conversion to
camelcase really necessary?)
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 8f326a0 Code dedup (is conversion to camelcase really necessary?)
new e7d7db4 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
8f326a0 is described below
commit 8f326a06ca7b273efa35b08df02c73d96bd10734
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Dec 30 18:26:23 2019 +0200
Code dedup (is conversion to camelcase really necessary?)
---
.../org/apache/royale/core/SimpleCSSValuesImpl.as | 49 ++++++++--------------
1 file changed, 17 insertions(+), 32 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
index b703b46..5b68b47 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
@@ -334,6 +334,19 @@ package org.apache.royale.core
return arr.join(" ");
}
+ private function toCamelCase(value:String):String
+ {
+ var c:int = value.indexOf("-");
+ while (c > -1)
+ {
+ value = value.substr(0, c) +
+ value.charAt(c + 1).toUpperCase() +
+ value.substr(c + 2);
+ c = value.indexOf("-");
+ }
+ return value;
+ }
+
/**
* The map of values. The format is not documented and it is not recommended
* to manipulate this structure directly.
@@ -359,14 +372,7 @@ package org.apache.royale.core
*/
public function getValue(thisObject:Object, valueName:String, state:String = null, attrs:Object = null):*
{
- var c:int = valueName.indexOf("-");
- while (c > -1)
- {
- valueName = valueName.substr(0, c) +
- valueName.charAt(c + 1).toUpperCase() +
- valueName.substr(c + 2);
- c = valueName.indexOf("-");
- }
+ valueName = toCamelCase(valueName);
var value:*;
var o:*;
@@ -574,14 +580,7 @@ package org.apache.royale.core
*/
public function setValue(thisObject:Object, valueName:String, value:*):void
{
- var c:int = valueName.indexOf("-");
- while (c > -1)
- {
- valueName = valueName.substr(0, c) +
- valueName.charAt(c + 1).toUpperCase() +
- valueName.substr(c + 2);
- c = valueName.indexOf("-");
- }
+ valueName = toCamelCase(valueName);
var oldValue:Object = values[valueName];
if (oldValue !== value)
{
@@ -670,14 +669,7 @@ package org.apache.royale.core
var pieces:Array = splitAndTrim(part, ":");
if (pieces.length < 2) continue;
var valueName:String = pieces[0];
- var c:int = valueName.indexOf("-");
- while (c != -1)
- {
- valueName = valueName.substr(0, c) +
- valueName.charAt(c + 1).toUpperCase() +
- valueName.substr(c + 2);
- c = valueName.indexOf("-");
- }
+ valueName = toCamelCase(valueName);
var value:String = pieces[1];
if (value == "null")
@@ -729,14 +721,7 @@ package org.apache.royale.core
for (var valueName:String in ruleValues)
{
var v:* = ruleValues[valueName];
- var c:int = valueName.indexOf("-");
- while (c > -1)
- {
- valueName = valueName.substr(0, c) +
- valueName.charAt(c + 1).toUpperCase() +
- valueName.substr(c + 2);
- c = valueName.indexOf("-");
- }
+ valueName = toCamelCase(valueName);
asValues[valueName] = v;
}
values[ruleName] = asValues;