subject:"Merging"

[25/50] [abbrv] git commit: [flex-asjs] [refs/heads/feature/amf] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the origi

2017-07-31 Thread piotrz

Made the text values of Tables consistant.
Fixed merging when span is after a table.
These changes should be back-ported to the original TLF as well.


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

Branch: refs/heads/feature/amf
Commit: 397cfc19bf7e360b31efd7f45e95176127aba8fb
Parents: 4eb3eaf
Author: Harbs 
Authored: Tue Jul 25 20:37:28 2017 +0300
Committer: Harbs 
Committed: Tue Jul 25 20:37:28 2017 +0300

--
 .../org/apache/flex/textLayout/elements/ParagraphElement.as  | 2 +-
 .../flex/org/apache/flex/textLayout/elements/SpanElement.as  | 4 +++-
 .../flex/org/apache/flex/textLayout/elements/TableElement.as | 8 
 3 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
index 04e7cd5..1f8129b 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
@@ -100,7 +100,7 @@ package org.apache.flex.textLayout.elements
public function createTextBlock():void
{
var tf:ITextFlow = getTextFlow();
-   if(tf == null)// if it's not in a text flow, we cannot 
create text blocaks yet
+   if(!tf)// if it's not in a text flow, we cannot create 
text blocks yet
return;
 // CONFIG::debug { assert(_textBlock == 
null,"createTextBlock called when there is already a textblock"); }
calculateComputedFormat();  // recreate the format 
BEFORE the _textBlock is created

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
index 0862061..15cf8a1 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
@@ -533,7 +533,9 @@ package org.apache.flex.textLayout.elements
if (myidx != 0)
{
var sib:SpanElement = 
parent.getChildAt(myidx-1) as SpanElement;
-   
+   // If the previous sibling is a 
TableElement, we need to preserve the span.
+   if(sib.className == "TableElement")
+   return false;
// If the element we're checking for 
merge has only the terminator, and the previous element
// is not a Span, then we always merge 
with the previous span (NOT the previous sib). 
// We just remove this span, and add 
the terminator to the previous span.

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
index d9a1fa8..59d11c5 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
@@ -1327,6 +1327,14 @@ package org.apache.flex.textLayout.elements {
override public function get textLength():int{
return 1;
}
+   /* @private */
+   override public function getText(relativeStart:int = 0, 
relativeEnd:int = -1, parag

[12/13] git commit: [flex-asjs] [refs/heads/feature/browser-event] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the ori

2017-07-25 Thread harbs

Made the text values of Tables consistant.
Fixed merging when span is after a table.
These changes should be back-ported to the original TLF as well.


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

Branch: refs/heads/feature/browser-event
Commit: 397cfc19bf7e360b31efd7f45e95176127aba8fb
Parents: 4eb3eaf
Author: Harbs 
Authored: Tue Jul 25 20:37:28 2017 +0300
Committer: Harbs 
Committed: Tue Jul 25 20:37:28 2017 +0300

--
 .../org/apache/flex/textLayout/elements/ParagraphElement.as  | 2 +-
 .../flex/org/apache/flex/textLayout/elements/SpanElement.as  | 4 +++-
 .../flex/org/apache/flex/textLayout/elements/TableElement.as | 8 
 3 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
index 04e7cd5..1f8129b 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
@@ -100,7 +100,7 @@ package org.apache.flex.textLayout.elements
public function createTextBlock():void
{
var tf:ITextFlow = getTextFlow();
-   if(tf == null)// if it's not in a text flow, we cannot 
create text blocaks yet
+   if(!tf)// if it's not in a text flow, we cannot create 
text blocks yet
return;
 // CONFIG::debug { assert(_textBlock == 
null,"createTextBlock called when there is already a textblock"); }
calculateComputedFormat();  // recreate the format 
BEFORE the _textBlock is created

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
index 0862061..15cf8a1 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
@@ -533,7 +533,9 @@ package org.apache.flex.textLayout.elements
if (myidx != 0)
{
var sib:SpanElement = 
parent.getChildAt(myidx-1) as SpanElement;
-   
+   // If the previous sibling is a 
TableElement, we need to preserve the span.
+   if(sib.className == "TableElement")
+   return false;
// If the element we're checking for 
merge has only the terminator, and the previous element
// is not a Span, then we always merge 
with the previous span (NOT the previous sib). 
// We just remove this span, and add 
the terminator to the previous span.

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
index d9a1fa8..59d11c5 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
@@ -1327,6 +1327,14 @@ package org.apache.flex.textLayout.elements {
override public function get textLength():int{
return 1;
}
+   /* @private */
+   override public function getText(relativeStart:int = 0, 
relativeEnd:int = -1, parag

git commit: [flex-asjs] [refs/heads/develop] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the original TLF as well.

2017-07-25 Thread harbs

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 4eb3eaf38 -> 397cfc19b


Made the text values of Tables consistant.
Fixed merging when span is after a table.
These changes should be back-ported to the original TLF as well.


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

Branch: refs/heads/develop
Commit: 397cfc19bf7e360b31efd7f45e95176127aba8fb
Parents: 4eb3eaf
Author: Harbs 
Authored: Tue Jul 25 20:37:28 2017 +0300
Committer: Harbs 
Committed: Tue Jul 25 20:37:28 2017 +0300

--
 .../org/apache/flex/textLayout/elements/ParagraphElement.as  | 2 +-
 .../flex/org/apache/flex/textLayout/elements/SpanElement.as  | 4 +++-
 .../flex/org/apache/flex/textLayout/elements/TableElement.as | 8 
 3 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
index 04e7cd5..1f8129b 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ParagraphElement.as
@@ -100,7 +100,7 @@ package org.apache.flex.textLayout.elements
public function createTextBlock():void
{
var tf:ITextFlow = getTextFlow();
-   if(tf == null)// if it's not in a text flow, we cannot 
create text blocaks yet
+   if(!tf)// if it's not in a text flow, we cannot create 
text blocks yet
return;
 // CONFIG::debug { assert(_textBlock == 
null,"createTextBlock called when there is already a textblock"); }
calculateComputedFormat();  // recreate the format 
BEFORE the _textBlock is created

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
index 0862061..15cf8a1 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
@@ -533,7 +533,9 @@ package org.apache.flex.textLayout.elements
if (myidx != 0)
{
var sib:SpanElement = 
parent.getChildAt(myidx-1) as SpanElement;
-   
+   // If the previous sibling is a 
TableElement, we need to preserve the span.
+   if(sib.className == "TableElement")
+   return false;
// If the element we're checking for 
merge has only the terminator, and the previous element
// is not a Span, then we always merge 
with the previous span (NOT the previous sib). 
// We just remove this span, and add 
the terminator to the previous span.

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/397cfc19/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
--
diff --git 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
index d9a1fa8..59d11c5 100644
--- 
a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
+++ 
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/TableElement.as
@@ -1327,6 +1327,14 @@ package org.apache.flex.textLayout.elements {
override public function get textLength():int{
return 1;
}
+   /* @private */
+   override public function getText(r

[02/50] git commit: [flex-asjs] [refs/heads/master] - Merging

2016-09-07 Thread aharui

Merging


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

Branch: refs/heads/master
Commit: a94a92300af057c7810c5309d35dfbb4195e4836
Parents: 518995e 9cd2852
Author: yishayw 
Authored: Thu Jul 28 02:52:35 2016 +0300
Committer: yishayw 
Committed: Thu Jul 28 02:52:35 2016 +0300

--
 .gitignore  |  1 +
 distribution/src/main/assembly/component.xml|  7 ++-
 .../main/resources/frameworks/flex-config.xml   |  6 ++-
 .../flex/binding/ApplicationDataBinding.as  | 20 +--
 .../apache/flex/binding/ContainerDataBinding.as | 20 +--
 .../flex/binding/MXMLBeadViewDataBinding.as | 20 +--
 .../org/apache/flex/binding/ViewDataBinding.as  | 16 +-
 frameworks/projects/Graphics/pom.xml|  4 ++
 .../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 
 .../src/main/resources/basic-manifest.xml   |  9 
 .../src/main/resources/svg-manifest.xml | 30 +++
 manualtests/.gitignore  |  1 +
 12 files changed, 169 insertions(+), 21 deletions(-)
--

[03/50] [abbrv] git commit: [flex-asjs] [refs/heads/spark] - Merging

2016-08-25 Thread aharui

Merging


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

Branch: refs/heads/spark
Commit: a94a92300af057c7810c5309d35dfbb4195e4836
Parents: 518995e 9cd2852
Author: yishayw 
Authored: Thu Jul 28 02:52:35 2016 +0300
Committer: yishayw 
Committed: Thu Jul 28 02:52:35 2016 +0300

--
 .gitignore  |  1 +
 distribution/src/main/assembly/component.xml|  7 ++-
 .../main/resources/frameworks/flex-config.xml   |  6 ++-
 .../flex/binding/ApplicationDataBinding.as  | 20 +--
 .../apache/flex/binding/ContainerDataBinding.as | 20 +--
 .../flex/binding/MXMLBeadViewDataBinding.as | 20 +--
 .../org/apache/flex/binding/ViewDataBinding.as  | 16 +-
 frameworks/projects/Graphics/pom.xml|  4 ++
 .../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 
 .../src/main/resources/basic-manifest.xml   |  9 
 .../src/main/resources/svg-manifest.xml | 30 +++
 manualtests/.gitignore  |  1 +
 12 files changed, 169 insertions(+), 21 deletions(-)
--

[6/6] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merging transform changes into refactor-sprite

2016-08-02 Thread yishayw

Merging transform changes into refactor-sprite


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

Branch: refs/heads/refactor-sprite
Commit: 5cd2f76a2becbdb372807f8f6a43868c336b9cfe
Parents: 5cf11ab 2124051
Author: yishayw 
Authored: Tue Aug 2 11:50:34 2016 +0300
Committer: yishayw 
Committed: Tue Aug 2 11:50:34 2016 +0300

--
 .../projects/Core/src/main/flex/CoreClasses.as  |  1 +
 .../org/apache/flex/core/ITransformModel.as |  6 +-
 .../apache/flex/core/TransformCompoundModel.as  | 63 
 .../flex/org/apache/flex/core/TransformModel.as | 26 +--
 .../org/apache/flex/core/TransformMoveXModel.as | 22 +-
 .../org/apache/flex/core/TransformMoveYModel.as | 22 +-
 .../apache/flex/core/TransformRotateModel.as| 22 +-
 .../org/apache/flex/core/TransformScaleModel.as | 22 +-
 .../main/flex/org/apache/flex/geom/IMatrix.as   | 20 +-
 .../main/flex/org/apache/flex/geom/Matrix.as| 76 +---
 .../flex/org/apache/flex/geom/MeagerMatrix.as   | 30 
 .../Graphics/src/main/flex/GraphicsClasses.as   |  2 +-
 .../flex/org/apache/flex/svg/TransformBead.as   | 24 ++-
 13 files changed, 279 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cd2f76a/frameworks/projects/Core/src/main/flex/CoreClasses.as
--

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cd2f76a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/IMatrix.as
--
diff --cc frameworks/projects/Core/src/main/flex/org/apache/flex/geom/IMatrix.as
index 352fe52,abc6348..d4afcb6
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/IMatrix.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/IMatrix.as
@@@ -16,4 -34,4 +34,4 @@@ package org.apache.flex.geo
function set ty(value:Number):void;
function clone():IMatrix
}
--}
++}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5cd2f76a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/MeagerMatrix.as
--
diff --cc 
frameworks/projects/Core/src/main/flex/org/apache/flex/geom/MeagerMatrix.as
index 172f30f,595b64d..6c50c59
--- 
a/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/MeagerMatrix.as
+++ 
b/frameworks/projects/Core/src/main/flex/org/apache/flex/geom/MeagerMatrix.as
@@@ -103,4 -103,4 +103,4 @@@ package org.apache.flex.geo
return new MeagerMatrix(a, b, c, d, tx, ty);
}
}
--}
++}

