You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2017/05/25 23:48:39 UTC
[1/7] git commit: [flex-asjs] [refs/heads/develop] - override usually
comes first
Repository: flex-asjs
Updated Branches:
refs/heads/develop 95545813d -> 516e04f89
override usually comes first
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a7764668
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a7764668
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a7764668
Branch: refs/heads/develop
Commit: a7764668b1a311ad3ce29eebe5fbec3ce0c88105
Parents: 9554581
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 26 07:51:31 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 26 07:51:31 2017 +1000
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/events/MouseEvent.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a7764668/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
index 3e5a617..0b3b28e 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
@@ -144,7 +144,7 @@ package org.apache.flex.events
/**
* @private
*/
- public override function clone():flash.events.Event
+ override public function clone():flash.events.Event
{
return cloneEvent() as flash.events.Event;
}
[7/7] git commit: [flex-asjs] [refs/heads/develop] - little confusion
on null / undefined in code reverting to type conversion comparison for now
Posted by jm...@apache.org.
little confusion on null / undefined in code reverting to type conversion comparison for now
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/516e04f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/516e04f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/516e04f8
Branch: refs/heads/develop
Commit: 516e04f8936ef2df164b2b61342a65945bb65483
Parents: 4cf2969
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 26 09:47:02 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 26 09:47:02 2017 +1000
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/516e04f8/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index 70ff04d..6d4adec 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -246,7 +246,7 @@ package org.apache.flex.core
{
finalName = fixNames(declarationName, mq);
o = values[finalName];
- if (o === null)
+ if (o == null)
values[finalName] = valuesObject;
else
{
@@ -446,7 +446,7 @@ package org.apache.flex.core
}
}
- if (inheritingStyles[valueName] !== null &&
+ if (inheritingStyles[valueName] != null &&
thisObject is IChild)
{
var parentObject:Object = IChild(thisObject).parent;
[3/7] git commit: [flex-asjs] [refs/heads/develop] - clean up if
statements
Posted by jm...@apache.org.
clean up if statements
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b5624611
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b5624611
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b5624611
Branch: refs/heads/develop
Commit: b562461170bc202a87aa9ce9be4faf43454c5847
Parents: 156cdea
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 26 08:36:17 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 26 08:36:17 2017 +1000
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/events/Event.as | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5624611/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
index 00f01e4..03d205a 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
@@ -113,9 +113,10 @@ package org.apache.flex.events
*/
public function isSameTarget(potentialTarget:IEventDispatcher):Boolean
{
- if (potentialTarget === target) return true;
- if (target is IFlexJSElement)
- if (IFlexJSElement(target).flexjs_wrapper === potentialTarget) return true;
+ if (potentialTarget === target)
+ return true;
+ if (target is IFlexJSElement && IFlexJSElement(target).flexjs_wrapper === potentialTarget)
+ return true;
return false;
}
@@ -184,9 +185,10 @@ package org.apache.flex.events
*/
public function isSameTarget(potentialTarget:IEventDispatcher):Boolean
{
- if (potentialTarget === target) return true;
- if (target is IFlexJSElement)
- if ((target as Object).flexjs_wrapper === potentialTarget) return true;
+ if (potentialTarget === target)
+ return true;
+ if (target is IFlexJSElement && (target as Object).flexjs_wrapper === potentialTarget)
+ return true;
return false;
}
[4/7] git commit: [flex-asjs] [refs/heads/develop] - set bubbles and
cancelable to values passed in and not set to true every time
Posted by jm...@apache.org.
set bubbles and cancelable to values passed in and not set to true every time
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b1f60562
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b1f60562
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b1f60562
Branch: refs/heads/develop
Commit: b1f605628cf6256ee64e987b1cd419e36d7477d4
Parents: b562461
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 26 08:40:47 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 26 08:40:47 2017 +1000
----------------------------------------------------------------------
.../projects/Core/src/main/flex/org/apache/flex/events/Event.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1f60562/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
index 03d205a..4bc5445 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/Event.as
@@ -143,8 +143,8 @@ package org.apache.flex.events
public function Event(type:String, bubbles:Boolean = false, cancelable:Boolean = false) {
super(type);
- this.bubbles = true;
- this.cancelable = true;
+ this.bubbles = bubbles;
+ this.cancelable = cancelable;
}
public var bubbles:Boolean;
[2/7] git commit: [flex-asjs] [refs/heads/develop] - add missing
cloneEvent methods
Posted by jm...@apache.org.
add missing cloneEvent methods
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/156cdeaa
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/156cdeaa
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/156cdeaa
Branch: refs/heads/develop
Commit: 156cdeaade65621dabc9b494abb07f0ebdd805df
Parents: a776466
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 26 08:26:10 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 26 08:26:10 2017 +1000
----------------------------------------------------------------------
.../main/flex/org/apache/flex/events/CustomEvent.as | 13 +++++++++++++
.../main/flex/org/apache/flex/events/DetailEvent.as | 12 ++++++++++++
.../main/flex/org/apache/flex/events/KeyboardEvent.as | 12 ++++++++++++
.../main/flex/org/apache/flex/events/ProgressEvent.as | 14 +++++++++++++-
.../flex/org/apache/flex/events/ValueChangeEvent.as | 13 +++++++++++++
.../main/flex/org/apache/flex/events/ValueEvent.as | 12 ++++++++++++
6 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/156cdeaa/frameworks/projects/Core/src/main/flex/org/apache/flex/events/CustomEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/CustomEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/CustomEvent.as
index ab3e173..8884bdc 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/CustomEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/CustomEvent.as
@@ -53,5 +53,18 @@ package org.apache.flex.events
{
super(type, bubbles, cancelable);
}
+
+ /**
+ * Create a copy/clone of the CustomEvent object.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function cloneEvent():IFlexJSEvent
+ {
+ return new CustomEvent(type, bubbles, cancelable);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/156cdeaa/frameworks/projects/Core/src/main/flex/org/apache/flex/events/DetailEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/DetailEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/DetailEvent.as
index 0e8817a..e916a83 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/DetailEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/DetailEvent.as
@@ -56,5 +56,17 @@ package org.apache.flex.events
*/
public var detail:String;
+ /**
+ * Create a copy/clone of the DetailEvent object.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function cloneEvent():IFlexJSEvent
+ {
+ return new DetailEvent(type, bubbles, cancelable, detail);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/156cdeaa/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
index a304735..3c626b1 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
@@ -116,5 +116,17 @@ package org.apache.flex.events
_specialKey = value;
}
+ /**
+ * Create a copy/clone of the KeyboardEvent object.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function cloneEvent():IFlexJSEvent
+ {
+ return new KeyboardEvent(type, key, code, shiftKey, altKey, ctrlKey, metaKey, bubbles, cancelable);
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/156cdeaa/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ProgressEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ProgressEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ProgressEvent.as
index f4f0150..cc15416 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ProgressEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ProgressEvent.as
@@ -74,6 +74,18 @@ package org.apache.flex.events
* @productversion FlexJS 0.0
*/
public static const PROGRESS:String = "progress";
-
+
+ /**
+ * Create a copy/clone of the ProgressEvent object.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function cloneEvent():IFlexJSEvent
+ {
+ return new ProgressEvent(type, bubbles, cancelable, current, total);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/156cdeaa/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueChangeEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueChangeEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueChangeEvent.as
index e7c93b0..983a529 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueChangeEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueChangeEvent.as
@@ -118,5 +118,18 @@ package org.apache.flex.events
event.source = source;
return event;
}
+
+ /**
+ * Create a copy/clone of the ValueChangeEvent object.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function cloneEvent():IFlexJSEvent
+ {
+ return new ValueChangeEvent(type, bubbles, cancelable, oldValue, newValue);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/156cdeaa/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueEvent.as
index 889f079..4845a18 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/ValueEvent.as
@@ -56,5 +56,17 @@ package org.apache.flex.events
*/
public var value:Object;
+ /**
+ * Create a copy/clone of the ValueEvent object.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function cloneEvent():IFlexJSEvent
+ {
+ return new ValueEvent(type, bubbles, cancelable, value);
+ }
}
}
[6/7] git commit: [flex-asjs] [refs/heads/develop] - can be null or
undefined here
Posted by jm...@apache.org.
can be null or undefined here
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4cf2969d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4cf2969d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4cf2969d
Branch: refs/heads/develop
Commit: 4cf2969d483c49a047b1d81d2893c6fbd0bd253d
Parents: 23f1b84
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 26 09:29:33 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 26 09:29:33 2017 +1000
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4cf2969d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index 70c597a..70ff04d 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -117,7 +117,7 @@ package org.apache.flex.core
mainClass = main;
- if (newValues === null)
+ if (newValues == null)
newValues = {};
if (cssData) {
[5/7] git commit: [flex-asjs] [refs/heads/develop] - host may not be
an IContainer
Posted by jm...@apache.org.
host may not be an IContainer
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/23f1b84f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/23f1b84f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/23f1b84f
Branch: refs/heads/develop
Commit: 23f1b84f4d26016998ec5859730702cfb604bb9e
Parents: b1f6056
Author: Justin Mclean <jm...@apache.org>
Authored: Fri May 26 09:29:11 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri May 26 09:29:11 2017 +1000
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/html/beads/ContainerView.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23f1b84f/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ContainerView.as
index ac723a9..fa86d6b 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ContainerView.as
@@ -382,7 +382,7 @@ package org.apache.flex.html.beads
// add the viewport's contentView to this host ONLY if
// the contentView is not the host itself, which is likely
// most situations.
- if (chost != viewport.contentView) {
+ if (chost != null && chost != viewport.contentView) {
chost.addElement(viewport.contentView);
}
}