Bladeren bron

漫游可行可能多出一些没有写在somedata里的pano

xzw 5 jaren geleden
bovenliggende
commit
5f8358b597
2 gewijzigde bestanden met toevoegingen van 7 en 4 verwijderingen
  1. 4 2
      js/main_2020_edit.js
  2. 3 2
      js/main_2020_show.js

+ 4 - 2
js/main_2020_edit.js

@@ -16661,7 +16661,7 @@ function o(a, s, l) {
             }
             ,
             t.prototype.loadOverlays = function(overlays){
-                var overlays = window.data2.overlays /* ||
+                var overlays = window.data2 && window.data2.overlays /* ||
                  [
                     { depth: 0.02,
                     file: "https://super.4dage.com/data/TEST/overlay/b6fe7cb6bd2b6.mp4",
@@ -16742,7 +16742,9 @@ function o(a, s, l) {
                 var e = new y(this);
                 return this.loadPanosPromise = e.load().then(function(e) {
                     return this.data.sweeps && 0 < Object.keys(this.data.sweeps).length && (e = e.filter(function(e) {
-                        return this.data.sweeps[e.uuid].enabled
+                        if(this.data.sweeps[e.uuid])return this.data.sweeps[e.uuid].enabled
+                        else console.log(e.uuid)
+                        //return this.data.sototype.loadOverlaysweeps[e.uuid].enabled
                     }
                     .bind(this))),
                     this.panos.extend(e.map(function(e) {

+ 3 - 2
js/main_2020_show.js

@@ -17415,7 +17415,7 @@ window.Modernizr = function(n, e, t) {
 				
 
             n.prototype.loadOverlays = function(overlays){
-                var overlays = window.data2.overlays  
+                var overlays = window.data2 && window.data2.overlays  
                   
                 
                 overlays && overlays.forEach((info)=>{ 
@@ -17491,7 +17491,8 @@ window.Modernizr = function(n, e, t) {
                 var e = new I(this);
                 return this.loadPanosPromise = e.load().then(function(e) {
                     return this.data.sweeps && Object.keys(this.data.sweeps).length > 0 && (e = e.filter(function(e) {
-                        return this.data.sweeps[e.uuid].enabled
+                        if(this.data.sweeps[e.uuid])return this.data.sweeps[e.uuid].enabled
+                        else console.log(e.uuid)
                     }
                     .bind(this))),
                     this.panos.extend(e.map(function(e) {