flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [21/37] git commit: [flex-asjs] [refs/heads/spark] - Merge branch 'develop' into spark
Date Thu, 24 Mar 2016 19:59:42 GMT
Merge branch 'develop' into spark

Conflicts:
	frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.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/958b112f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/958b112f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/958b112f

Branch: refs/heads/spark
Commit: 958b112f72e3e2e06c972967a9d473fbe9c2ad91
Parents: 7bfeed8 c313d70
Author: Alex Harui <aharui@apache.org>
Authored: Mon Feb 29 23:53:45 2016 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Feb 29 23:53:45 2016 -0800

----------------------------------------------------------------------
 .../src/productsView/CatalogTitleButtons.mxml   |   8 +-
 .../productsView/ProductCatalogThumbnail.mxml   |   2 +-
 .../src/productsView/ProductListItem.mxml       |  10 +
 frameworks/build.xml                            |   6 +
 .../flex/org/apache/flex/events/CustomEvent.as  |   9 +-
 .../main/flex/org/apache/flex/events/Event.as   |  17 +-
 .../org/apache/flex/events/EventDispatcher.as   |  14 ++
 .../flex/org/apache/flex/events/MouseEvent.as   |   2 +-
 .../org/apache/flex/events/ValueChangeEvent.as  |   9 +-
 .../flex/org/apache/flex/events/ValueEvent.as   |  10 +-
 .../main/flex/org/apache/flex/utils/Proxy.as    |   3 +-
 frameworks/projects/Storage/build.xml           | 172 +++++++++++++++
 .../Storage/src/main/flex/StorageClasses.as     |  35 +++
 .../flex/org/apache/flex/storage/IWebStorage.as | 100 +++++++++
 .../org/apache/flex/storage/LocalStorage.as     | 157 +++++++++++++
 .../storage/providers/LocalStorageProvider.as   | 220 +++++++++++++++++++
 .../src/main/resources/basic-manifest.xml       |  24 ++
 .../src/main/resources/compile-asjs-config.xml  |  82 +++++++
 .../src/main/resources/compile-config.xml       |  82 +++++++
 .../Storage/src/main/resources/defaults.css     |  26 +++
 20 files changed, 948 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/958b112f/frameworks/projects/Core/src/main/flex/org/apache/flex/events/EventDispatcher.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/958b112f/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as
index 31bd886,39b6945..7621e98
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as
@@@ -103,9 -103,22 +103,8 @@@ public dynamic class Proxy extends Even
      public function Proxy()
      {
      }
--    
--    
 -	private var valueMap:Object = {};
++        
 +	protected var valueMap:Object = {};
      
      public function getProperty(propName:String):*
      {


Mime
View raw message