Created
September 6, 2013 06:55
-
-
Save vstorm83/6460392 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/src/main/java/juzu/impl/plugin/asset/AssetResolver.java b/core/src/main/java/juzu/impl/plugin/asset/AssetResolver.java | |
index e032169..8b7b7e2 100644 | |
--- a/core/src/main/java/juzu/impl/plugin/asset/AssetResolver.java | |
+++ b/core/src/main/java/juzu/impl/plugin/asset/AssetResolver.java | |
@@ -15,12 +15,12 @@ | |
*/ | |
package juzu.impl.plugin.asset; | |
-import juzu.asset.AssetLocation; | |
-import juzu.impl.resource.ResourceResolver; | |
- | |
import javax.inject.Inject; | |
+ | |
import java.net.URL; | |
+import juzu.impl.resource.ResourceResolver; | |
+ | |
/** @author Julien Viet */ | |
public class AssetResolver implements ResourceResolver { | |
@@ -30,12 +30,6 @@ public class AssetResolver implements ResourceResolver { | |
URL url = plugin.scriptManager.resolveAsset(uri); | |
if (url == null) { | |
url = plugin.stylesheetManager.resolveAsset(uri); | |
- if (url == null) { | |
- String assetsPath = plugin.getAssetsPath(); | |
- if (assetsPath != null && uri.startsWith(assetsPath)) { | |
- url = plugin.resolve(AssetLocation.APPLICATION, uri); | |
- } | |
- } | |
} | |
return url; | |
} | |
diff --git a/core/src/test/resources/plugin/amd/define/package-info.java b/core/src/test/resources/plugin/amd/define/package-info.java | |
index d866db1..e68d226 100644 | |
--- a/core/src/test/resources/plugin/amd/define/package-info.java | |
+++ b/core/src/test/resources/plugin/amd/define/package-info.java | |
@@ -6,5 +6,7 @@ | |
dependencies = {@juzu.plugin.amd.Dependency(id = "Foo", alias = "foo")} | |
) | |
}) | |
+//Test if ModuleResolver works properly with AssetResolver | |
[email protected]() | |
@juzu.Application | |
package plugin.amd.define; | |
\ No newline at end of file |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment