zhouenguang преди 3 години
родител
ревизия
7f145a6f98
променени са 1 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 4 4
      web/public/static/js/main_2020_show.js

+ 4 - 4
web/public/static/js/main_2020_show.js

@@ -4859,7 +4859,7 @@ window.Modernizr = function(n, e, t) {
                       , o = null
                       , a1 = null;
                     //   console.error(this.destinationItem)
-                    if (r.isPano()) {
+                    if (r.isPano && r.isPano()) {
                     
                         //var s = 0 === this.destinationItem || e ? u.BLACK : this.nextWarpStyle;
                         //var walk = window.DATA.black ? 'black' : 'walk';
@@ -4887,7 +4887,7 @@ window.Modernizr = function(n, e, t) {
                     this.emit("update.controls") 
                     // 周恩光加 更新右侧导览当前位置
                     let pano = this.model.panos.index[r.panoId]
-                    this.player.emit("flying.ended", pano.position, oldPos, pano, oldPano) 
+                    pano && this.player.emit("flying.ended", pano.position, oldPos, pano, oldPano) 
                 }
             }
             ,
@@ -19851,7 +19851,7 @@ window.Modernizr = function(n, e, t) {
                     this.model.getHeroDescriptorByIndex(0); */
                 var i = this.model.getHeroDescriptorByIndex(e);
                 if (i) {
-                    var n = i.isPano() ? i.panoId : i.cameraMode;
+                    var n = i.isPano && i.isPano() ? i.panoId : i.cameraMode;
                     y.debug('ShowPath.getHeroDescriptorByHeroIndex() -> New brush/warp destination: "' + n + '" out of ' + t + " choices.")
                 }
                 return i
@@ -20315,7 +20315,7 @@ window.Modernizr = function(n, e, t) {
                     var o = this.getHeroDescriptorByHeroIndex(n);
                     if (null === o)
                         return i; 
-                    if (!o.isPano())
+                    if (!o.isPano || !o.isPano())
                         return i;
                     var s = this.getHeroPano(o)
                       , h = this.playerControls.cameras[a.PANORAMA]