You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2014/10/24 13:28:56 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - Added FP 15
swfversion condition
Repository: flex-sdk
Updated Branches:
refs/heads/develop 332ec4305 -> af2dc0d8f
Added FP 15 swfversion condition
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/39e5a906
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/39e5a906
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/39e5a906
Branch: refs/heads/develop
Commit: 39e5a906a80227ceb77322b057e8cee8807f7dfc
Parents: 332ec43
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Oct 24 12:58:36 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Oct 24 13:04:18 2014 +0200
----------------------------------------------------------------------
frameworks/build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/39e5a906/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index fcfa9f9..3780f11 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -204,6 +204,9 @@
<condition property="playerglobal.swfversion" value="25">
<equals arg1="${playerglobal.version}" arg2="14.0" />
</condition>
+ <condition property="playerglobal.swfversion" value="26">
+ <equals arg1="${playerglobal.version}" arg2="15.0" />
+ </condition>
</target>
<!--
Re: [3/3] git commit: [flex-sdk] [refs/heads/develop] - Increment and
counterpart don't work with FlexJS '_get()' and '_set()'
Posted by Erik de Bruin <er...@ixsoftware.nl>.
It’s not on my list.
For VF2JS I’ll be using the more modern (but not backwards compatible)
approach of “Object.defineProperty” to create a ‘real’ properties with
‘get’ and ‘set’ methods. That will bring JS up to speed with AS and will
prevent this (and many other) types of incompatibilities when cross
compiling.
EdB
On Fri, Oct 24, 2014 at 6:45 PM, Alex Harui <ah...@adobe.com> wrote:
> Is the plan to fix this in FalconJX so these kinds of changes aren’t
> necessary?
>
> -Alex
>
> On 10/24/14, 4:28 AM, "erikdebruin@apache.org" <er...@apache.org>
> wrote:
>
> >Increment and counterpart don't work with FlexJS '_get()' and '_set()'
> >
> >In FlexJS, all properties are converted to a set of methods, with '_get'
> >and '_set' postfix. Calling an increment on a property in AS - myProp++ -
> >will thus translate to 'myProp_get()++' in JS. And JS strongly objects to
> >that syntax.
> >
> >Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
> >
> >
> >Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
> >Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/af2dc0d8
> >Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/af2dc0d8
> >Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/af2dc0d8
> >
> >Branch: refs/heads/develop
> >Commit: af2dc0d8f6712c0003264cea966ef8afd159878c
> >Parents: b9d15cf
> >Author: Erik de Bruin <er...@ixsoftware.nl>
> >Authored: Fri Oct 24 13:04:09 2014 +0200
> >Committer: Erik de Bruin <er...@ixsoftware.nl>
> >Committed: Fri Oct 24 13:04:19 2014 +0200
> >
> >----------------------------------------------------------------------
> > .../projects/framework/src/mx/managers/SystemManager.as | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/af2dc0d8/frameworks/p
> >rojects/framework/src/mx/managers/SystemManager.as
> >----------------------------------------------------------------------
> >diff --git
> >a/frameworks/projects/framework/src/mx/managers/SystemManager.as
> >b/frameworks/projects/framework/src/mx/managers/SystemManager.as
> >index 61d41ce..9eb9bea 100644
> >--- a/frameworks/projects/framework/src/mx/managers/SystemManager.as
> >+++ b/frameworks/projects/framework/src/mx/managers/SystemManager.as
> >@@ -1752,7 +1752,7 @@ public class SystemManager extends MovieClip
> > {
> > // Adjust the partition indexes before the
> > // "added" event is dispatched.
> >- noTopMostIndex++;
> >+ noTopMostIndex = noTopMostIndex + 1;
> >
> > var oldParent:DisplayObjectContainer = child.parent;
> > if (oldParent)
> >@@ -1790,7 +1790,7 @@ public class SystemManager extends MovieClip
> > {
> > // Adjust the partition indexes
> > // before the "removed" event is dispatched.
> >- noTopMostIndex--;
> >+ noTopMostIndex = noTopMostIndex - 1;
> >
> > return rawChildren_removeChild(child);
> > }
> >@@ -1802,7 +1802,7 @@ public class SystemManager extends MovieClip
> > {
> > // Adjust the partition indexes
> > // before the "removed" event is dispatched.
> >- noTopMostIndex--;
> >+ noTopMostIndex = noTopMostIndex - 1;
> >
> > return rawChildren_removeChildAt(applicationIndex + index);
> > }
> >@@ -2658,7 +2658,7 @@ public class SystemManager extends MovieClip
> > mouseCatcher.name = "mouseCatcher";
> > // Must use addChildAt because a creationComplete handler can
> >create a
> > // dialog and insert it at 0.
> >- noTopMostIndex++;
> >+ noTopMostIndex = noTopMostIndex + 1;
> > super.addChildAt(mouseCatcher, 0);
> > resizeMouseCatcher();
> > if (!topLevel)
> >@@ -2668,7 +2668,7 @@ public class SystemManager extends MovieClip
> > }
> >
> > // Add the application as child 1.
> >- noTopMostIndex++;
> >+ noTopMostIndex = noTopMostIndex + 1;
> > super.addChildAt(DisplayObject(app), 1);
> >
> > CONFIG::performanceInstrumentation
> >
>
>
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: [3/3] git commit: [flex-sdk] [refs/heads/develop] - Increment and
counterpart don't work with FlexJS '_get()' and '_set()'
Posted by Erik de Bruin <er...@ixsoftware.nl>.
It’s not on my list.
For VF2JS I’ll be using the more modern (but not backwards compatible)
approach of “Object.defineProperty” to create a ‘real’ properties with
‘get’ and ‘set’ methods. That will bring JS up to speed with AS and will
prevent this (and many other) types of incompatibilities when cross
compiling.
EdB
On Fri, Oct 24, 2014 at 6:45 PM, Alex Harui <ah...@adobe.com> wrote:
> Is the plan to fix this in FalconJX so these kinds of changes aren’t
> necessary?
>
> -Alex
>
> On 10/24/14, 4:28 AM, "erikdebruin@apache.org" <er...@apache.org>
> wrote:
>
> >Increment and counterpart don't work with FlexJS '_get()' and '_set()'
> >
> >In FlexJS, all properties are converted to a set of methods, with '_get'
> >and '_set' postfix. Calling an increment on a property in AS - myProp++ -
> >will thus translate to 'myProp_get()++' in JS. And JS strongly objects to
> >that syntax.
> >
> >Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
> >
> >
> >Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
> >Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/af2dc0d8
> >Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/af2dc0d8
> >Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/af2dc0d8
> >
> >Branch: refs/heads/develop
> >Commit: af2dc0d8f6712c0003264cea966ef8afd159878c
> >Parents: b9d15cf
> >Author: Erik de Bruin <er...@ixsoftware.nl>
> >Authored: Fri Oct 24 13:04:09 2014 +0200
> >Committer: Erik de Bruin <er...@ixsoftware.nl>
> >Committed: Fri Oct 24 13:04:19 2014 +0200
> >
> >----------------------------------------------------------------------
> > .../projects/framework/src/mx/managers/SystemManager.as | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/af2dc0d8/frameworks/p
> >rojects/framework/src/mx/managers/SystemManager.as
> >----------------------------------------------------------------------
> >diff --git
> >a/frameworks/projects/framework/src/mx/managers/SystemManager.as
> >b/frameworks/projects/framework/src/mx/managers/SystemManager.as
> >index 61d41ce..9eb9bea 100644
> >--- a/frameworks/projects/framework/src/mx/managers/SystemManager.as
> >+++ b/frameworks/projects/framework/src/mx/managers/SystemManager.as
> >@@ -1752,7 +1752,7 @@ public class SystemManager extends MovieClip
> > {
> > // Adjust the partition indexes before the
> > // "added" event is dispatched.
> >- noTopMostIndex++;
> >+ noTopMostIndex = noTopMostIndex + 1;
> >
> > var oldParent:DisplayObjectContainer = child.parent;
> > if (oldParent)
> >@@ -1790,7 +1790,7 @@ public class SystemManager extends MovieClip
> > {
> > // Adjust the partition indexes
> > // before the "removed" event is dispatched.
> >- noTopMostIndex--;
> >+ noTopMostIndex = noTopMostIndex - 1;
> >
> > return rawChildren_removeChild(child);
> > }
> >@@ -1802,7 +1802,7 @@ public class SystemManager extends MovieClip
> > {
> > // Adjust the partition indexes
> > // before the "removed" event is dispatched.
> >- noTopMostIndex--;
> >+ noTopMostIndex = noTopMostIndex - 1;
> >
> > return rawChildren_removeChildAt(applicationIndex + index);
> > }
> >@@ -2658,7 +2658,7 @@ public class SystemManager extends MovieClip
> > mouseCatcher.name = "mouseCatcher";
> > // Must use addChildAt because a creationComplete handler can
> >create a
> > // dialog and insert it at 0.
> >- noTopMostIndex++;
> >+ noTopMostIndex = noTopMostIndex + 1;
> > super.addChildAt(mouseCatcher, 0);
> > resizeMouseCatcher();
> > if (!topLevel)
> >@@ -2668,7 +2668,7 @@ public class SystemManager extends MovieClip
> > }
> >
> > // Add the application as child 1.
> >- noTopMostIndex++;
> >+ noTopMostIndex = noTopMostIndex + 1;
> > super.addChildAt(DisplayObject(app), 1);
> >
> > CONFIG::performanceInstrumentation
> >
>
>
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: [3/3] git commit: [flex-sdk] [refs/heads/develop] - Increment and
counterpart don't work with FlexJS '_get()' and '_set()'
Posted by Alex Harui <ah...@adobe.com>.
Is the plan to fix this in FalconJX so these kinds of changes aren’t
necessary?
-Alex
On 10/24/14, 4:28 AM, "erikdebruin@apache.org" <er...@apache.org>
wrote:
>Increment and counterpart don't work with FlexJS '_get()' and '_set()'
>
>In FlexJS, all properties are converted to a set of methods, with '_get'
>and '_set' postfix. Calling an increment on a property in AS - myProp++ -
>will thus translate to 'myProp_get()++' in JS. And JS strongly objects to
>that syntax.
>
>Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
>
>
>Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
>Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/af2dc0d8
>Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/af2dc0d8
>Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/af2dc0d8
>
>Branch: refs/heads/develop
>Commit: af2dc0d8f6712c0003264cea966ef8afd159878c
>Parents: b9d15cf
>Author: Erik de Bruin <er...@ixsoftware.nl>
>Authored: Fri Oct 24 13:04:09 2014 +0200
>Committer: Erik de Bruin <er...@ixsoftware.nl>
>Committed: Fri Oct 24 13:04:19 2014 +0200
>
>----------------------------------------------------------------------
> .../projects/framework/src/mx/managers/SystemManager.as | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/af2dc0d8/frameworks/p
>rojects/framework/src/mx/managers/SystemManager.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/projects/framework/src/mx/managers/SystemManager.as
>b/frameworks/projects/framework/src/mx/managers/SystemManager.as
>index 61d41ce..9eb9bea 100644
>--- a/frameworks/projects/framework/src/mx/managers/SystemManager.as
>+++ b/frameworks/projects/framework/src/mx/managers/SystemManager.as
>@@ -1752,7 +1752,7 @@ public class SystemManager extends MovieClip
> {
> // Adjust the partition indexes before the
> // "added" event is dispatched.
>- noTopMostIndex++;
>+ noTopMostIndex = noTopMostIndex + 1;
>
> var oldParent:DisplayObjectContainer = child.parent;
> if (oldParent)
>@@ -1790,7 +1790,7 @@ public class SystemManager extends MovieClip
> {
> // Adjust the partition indexes
> // before the "removed" event is dispatched.
>- noTopMostIndex--;
>+ noTopMostIndex = noTopMostIndex - 1;
>
> return rawChildren_removeChild(child);
> }
>@@ -1802,7 +1802,7 @@ public class SystemManager extends MovieClip
> {
> // Adjust the partition indexes
> // before the "removed" event is dispatched.
>- noTopMostIndex--;
>+ noTopMostIndex = noTopMostIndex - 1;
>
> return rawChildren_removeChildAt(applicationIndex + index);
> }
>@@ -2658,7 +2658,7 @@ public class SystemManager extends MovieClip
> mouseCatcher.name = "mouseCatcher";
> // Must use addChildAt because a creationComplete handler can
>create a
> // dialog and insert it at 0.
>- noTopMostIndex++;
>+ noTopMostIndex = noTopMostIndex + 1;
> super.addChildAt(mouseCatcher, 0);
> resizeMouseCatcher();
> if (!topLevel)
>@@ -2668,7 +2668,7 @@ public class SystemManager extends MovieClip
> }
>
> // Add the application as child 1.
>- noTopMostIndex++;
>+ noTopMostIndex = noTopMostIndex + 1;
> super.addChildAt(DisplayObject(app), 1);
>
> CONFIG::performanceInstrumentation
>
Re: [3/3] git commit: [flex-sdk] [refs/heads/develop] - Increment and
counterpart don't work with FlexJS '_get()' and '_set()'
Posted by Alex Harui <ah...@adobe.com>.
Is the plan to fix this in FalconJX so these kinds of changes aren’t
necessary?
-Alex
On 10/24/14, 4:28 AM, "erikdebruin@apache.org" <er...@apache.org>
wrote:
>Increment and counterpart don't work with FlexJS '_get()' and '_set()'
>
>In FlexJS, all properties are converted to a set of methods, with '_get'
>and '_set' postfix. Calling an increment on a property in AS - myProp++ -
>will thus translate to 'myProp_get()++' in JS. And JS strongly objects to
>that syntax.
>
>Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
>
>
>Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
>Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/af2dc0d8
>Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/af2dc0d8
>Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/af2dc0d8
>
>Branch: refs/heads/develop
>Commit: af2dc0d8f6712c0003264cea966ef8afd159878c
>Parents: b9d15cf
>Author: Erik de Bruin <er...@ixsoftware.nl>
>Authored: Fri Oct 24 13:04:09 2014 +0200
>Committer: Erik de Bruin <er...@ixsoftware.nl>
>Committed: Fri Oct 24 13:04:19 2014 +0200
>
>----------------------------------------------------------------------
> .../projects/framework/src/mx/managers/SystemManager.as | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/af2dc0d8/frameworks/p
>rojects/framework/src/mx/managers/SystemManager.as
>----------------------------------------------------------------------
>diff --git
>a/frameworks/projects/framework/src/mx/managers/SystemManager.as
>b/frameworks/projects/framework/src/mx/managers/SystemManager.as
>index 61d41ce..9eb9bea 100644
>--- a/frameworks/projects/framework/src/mx/managers/SystemManager.as
>+++ b/frameworks/projects/framework/src/mx/managers/SystemManager.as
>@@ -1752,7 +1752,7 @@ public class SystemManager extends MovieClip
> {
> // Adjust the partition indexes before the
> // "added" event is dispatched.
>- noTopMostIndex++;
>+ noTopMostIndex = noTopMostIndex + 1;
>
> var oldParent:DisplayObjectContainer = child.parent;
> if (oldParent)
>@@ -1790,7 +1790,7 @@ public class SystemManager extends MovieClip
> {
> // Adjust the partition indexes
> // before the "removed" event is dispatched.
>- noTopMostIndex--;
>+ noTopMostIndex = noTopMostIndex - 1;
>
> return rawChildren_removeChild(child);
> }
>@@ -1802,7 +1802,7 @@ public class SystemManager extends MovieClip
> {
> // Adjust the partition indexes
> // before the "removed" event is dispatched.
>- noTopMostIndex--;
>+ noTopMostIndex = noTopMostIndex - 1;
>
> return rawChildren_removeChildAt(applicationIndex + index);
> }
>@@ -2658,7 +2658,7 @@ public class SystemManager extends MovieClip
> mouseCatcher.name = "mouseCatcher";
> // Must use addChildAt because a creationComplete handler can
>create a
> // dialog and insert it at 0.
>- noTopMostIndex++;
>+ noTopMostIndex = noTopMostIndex + 1;
> super.addChildAt(mouseCatcher, 0);
> resizeMouseCatcher();
> if (!topLevel)
>@@ -2668,7 +2668,7 @@ public class SystemManager extends MovieClip
> }
>
> // Add the application as child 1.
>- noTopMostIndex++;
>+ noTopMostIndex = noTopMostIndex + 1;
> super.addChildAt(DisplayObject(app), 1);
>
> CONFIG::performanceInstrumentation
>
[3/3] git commit: [flex-sdk] [refs/heads/develop] - Increment and
counterpart don't work with FlexJS '_get()' and '_set()'
Posted by er...@apache.org.
Increment and counterpart don't work with FlexJS '_get()' and '_set()'
In FlexJS, all properties are converted to a set of methods, with '_get' and '_set' postfix. Calling an increment on a property in AS - myProp++ - will thus translate to 'myProp_get()++' in JS. And JS strongly objects to that syntax.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/af2dc0d8
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/af2dc0d8
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/af2dc0d8
Branch: refs/heads/develop
Commit: af2dc0d8f6712c0003264cea966ef8afd159878c
Parents: b9d15cf
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Oct 24 13:04:09 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Oct 24 13:04:19 2014 +0200
----------------------------------------------------------------------
.../projects/framework/src/mx/managers/SystemManager.as | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/af2dc0d8/frameworks/projects/framework/src/mx/managers/SystemManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/managers/SystemManager.as b/frameworks/projects/framework/src/mx/managers/SystemManager.as
index 61d41ce..9eb9bea 100644
--- a/frameworks/projects/framework/src/mx/managers/SystemManager.as
+++ b/frameworks/projects/framework/src/mx/managers/SystemManager.as
@@ -1752,7 +1752,7 @@ public class SystemManager extends MovieClip
{
// Adjust the partition indexes before the
// "added" event is dispatched.
- noTopMostIndex++;
+ noTopMostIndex = noTopMostIndex + 1;
var oldParent:DisplayObjectContainer = child.parent;
if (oldParent)
@@ -1790,7 +1790,7 @@ public class SystemManager extends MovieClip
{
// Adjust the partition indexes
// before the "removed" event is dispatched.
- noTopMostIndex--;
+ noTopMostIndex = noTopMostIndex - 1;
return rawChildren_removeChild(child);
}
@@ -1802,7 +1802,7 @@ public class SystemManager extends MovieClip
{
// Adjust the partition indexes
// before the "removed" event is dispatched.
- noTopMostIndex--;
+ noTopMostIndex = noTopMostIndex - 1;
return rawChildren_removeChildAt(applicationIndex + index);
}
@@ -2658,7 +2658,7 @@ public class SystemManager extends MovieClip
mouseCatcher.name = "mouseCatcher";
// Must use addChildAt because a creationComplete handler can create a
// dialog and insert it at 0.
- noTopMostIndex++;
+ noTopMostIndex = noTopMostIndex + 1;
super.addChildAt(mouseCatcher, 0);
resizeMouseCatcher();
if (!topLevel)
@@ -2668,7 +2668,7 @@ public class SystemManager extends MovieClip
}
// Add the application as child 1.
- noTopMostIndex++;
+ noTopMostIndex = noTopMostIndex + 1;
super.addChildAt(DisplayObject(app), 1);
CONFIG::performanceInstrumentation
[2/3] git commit: [flex-sdk] [refs/heads/develop] - Minor rewrite to
avoid multiple catch blocks in one statement (JS no likey)
Posted by er...@apache.org.
Minor rewrite to avoid multiple catch blocks in one statement (JS no likey)
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b9d15cf4
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b9d15cf4
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b9d15cf4
Branch: refs/heads/develop
Commit: b9d15cf4a2979dbf6786165073317243fa063251
Parents: 39e5a90
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Oct 24 12:59:39 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Oct 24 13:04:19 2014 +0200
----------------------------------------------------------------------
.../framework/src/mx/binding/Binding.as | 74 ++++++++++----------
.../framework/src/mx/binding/Watcher.as | 56 +++++++--------
2 files changed, 63 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b9d15cf4/frameworks/projects/framework/src/mx/binding/Binding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/binding/Binding.as b/frameworks/projects/framework/src/mx/binding/Binding.as
index b2e0598..6122921 100644
--- a/frameworks/projects/framework/src/mx/binding/Binding.as
+++ b/frameworks/projects/framework/src/mx/binding/Binding.as
@@ -423,46 +423,44 @@ public class Binding
wrappedFunctionSuccessful = true;
return result;
}
- catch(itemPendingError:ItemPendingError)
- {
- itemPendingError.addResponder(new EvalBindingResponder(this, object));
- if (BindingManager.debugDestinationStrings[destString])
- {
- trace("Binding: destString = " + destString + ", error = " + itemPendingError);
- }
- }
- catch(rangeError:RangeError)
- {
- if (BindingManager.debugDestinationStrings[destString])
- {
- trace("Binding: destString = " + destString + ", error = " + rangeError);
- }
- }
catch(error:Error)
{
- // Certain errors are normal when executing a srcFunc or destFunc,
- // so we swallow them:
- // Error #1006: Call attempted on an object that is not a function.
- // Error #1009: null has no properties.
- // Error #1010: undefined has no properties.
- // Error #1055: - has no properties.
- // Error #1069: Property - not found on - and there is no default value
- // We allow any other errors to be thrown.
- if ((error.errorID != 1006) &&
- (error.errorID != 1009) &&
- (error.errorID != 1010) &&
- (error.errorID != 1055) &&
- (error.errorID != 1069))
- {
- throw error;
- }
- else
- {
- if (BindingManager.debugDestinationStrings[destString])
- {
- trace("Binding: destString = " + destString + ", error = " + error);
- }
- }
+ if (error is ItemPendingError) {
+ error.addResponder(new EvalBindingResponder(this, object));
+ if (BindingManager.debugDestinationStrings[destString])
+ {
+ trace("Binding: destString = " + destString + ", error = " + error);
+ }
+ } else if (error is RangeError) {
+ if (BindingManager.debugDestinationStrings[destString])
+ {
+ trace("Binding: destString = " + destString + ", error = " + error);
+ }
+ } else {
+ // Certain errors are normal when executing a srcFunc or destFunc,
+ // so we swallow them:
+ // Error #1006: Call attempted on an object that is not a function.
+ // Error #1009: null has no properties.
+ // Error #1010: undefined has no properties.
+ // Error #1055: - has no properties.
+ // Error #1069: Property - not found on - and there is no default value
+ // We allow any other errors to be thrown.
+ if ((error.errorID != 1006) &&
+ (error.errorID != 1009) &&
+ (error.errorID != 1010) &&
+ (error.errorID != 1055) &&
+ (error.errorID != 1069))
+ {
+ throw error;
+ }
+ else
+ {
+ if (BindingManager.debugDestinationStrings[destString])
+ {
+ trace("Binding: destString = " + destString + ", error = " + error);
+ }
+ }
+ }
}
return null;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b9d15cf4/frameworks/projects/framework/src/mx/binding/Watcher.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/binding/Watcher.as b/frameworks/projects/framework/src/mx/binding/Watcher.as
index ac35300..fef6ee3 100644
--- a/frameworks/projects/framework/src/mx/binding/Watcher.as
+++ b/frameworks/projects/framework/src/mx/binding/Watcher.as
@@ -199,37 +199,35 @@ public class Watcher
{
wrappedFunction.apply(this);
}
- catch(itemPendingError:ItemPendingError)
- {
- // The parent's value is not yet available. This is being ignored for now -
- // updateParent() will be called when the parent has a value.
- value = null;
- }
- catch(rangeError:RangeError)
- {
- // The parent's value is not yet available. This is being ignored for now -
- // updateParent() will be called when the parent has a value.
- value = null;
- }
catch(error:Error)
{
- // Certain errors are normal when executing an update, so we swallow them:
- // Error #1006: Call attempted on an object that is not a function.
- // Error #1009: null has no properties.
- // Error #1010: undefined has no properties.
- // Error #1055: - has no properties.
- // Error #1069: Property - not found on - and there is no default value
- // Error #1507: - invalid null argument.
- // We allow any other errors to be thrown.
- if ((error.errorID != 1006) &&
- (error.errorID != 1009) &&
- (error.errorID != 1010) &&
- (error.errorID != 1055) &&
- (error.errorID != 1069) &&
- (error.errorID != 1507))
- {
- throw error;
- }
+ if (error is ItemPendingError) {
+ // The parent's value is not yet available. This is being ignored for now -
+ // updateParent() will be called when the parent has a value.
+ value = null;
+ } else if (error is RangeError) {
+ // The parent's value is not yet available. This is being ignored for now -
+ // updateParent() will be called when the parent has a value.
+ value = null;
+ } else {
+ // Certain errors are normal when executing an update, so we swallow them:
+ // Error #1006: Call attempted on an object that is not a function.
+ // Error #1009: null has no properties.
+ // Error #1010: undefined has no properties.
+ // Error #1055: - has no properties.
+ // Error #1069: Property - not found on - and there is no default value
+ // Error #1507: - invalid null argument.
+ // We allow any other errors to be thrown.
+ if ((error.errorID != 1006) &&
+ (error.errorID != 1009) &&
+ (error.errorID != 1010) &&
+ (error.errorID != 1055) &&
+ (error.errorID != 1069) &&
+ (error.errorID != 1507))
+ {
+ throw error;
+ }
+ }
}
}