diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-20 14:24:18 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-20 14:24:18 -0800 |
| commit | 47be353b7d55e2c025779caa8dcad6f65b187148 (patch) | |
| tree | 64639168dad5ad407a80df23443e37aa5c8d37e5 | |
| parent | ad845ffc2347b289c9ad480de370b50aa4f91d9f (diff) | |
| parent | f95b5b9b8002d0227f894dc6add43acf7994c0ed (diff) | |
| download | scala-47be353b7d55e2c025779caa8dcad6f65b187148.tar.gz scala-47be353b7d55e2c025779caa8dcad6f65b187148.tar.bz2 scala-47be353b7d55e2c025779caa8dcad6f65b187148.zip | |
Merge pull request #4351 from adriaanm/scaladoc-2.10
Scaladoc js location synch more robust
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js index 96689ae701..38dd248c29 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js @@ -70,7 +70,7 @@ function setFrameSrcFromUrlFragment() { var loc = fragment.split("@")[0].replace(/\./g, "/"); if(loc.indexOf(".html") < 0) loc += ".html"; if(fragment.indexOf('@') > 0) loc += ("#" + fragment.split("@", 2)[1]); - frames["template"].location.replace(loc); + frames["template"].location.replace(location.protocol + loc); } else frames["template"].location.replace("package.html"); |