Merge e0869d1dbe into 1eaccef60f

1 月之前 · 2438ff9f49
--- a/pannellum.htm
+++ b/pannellum.htm
@@ -0,0 +1,23 @@
 <!DOCTYPE HTML>
 <html>
 <head>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Pannellum</title>
  <link type="text/css" rel="Stylesheet" href="src/css/pannellum.css"/>
  <link type="text/css" rel="Stylesheet" href="src/standalone/standalone.css"/>
 </head>
 <body>
 <div id="container">
  <noscript>
    <div class="pnlm-info-box">
      <p>Javascript is required to view this panorama.<br>(It could be worse; you could need a plugin.)</p>
    </div>
  </noscript>
 </div>
 <script type="text/javascript" src="src/js/libpannellum.js"></script>
 <script type="text/javascript" src="src/js/RequestAnimationFrame.js"></script>
 <script type="text/javascript" src="src/js/pannellum.js"></script>
 <script type="text/javascript" src="src/standalone/standalone.js"></script>
 </body>
 </html>
--- a/src/js/pannellum.js
+++ b/src/js/pannellum.js
@@ -416,7 +416,7 @@ function init() {
            
            xhr = new XMLHttpRequest();
            xhr.onloadend = function() {
                if (xhr.status != 200) {
                if (xhr.status != 200 && xhr.status != 0) {
                    // Display error if image can't be loaded
                    var a = document.createElement('a');
                    a.href = p;
--- a/src/standalone/standalone.js
+++ b/src/standalone/standalone.js
@@ -83,7 +83,7 @@ function parseURLParameters() {
        // Get JSON configuration file
        request = new XMLHttpRequest();
        request.onload = function() {
            if (request.status != 200) {
            if (request.status != 200 && request.status != 0) {
                // Display error if JSON can't be loaded
                var a = document.createElement('a');
                a.href = configFromURL.config;
@@ -114,6 +114,14 @@ function parseURLParameters() {
            configFromURL.escapeHTML = true;
            viewer = pannellum.viewer('container', configFromURL);
        };
        request.onerror = function(e) {
            // Display error if opened from local file
            if (window.location.protocol == 'file:')
                anError('Due to browser security restrictions, loading Pannellum files from the local filesystem has been denied; ' +
                        'use the Chrome/Opera command-line option "--allow-file-access-from-files" or some sort of local web server.');
            else
                anError("Error loading "+configFromURL.config);
        }
        request.open('GET', configFromURL.config);
        request.send();
        return;
@@ -129,11 +137,5 @@ function parseURLParameters() {
    viewer = pannellum.viewer('container', configFromURL);
 }

 // Display error if opened from local file
 if (window.location.protocol == 'file:') {
    anError('Due to browser security restrictions, Pannellum can\'t be run ' +
        'from the local filesystem; some sort of web server must be used.');
 } else {
    // Initialize viewer
    parseURLParameters();
 }
 // Initialize viewer
 parseURLParameters();