1 files changed, 17 insertions, 5 deletions

diff --git a/frontend/site/projects/museum/views/jakrawal.links.js b/frontend/site/projects/museum/views/jakrawal.links.js
index c69673c..884729a 100644
--- a/frontend/site/projects/museum/views/jakrawal.links.js
+++ b/frontend/site/projects/museum/views/jakrawal.links.js
@@ -20,13 +20,15 @@ const JAKRAWAL_TEXTS = [
 const RESET_STATE = {
   left: null,
   right: null,
+  vertical: false,
   lateralLink: null,
   verticalLink: null,
   text: null,
   hovering: false,
 }
 
-const VERTICAL_TIMEOUT = 40000
+const VERTICAL_TIMEOUT = 10000
+const AUTOADVANCE_TIMEOUT = 40000
 
 class JakrawalLinks extends Component {
   state = {
@@ -62,6 +64,7 @@ class JakrawalLinks extends Component {
     const isJakrawal = page_partz[0] === 'nilthamrong'
 
     if (!isJakrawal || page_partz[1] === 'home') {
+      clearTimeout(this.autoadvanceTimeout)
       clearTimeout(this.timeout)
       this.setState({
         ...RESET_STATE,
@@ -69,8 +72,9 @@ class JakrawalLinks extends Component {
       return      
     }
     if (page_partz[1] === 'a9') {
+      clearTimeout(this.autoadvanceTimeout)
       clearTimeout(this.timeout)
-      this.timeout = setTimeout(this.goVertical, VERTICAL_TIMEOUT)
+      this.autoadvanceTimeout = setTimeout(this.goVertical, AUTOADVANCE_TIMEOUT)
       this.setState({
         ...RESET_STATE,
         verticalLink: "home",
@@ -91,8 +95,12 @@ class JakrawalLinks extends Component {
       hovering: false,
     })
     if (!lastParams || lastParams.page_name !== ('nilthamrong' + lateralLink)) {
+      clearTimeout(this.autoadvanceTimeout)
+      this.autoadvanceTimeout = setTimeout(this.goVertical, AUTOADVANCE_TIMEOUT)
       clearTimeout(this.timeout)
-      this.timeout = setTimeout(this.goVertical, VERTICAL_TIMEOUT)
+      this.timeout = setTimeout(() => {
+        this.setState({ vertical: true })
+      }, VERTICAL_TIMEOUT)
     }
   }
 
@@ -114,10 +122,9 @@ class JakrawalLinks extends Component {
     if (!this.props.interactive || !text) return null
     return (
       <div>
+        {vertical && <div className="jakrawal-full" onClick={this.goVertical} />}
         {left && <div className="jakrawal-left" onClick={this.goLateral} />}
         {right && <div className="jakrawal-right" onClick={this.goLateral} />}
-        {text && <div className={hovering ? "jakrawal-text hovering" : "jakrawal-text"} dangerouslySetInnerHTML={{ __html: text }}></div>}
-        {text && <div className="jakrawal-text-icon" onMouseEnter={this.handleEnter} onMouseLeave={this.handleLeave}><img src="/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-103.png"/></div>}
       </div>
     )
   }
@@ -128,3 +135,8 @@ const mapStateToProps = state => ({
 })
 
 export default connect(mapStateToProps)(JakrawalLinks)
+
+/*
+  {text && <div className={hovering ? "jakrawal-text hovering" : "jakrawal-text"} dangerouslySetInnerHTML={{ __html: text }}></div>}
+  {text && <div className="jakrawal-text-icon" onMouseEnter={this.handleEnter} onMouseLeave={this.handleLeave}><img src="/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-103.png"/></div>}
+ */
\ No newline at end of file