Permalink
Browse files

allow hook to alter used version

  • Loading branch information...
1 parent 3abcfdf commit 4e3fa4d57ce9998134e010cac9d5325da1884454 @guybedford committed Apr 9, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 @.js
View
2 @.js
@@ -370,7 +370,7 @@ define(['require'], function(req) {
// report that we're branching versions
if (haveVersion) {
if (self.onVersionConflict)
- self.onVersionConflict(baseName + subPath, versionRange, haveVersion, useVersion);
+ useVersion = self.onVersionConflict(baseName + subPath, versionRange, haveVersion, useVersion) || useVersion;
}
callback(moduleName, useVersion, supportedVersions[supportedVersions.length - 1] == useVersion);

0 comments on commit 4e3fa4d

Please sign in to comment.