You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/09/05 07:39:48 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - don't rename
id selectors
Repository: flex-falcon
Updated Branches:
refs/heads/develop 8884d0bcf -> c0742e3ae
don't rename id selectors
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/4a2f7b92
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/4a2f7b92
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/4a2f7b92
Branch: refs/heads/develop
Commit: 4a2f7b92510f0a8b9c64008b1ffd1875cb82966a
Parents: 8884d0b
Author: Alex Harui <ah...@apache.org>
Authored: Fri Sep 4 22:39:35 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Sep 4 22:39:35 2015 -0700
----------------------------------------------------------------------
.../internal/driver/js/flexjs/JSCSSCompilationSession.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4a2f7b92/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
index c7286ab..6add07b 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
@@ -119,7 +119,7 @@ public class JSCSSCompilationSession extends CSSCompilationSession
// add "." to type selectors that don't map cleanly
// to CSS type selectors to convert them to class
// selectors.
- if (!s.startsWith(".") && !s.startsWith("*"))
+ if (!s.startsWith(".") && !s.startsWith("*") && !s.startsWith("#"))
{
String condition = null;
int colon = s.indexOf(":");
[2/2] git commit: [flex-falcon] [refs/heads/develop] - fix wildcard
include files
Posted by ah...@apache.org.
fix wildcard include files
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c0742e3a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c0742e3a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c0742e3a
Branch: refs/heads/develop
Commit: c0742e3ae2d15e3ca40c6fce8d61a940f732cfab
Parents: 4a2f7b9
Author: Alex Harui <ah...@apache.org>
Authored: Fri Sep 4 22:40:05 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Sep 4 22:40:05 2015 -0700
----------------------------------------------------------------------
.../org/apache/flex/compiler/internal/targets/SWCTarget.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c0742e3a/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java b/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
index e1a6a33..7c9bae0 100644
--- a/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
+++ b/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
@@ -864,9 +864,8 @@ public class SWCTarget extends Target implements ISWCTarget
private Collection<File> getFiles(File file)
{
String filename = file.getAbsolutePath();
- int c = filename.lastIndexOf(File.separator);
- if (c != -1)
- filename = filename.substring(0, c);
+ if (filename.endsWith(File.separator))
+ filename = filename.substring(0, filename.length() - 1);
Collection<File> files = FileUtils.listFiles(new File(
filename), null, true);
return files;