瀏覽代碼

give error message on local file access only when access was denied, extending hint on possible workarounds

pull/573/head
David von Oheimb 6 年之前
父節點
當前提交
e0869d1dbe
共有 1 個文件被更改,包括 10 次插入8 次删除
  1. +10
    -8
      src/standalone/standalone.js

+ 10
- 8
src/standalone/standalone.js 查看文件

@@ -84,6 +84,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;
@@ -98,11 +106,5 @@ function parseURLParameters() {
viewer = pannellum.viewer('container', configFromURL);
}

// Display error if opened from local file
if (false && 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();

Loading…
取消
儲存