[02/10] git commit: [flex-asjs] [refs/heads/develop] - Merging

2016-07-31 Thread yishayw

Merging


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

Branch: refs/heads/develop
Commit: a94a92300af057c7810c5309d35dfbb4195e4836
Parents: 518995e 9cd2852
Author: yishayw 
Authored: Thu Jul 28 02:52:35 2016 +0300
Committer: yishayw 
Committed: Thu Jul 28 02:52:35 2016 +0300

--
 .gitignore  |  1 +
 distribution/src/main/assembly/component.xml|  7 ++-
 .../main/resources/frameworks/flex-config.xml   |  6 ++-
 .../flex/binding/ApplicationDataBinding.as  | 20 +--
 .../apache/flex/binding/ContainerDataBinding.as | 20 +--
 .../flex/binding/MXMLBeadViewDataBinding.as | 20 +--
 .../org/apache/flex/binding/ViewDataBinding.as  | 16 +-
 frameworks/projects/Graphics/pom.xml|  4 ++
 .../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 
 .../src/main/resources/basic-manifest.xml   |  9 
 .../src/main/resources/svg-manifest.xml | 30 +++
 manualtests/.gitignore  |  1 +
 12 files changed, 169 insertions(+), 21 deletions(-)
--

[2/7] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merging

2016-07-28 Thread harbs

