Merge pull request #2 from emackey/standalone-patch-1

Adjust relative paths
CesiumGS · Nov 19, 2018 · 880ad06 · 880ad06
2 parents 0914c4f + 1871b93
commit 880ad06
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/Apps/Sandcastle/standalone.html b/Apps/Sandcastle/standalone.html
@@ -6,21 +6,27 @@
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
  <title>Cesium Demo</title>
  <script type="text/javascript" src="Sandcastle-header.js"></script>
+ <script type="text/javascript" src="Sandcastle-client.js"></script>
+ <script type="text/javascript" src="Sandcastle-helpers.js"></script>
  <script type="text/javascript" src="ThirdParty/pako.min.js"></script>
  <script type="text/javascript" src="../../ThirdParty/requirejs-2.1.20/require.js"></script>
  <script type="text/javascript">
  if(typeof require === 'function') {
  var urlParams = new URLSearchParams(window.location.search);
+
+ if (urlParams.has('gallery')) {
+ var galleryPath = urlParams.get('gallery');
+ document.head.innerHTML = document.head.innerHTML + '<base href="' + galleryPath + '" />';
+ }
+
  require.config({
- baseUrl : urlParams.has('gallery') ? '../../../' : '../../',
+ baseUrl : '../../../',
  waitSeconds : 120
  });
  }
  </script>
 </head>
 <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
-<script type="text/javascript" src="Sandcastle-client.js"></script>
-<script type="text/javascript" src="Sandcastle-helpers.js"></script>
 <script type="text/javascript">
 /*global pako,decodeBase64Data,embedInSandcastleTemplate */
 if (typeof require === 'function') {
@@ -68,11 +74,6 @@
  }
 
  if (window.location.hash.indexOf('#c=') === 0) {
- if (urlParams.has('gallery')) {
- var galleryPath = urlParams.get('gallery');
- document.head.innerHTML = document.head.innerHTML + '<base href="' + galleryPath + '" />';
- }
-
  var base64String = window.location.hash.substr(3);
  var data = decodeBase64Data(base64String);
  var html = data.html;