Skip to content
Browse files

Version 0.3.3

  • Loading branch information...
1 parent a067a17 commit 6bf3b21763d9929b49f2c3ee4753916f97982b85 @rbackhouse rbackhouse committed Jun 12, 2012
View
2 org.dojotoolkit.optimizer.amd.rhinoast/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Rhinoast
Bundle-SymbolicName: org.dojotoolkit.optimizer.amd.rhinoast
-Bundle-Version: 0.3.2
+Bundle-Version: 0.3.3
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.dojotoolkit.optimizer
Import-Package: org.dojotoolkit.json,
View
BIN ...mizer.amd.rhinoast/org/dojotoolkit/optimizer/amd/rhinoast/AMDJSOptimizer$AstVisitor.class
Binary file not shown.
View
BIN ...optimizer.amd.rhinoast/org/dojotoolkit/optimizer/amd/rhinoast/AMDJSOptimizer$Module.class
Binary file not shown.
View
BIN ...oolkit.optimizer.amd.rhinoast/org/dojotoolkit/optimizer/amd/rhinoast/AMDJSOptimizer.class
Binary file not shown.
View
8 ...kit.optimizer.amd.rhinoast/src/org/dojotoolkit/optimizer/amd/rhinoast/AMDJSOptimizer.java
@@ -125,11 +125,9 @@ protected JSAnalysisDataImpl _getAnalysisData(String[] modules, JSAnalysisData[]
if (fullConfig.containsKey("excludes")) {
List<String> configExcludes = (List<String>)fullConfig.get("excludes");
for (String excludeModule : configExcludes) {
- if (excludeModule.charAt(0) != '/') {
- excludeModule = '/'+excludeModule;
- }
- if (!excludeList.contains(excludeModule)) {
- excludeList.add(excludeModule);
+ String excludeUri = idToUrl(excludeModule, cfg);
+ if (!excludeList.contains(excludeUri)) {
+ excludeList.add(excludeUri);
}
}
}
View
2 org.dojotoolkit.optimizer.amd/META-INF/MANIFEST.MF
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: AMD Optimizer
Bundle-SymbolicName: org.dojotoolkit.optimizer.amd;singleton:=true
-Bundle-Version: 0.3.2
+Bundle-Version: 0.3.3
View
7 org.dojotoolkit.optimizer.amd/loader/amd/zazl.js
@@ -312,9 +312,9 @@ var define;
moduleStack = [id];
if (isFunction(callback)) {
_require(dependencies, function() {
- moduleStack = savedStack;
callback.apply(null, arguments);
});
+ moduleStack = savedStack;
} else {
var mod = _require(dependencies, callback);
moduleStack = savedStack;
@@ -349,6 +349,11 @@ var define;
req.isXdUrl = function(url) {
return false;
};
+ req.idle = function() {
+ return pageLoaded;
+ };
+ req.on = function(type, cb) {
+ };
return req;
};
View
7 org.dojotoolkit.optimizer.amd/optimizer/amd/astwalker.js
@@ -488,11 +488,8 @@ function walker(uri, exclude, moduleMap, pluginRefList, missingNamesList, config
}
if (config.excludes) {
for (var i = 0; i < config.excludes.length; i++) {
- var excludeModule = config.excludes[i];
- if (excludeModule.charAt(0) != '/') {
- excludeModule = '/'+excludeModule;
- }
- exclude.push(excludeModule);
+ var excludeUri = idToUrl(config.excludes[i], config);
+ exclude.push(excludeUri);
}
}
if (config.astparser === "uglifyjs") {

0 comments on commit 6bf3b21

Please sign in to comment.
Something went wrong with that request. Please try again.