Merging


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

Branch: refs/heads/refactor-sprite
Commit: a94a92300af057c7810c5309d35dfbb4195e4836
Parents: 518995e 9cd2852
Author: yishayw 
Authored: Thu Jul 28 02:52:35 2016 +0300
Committer: yishayw 
Committed: Thu Jul 28 02:52:35 2016 +0300

--
 .gitignore  |  1 +
 distribution/src/main/assembly/component.xml|  7 ++-
 .../main/resources/frameworks/flex-config.xml   |  6 ++-
 .../flex/binding/ApplicationDataBinding.as  | 20 +--
 .../apache/flex/binding/ContainerDataBinding.as | 20 +--
 .../flex/binding/MXMLBeadViewDataBinding.as | 20 +--
 .../org/apache/flex/binding/ViewDataBinding.as  | 16 +-
 frameworks/projects/Graphics/pom.xml|  4 ++
 .../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 
 .../src/main/resources/basic-manifest.xml   |  9 
 .../src/main/resources/svg-manifest.xml | 30 +++
 manualtests/.gitignore  |  1 +
 12 files changed, 169 insertions(+), 21 deletions(-)
--

[2/2] git commit: [flex-asjs] [refs/heads/svg-rename] - Merging

2016-07-28 Thread yishayw

Merging


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

