Merge branch 'develop' into feature/chart-work # Conflicts: # frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8ea97a46 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8ea97a46 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8ea97a46 Branch: refs/heads/dual Commit: 8ea97a469dc48f3d4c9919d2576afa900a5f77ac Parents: 448e9f8 61c4300 Author: piotrz <[email protected]> Authored: Sun Apr 9 19:26:17 2017 +0200 Committer: piotrz <[email protected]> Committed: Sun Apr 9 19:26:17 2017 +0200 ---------------------------------------------------------------------- examples/examples-integrationtests/pom.xml | 4 +- examples/express/DataBindingExample/pom.xml | 6 +- examples/express/pom.xml | 95 ++++++++ examples/pom.xml | 1 + .../main/flex/org/apache/flex/html/TextInput.as | 2 +- .../html/beads/DataProviderAddRemoveNotifier.as | 183 ---------------- .../html/beads/DataProviderChangeNotifier.as | 214 +++---------------- .../DataProviderCollectionChangeNotifier.as | 71 ++++++ .../beads/DataProviderItemsChangeNotifier.as | 95 ++++++++ .../supportClasses/DataProviderNotifierBase.as | 154 +++++++++++++ .../HTML/src/main/resources/basic-manifest.xml | 3 +- .../flex/org/apache/flex/net/HTTPService.as | 13 ++ pom.xml | 35 ++- 13 files changed, 478 insertions(+), 398 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8ea97a46/frameworks/projects/HTML/src/main/resources/basic-manifest.xml ----------------------------------------------------------------------
