flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [18/25] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merge branch 'Binding_Improvements' of https://github.com/greg-dove/flex-asjs into develop This closes #13 Conflicts: examples/flexjs/DataBindingTestbed/src/MyInitialView.mxml
Date Tue, 06 Sep 2016 06:18:06 GMT
Merge branch 'Binding_Improvements' of https://github.com/greg-dove/flex-asjs into develop
This closes #13
Conflicts:
	examples/flexjs/DataBindingTestbed/src/MyInitialView.mxml


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a939eb93
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a939eb93
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a939eb93

Branch: refs/heads/refactor-sprite
Commit: a939eb93d6024de921f488efde4983550fe5bb8e
Parents: b59c4cb a1b5d31
Author: Alex Harui <aharui@apache.org>
Authored: Mon Aug 29 14:50:59 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Aug 29 14:50:59 2016 -0700

----------------------------------------------------------------------
 examples/build_example.xml                      |  18 +
 .../DataBindingTestbed/src/MyInitialView.mxml   |  29 +-
 .../flex/binding/ApplicationDataBinding.as      |   5 +-
 .../apache/flex/binding/ContainerDataBinding.as |   5 +-
 .../org/apache/flex/binding/GenericBinding.as   |  27 +-
 .../flex/binding/MXMLBeadViewDataBinding.as     |   5 +-
 .../org/apache/flex/binding/PropertyWatcher.as  |  33 +-
 .../org/apache/flex/binding/SimpleBinding.as    | 382 ++++++++++---------
 .../org/apache/flex/binding/ViewDataBinding.as  | 170 +++++----
 .../org/apache/flex/events/EventDispatcher.as   |  16 +-
 10 files changed, 408 insertions(+), 282 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a939eb93/examples/flexjs/DataBindingTestbed/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --cc examples/flexjs/DataBindingTestbed/src/MyInitialView.mxml
index 3bc2ce5,1ed9853..286c097
--- a/examples/flexjs/DataBindingTestbed/src/MyInitialView.mxml
+++ b/examples/flexjs/DataBindingTestbed/src/MyInitialView.mxml
@@@ -209,10 -210,10 +210,10 @@@ limitations under the License
  			<js:beads>
  				<js:VerticalLayout />
  			</js:beads>
- 			<js:Label text="[BROKEN] 3 examples of binding into local and external static constants"/>
- 			<!--<js:Label id="staticConstDemo1"  text="{STATIC_PRIVATE_CONST}" />
+ 			<js:Label text="[WORKS] 3 examples of binding into local and external static constants"/>
+ 			<js:Label id="staticConstDemo1"  text="{STATIC_PRIVATE_CONST}" />
  			<js:Label id="staticConstDemo2"  text="{STATIC_PUBLIC_CONST}" />
 -			<js:Label id="staticConstDemo3"  text="{StaticTimer.EXTERNAL_STATIC_CONST}" />
 +			<js:Label id="staticConstDemo3"  text="{StaticTimer.EXTERNAL_STATIC_CONST}" />-->
  		</js:Container>
  		<js:Container width="500">
  			<js:beads>


Mime
View raw message