Branch: refs/heads/svg-rename
Commit: a94a92300af057c7810c5309d35dfbb4195e4836
Parents: 518995e 9cd2852
Author: yishayw 
Authored: Thu Jul 28 02:52:35 2016 +0300
Committer: yishayw 
Committed: Thu Jul 28 02:52:35 2016 +0300

--
 .gitignore  |  1 +
 distribution/src/main/assembly/component.xml|  7 ++-
 .../main/resources/frameworks/flex-config.xml   |  6 ++-
 .../flex/binding/ApplicationDataBinding.as  | 20 +--
 .../apache/flex/binding/ContainerDataBinding.as | 20 +--
 .../flex/binding/MXMLBeadViewDataBinding.as | 20 +--
 .../org/apache/flex/binding/ViewDataBinding.as  | 16 +-
 frameworks/projects/Graphics/pom.xml|  4 ++
 .../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 
 .../src/main/resources/basic-manifest.xml   |  9 
 .../src/main/resources/svg-manifest.xml | 30 +++
 manualtests/.gitignore  |  1 +
 12 files changed, 169 insertions(+), 21 deletions(-)
--

git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - - Made the externs build again after merging in the latest changes.

2016-04-22 Thread cdutz

Repository: flex-falcon
Updated Branches:
  refs/heads/feature/maven-migration-test 6bd222bd2 -> 28f5f13c9


