You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2015/06/27 21:48:47 UTC

[1/2] git commit: [flex-falcon] [refs/heads/develop] - Added jasmine externs - forgot in last commit

Repository: flex-falcon
Updated Branches:
  refs/heads/develop a305f10ad -> 73da15442


Added jasmine externs - forgot in last commit


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

Branch: refs/heads/develop
Commit: d06428e9892d6e8e79f4d4520ca32cb9f6f67e67
Parents: a305f10
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Sat Jun 27 20:45:38 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Sat Jun 27 20:45:38 2015 +0100

----------------------------------------------------------------------
 externs/jasmine/jasmine-compile-config.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d06428e9/externs/jasmine/jasmine-compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/jasmine/jasmine-compile-config.xml b/externs/jasmine/jasmine-compile-config.xml
index 94d5bf2..9be48ac 100644
--- a/externs/jasmine/jasmine-compile-config.xml
+++ b/externs/jasmine/jasmine-compile-config.xml
@@ -35,5 +35,10 @@
     </external>
     
     <as-root>out/as</as-root>
+	
+	<field-exclude>
+        <class>jasmine.Spec</class>
+        <field>$injector</field>
+    </field-exclude>
 
 </flex-config>


[2/2] git commit: [flex-falcon] [refs/heads/develop] - Fix: EXTERNC - IMPORT NOT EMITTED

Posted by ft...@apache.org.
Fix: EXTERNC - IMPORT NOT EMITTED

Added new lines after import.


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

Branch: refs/heads/develop
Commit: 73da15442ee990be119a404939cb9adc8e616743
Parents: d06428e
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Sat Jun 27 20:48:29 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Sat Jun 27 20:48:29 2015 +0100

----------------------------------------------------------------------
 .../internal/codegen/externals/reference/FunctionReference.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/73da1544/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
index 8232d69..a64d317 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
@@ -121,7 +121,7 @@ public class FunctionReference extends BaseReference
         final String returnType = transformReturnString();
         if (returnType.contains("."))
         {
-            sb.append("import ").append(returnType).append(";");
+            sb.append("import ").append(returnType).append(";\n\n");
         }
 
     }