diff --git a/dist/xrfragment.aframe.js b/dist/xrfragment.aframe.js index a78e06e..2ff409c 100644 --- a/dist/xrfragment.aframe.js +++ b/dist/xrfragment.aframe.js @@ -1096,6 +1096,14 @@ xrf.frag.href = function(v, opts){ }else mesh.material = mesh.material.clone() let click = mesh.userData.XRF.href.exec = (e) => { + + let teleport = () => { + console.log("teleport") + xrf + .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree + .then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF! + } + if( v.string[0] == '#' ){ let frag = xrf.URI.parse(v.string) if( frag.q ){ // show/hider @@ -1122,12 +1130,8 @@ xrf.frag.href = function(v, opts){ } }) - }else{ // teleport - xrf - .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree - .then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF! - } - } + }else teleport() + }else teleport() } let selected = (state) => () => { diff --git a/dist/xrfragment.three.js b/dist/xrfragment.three.js index eff8a4d..b66858c 100644 --- a/dist/xrfragment.three.js +++ b/dist/xrfragment.three.js @@ -1096,6 +1096,14 @@ xrf.frag.href = function(v, opts){ }else mesh.material = mesh.material.clone() let click = mesh.userData.XRF.href.exec = (e) => { + + let teleport = () => { + console.log("teleport") + xrf + .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree + .then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF! + } + if( v.string[0] == '#' ){ let frag = xrf.URI.parse(v.string) if( frag.q ){ // show/hider @@ -1122,12 +1130,8 @@ xrf.frag.href = function(v, opts){ } }) - }else{ // teleport - xrf - .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree - .then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF! - } - } + }else teleport() + }else teleport() } let selected = (state) => () => { diff --git a/dist/xrfragment.three.module.js b/dist/xrfragment.three.module.js index b636b91..2cd3c0c 100644 --- a/dist/xrfragment.three.module.js +++ b/dist/xrfragment.three.module.js @@ -1096,6 +1096,14 @@ xrf.frag.href = function(v, opts){ }else mesh.material = mesh.material.clone() let click = mesh.userData.XRF.href.exec = (e) => { + + let teleport = () => { + console.log("teleport") + xrf + .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree + .then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF! + } + if( v.string[0] == '#' ){ let frag = xrf.URI.parse(v.string) if( frag.q ){ // show/hider @@ -1122,12 +1130,8 @@ xrf.frag.href = function(v, opts){ } }) - }else{ // teleport - xrf - .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree - .then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF! - } - } + }else teleport() + }else teleport() } let selected = (state) => () => { diff --git a/src/3rd/js/three/xrf/href.js b/src/3rd/js/three/xrf/href.js index fc5852d..f9ea9f2 100644 --- a/src/3rd/js/three/xrf/href.js +++ b/src/3rd/js/three/xrf/href.js @@ -87,6 +87,14 @@ xrf.frag.href = function(v, opts){ }else mesh.material = mesh.material.clone() let click = mesh.userData.XRF.href.exec = (e) => { + + let teleport = () => { + console.log("teleport") + xrf + .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree + .then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF! + } + if( v.string[0] == '#' ){ let frag = xrf.URI.parse(v.string) if( frag.q ){ // show/hider @@ -113,12 +121,8 @@ xrf.frag.href = function(v, opts){ } }) - }else{ // teleport - xrf - .emit('href',{click:true,mesh,xrf:v}) // let all listeners agree - .then( () => xrf.navigator.to(v.string) ) // ok let's surf to HREF! - } - } + }else teleport() + }else teleport() } let selected = (state) => () => {