- Made the externs build again after merging in the latest changes.


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

Branch: refs/heads/feature/maven-migration-test
Commit: 28f5f13c94d9e55b4c5745610109aff64e11ce42
Parents: 6bd222b
Author: Christofer Dutz 
Authored: Fri Apr 22 15:02:03 2016 +0200
Committer: Christofer Dutz 
Committed: Fri Apr 22 15:02:03 2016 +0200

--
 externs/jquery/pom.xml| 22 ++
 externs/js/src/main/config/externc-config.xml | 26 --
 2 files changed, 22 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/28f5f13c/externs/jquery/pom.xml
--
diff --git a/externs/jquery/pom.xml b/externs/jquery/pom.xml
index a137557..c37b94b 100644
--- a/externs/jquery/pom.xml
+++ b/externs/jquery/pom.xml
@@ -61,6 +61,28 @@
 
 
 org.apache.flex.flexjs.compiler
+compiler-build-tools
+0.6.0-SNAPSHOT
+
+
+pre-jquery-dollar-global
+validate
+
+pre-process-sources
+
+
+
+(\* 
@const\s+)([\*\s/]+var \$)$1* @type 
{jQuery}\n$2
+
+
+jquery-1.9.js
+
+
+
+
+
+
+org.apache.flex.flexjs.compiler
 flexjs-maven-plugin
 0.6.0-SNAPSHOT
 true

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/28f5f13c/externs/js/src/main/config/externc-config.xml
--
diff --git a/externs/js/src/main/config/externc-config.xml 
b/externs/js/src/main/config/externc-config.xml
index 8ce6c29..498cd27 100644
--- a/externs/js/src/main/config/externc-config.xml
+++ b/externs/js/src/main/config/externc-config.xml
@@ -138,32 +138,6 @@
 String
 valueOf
 
-FontFaceSetdelete
-
-CSSStyleDeclarationcssText
-CSSStyleRulestyle
-CSSFontFaceRulestyle
-CSSPageRulestyle
-
-Generatorthrow
-Generatorreturn
-HTMLMenuItemElementdefault
-MessageEventdata
-
MessageEventinitMessageEventNS 

-
MessageEventinitMessageEvent 

-MessageEventdefault
-Objectis
-Promisecatch
-
-IDBCursorcontinue
-IDBCursordelete
-IDBObjectStoredelete
-
-
-Iteratornext
-Generatornext
-LinkStylesheet
-
 
 SVGStylableclassName
 SVGStylablestyle

[2/2] git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - - Made the externs build again after merging in the latest changes.

2016-04-22 Thread cdutz

- Made the externs build again after merging in the latest changes.


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

Branch: refs/heads/feature/maven-migration-test
Commit: 6bd222bd25c7d6c6a1d8985c14dbd39b7e206ffc
Parents: dd50334 ce38e3e
Author: Christofer Dutz 
Authored: Fri Apr 22 15:01:21 2016 +0200
Committer: Christofer Dutz 
Committed: Fri Apr 22 15:01:21 2016 +0200

--

--

Merging

2015-12-14 Thread Alex Harui

Hi,

I think flex-asjs has never had the master branch updated, so I am going
to do that shortly.  Apologies in advance for the tons of commits emails
that I think will ensue.

We are also almost ready to merge the back port branch into develop.
Probably not today, but I hope early this week.

-Alex

[5/6] git commit: [flex-falcon] - fix a few issues after merging Erik's changes

2013-04-19 Thread aharui

fix a few issues after merging Erik's changes


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

Branch: refs/heads/develop
Commit: 123afb7587d1de2bf32af275bd584c995bf9390b
Parents: feb25bf
Author: Alex Harui 
Authored: Fri Apr 19 12:27:43 2013 -0700
Committer: Alex Harui 
Committed: Fri Apr 19 12:27:43 2013 -0700

--
 .../codegen/js/flexjs/TestFlexJSExpressions.java   |4 +-
 .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java |   40 ---
 2 files changed, 23 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/123afb75/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
