[royale-asjs] branch develop updated: Fix for issue #487 (and part of 457)

[gr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gregdove 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 09841a0  Fix for issue #487 (and part of 457)
09841a0 is described below

commit 09841a09db092126b8daf03f10c11a0d9f45bdff
Author: greg-dove <gr...@gmail.com>
AuthorDate: Sat Dec 14 13:01:57 2019 +1300

    Fix for issue #487 (and part of 457)
---
 .../main/royale/org/apache/royale/binding/ApplicationDataBinding.as   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/ApplicationDataBinding.as b/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/ApplicationDataBinding.as
index f980602..9e0ef8f 100644
--- a/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/ApplicationDataBinding.as
+++ b/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/ApplicationDataBinding.as
@@ -120,7 +120,7 @@ package org.apache.royale.binding
                     }
                 }
                 else if (binding.source is Array
-                        && binding.source[0] in _strand
+                        /*&& binding.source[0] in _strand*/ // ConstantBindings are most often not instance constants on the strand
                         && binding.source.length == 2 && binding.destination.length == 2)
                 {
                     // can be simplebinding or constantbinding
@@ -140,7 +140,7 @@ package org.apache.royale.binding
 
                         prepareCreatedBinding(sb as IBinding, binding);
                     }
-                    else if (fieldWatcher && fieldWatcher.eventNames == null)
+                    else if (!fieldWatcher || fieldWatcher.eventNames == null)
                     {
                         var cb:ConstantBinding = new ConstantBinding();
                         cb.destinationPropertyName = binding.destination[1];