--
diff --git 
a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
 
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
index 56d0aef..8e6bd86 100644
--- 
a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
+++ 
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
@@ -512,7 +512,7 @@ public class TestFlexJSExpressions extends 
TestGoogExpressions
 IFunctionNode.class, WRAP_LEVEL_PACKAGE, true);
 asBlockWalker.visitFunction(node);
 // String.length is a getter but is a property in JS, so don't 
generate set_length() call.
-assertOut("/**\n * @expose\n * @return {number}\n 
*/\nfoo.bar.B.prototype.b = function() {\n\tvar self = this;\n\tvar /** @type 
{Vector.} */ a;\n\treturn a.length;\n}");
+assertOut("/**\n * @expose\n * @return {number}\n 
*/\nfoo.bar.B.prototype.b = function() {\n\tvar /** @type {Vector.} */ 
a;\n\treturn a.length;\n}");
 }
 
 //--
@@ -540,7 +540,7 @@ public class TestFlexJSExpressions extends 
TestGoogExpressions
 {
 IFunctionNode node = getMethod("function foo(b:Boolean):Boolean {var 
c:String; var d:String; if (!(b ? c : d)) { return b;}");
 asBlockWalker.visitFunction(node);
-assertOut("/**\n * @param {boolean} b\n * @return {boolean}\n 
*/\nFalconTest_A.prototype.foo = function(b) {\n\tvar self = this;\n\tvar /** 
@type {string} */ c;\n\tvar /** @type {string} */ d;\n\tif (!(b ? c : d)) 
{\n\t\treturn b;\n\t}\n}");
+assertOut("/**\n * @param {boolean} b\n * @return {boolean}\n 
*/\nFalconTest_A.prototype.foo = function(b) {\n\tvar /** @type {string} */ 
c;\n\tvar /** @type {string} */ d;\n\tif (!(b ? c : d)) {\n\t\treturn 
b;\n\t}\n}");
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/123afb75/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
--
diff --git 
a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
 
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 6e18b20..0f10cd8 100644
--- 
a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ 
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -630,29 +630,31 @@ public class MXMLFlexJSEmitter extends MXMLEmitter 
implements
 .getCompilationUnitForDefinition(cdef);
 ArrayList deps = project.getRequires(cu);
 
-for (String imp : deps)
+if (deps != null)
 {
-if (imp.indexOf(JSGoogEmitterTokens.AS3.getToken()) != -1)
-continue;
-
-if (imp.equals(cname))
-continue;
-
-if (imp.equals("mx.events.PropertyChangeEvent"))
-continue;
-if (imp.equals("mx.events.PropertyChangeEventKind"))
-continue;
-
-if (NativeUtils.isNative(imp))
-continue;
-
-if (writtenInstances.indexOf(imp) == -1)
+for (String imp : deps)
 {
-emitHeaderLine(imp);
-writtenInstances.add(imp);
+if (imp.indexOf(JSGoogEmitterTokens.AS3.getToken()) != -1)
+continue;
+
+if (imp.equals(cname))
+continue;
+
+if (imp.equals("mx.events.PropertyChangeEvent"))
+continue;
+

[25/50] [abbrv] git commit: [flex-asjs] [refs/heads/feature/amf] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the origi

[12/13] git commit: [flex-asjs] [refs/heads/feature/browser-event] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the ori

git commit: [flex-asjs] [refs/heads/develop] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the original TLF as well.

[02/50] git commit: [flex-asjs] [refs/heads/master] - Merging

[03/50] [abbrv] git commit: [flex-asjs] [refs/heads/spark] - Merging

[6/6] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merging transform changes into refactor-sprite

[02/10] git commit: [flex-asjs] [refs/heads/develop] - Merging

[2/7] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merging

[2/2] git commit: [flex-asjs] [refs/heads/svg-rename] - Merging

git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - - Made the externs build again after merging in the latest changes.

[2/2] git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - - Made the externs build again after merging in the latest changes.

Merging

[5/6] git commit: [flex-falcon] - fix a few issues after merging Erik's changes

13 matches

Site Navigation

Mail list logo

Footer information