From 879bf2cc2cc45bc69b42083829c4e0105e6e6a93 Mon Sep 17 00:00:00 2001 From: tarelli Date: Fri, 5 Jun 2020 16:17:15 +0100 Subject: [PATCH] Remove SPOTLIGHT_HINT and its timer --- js/common/GEPPETTO.Resources.js | 2 -- js/components/interface/loadingSpinner/LoadingSpinner.js | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/js/common/GEPPETTO.Resources.js b/js/common/GEPPETTO.Resources.js index 8dbb70898..faced5489 100644 --- a/js/common/GEPPETTO.Resources.js +++ b/js/common/GEPPETTO.Resources.js @@ -150,8 +150,6 @@ export default function (GEPPETTO) { ADDING_VARIABLE: "Adding variable", - SPOTLIGHT_HINT: "Did you know you can rapidly access the data once it gets loaded using Ctrl+Space?", - LOADING_SIMULATION_SLOW: "Still loading, but things are taking longer than expected. Do you have a low bandwidth connection?", SIMULATION_NOT_RUNNING: "Unable to stop simulation, loaded but not running", diff --git a/js/components/interface/loadingSpinner/LoadingSpinner.js b/js/components/interface/loadingSpinner/LoadingSpinner.js index e944333a8..1c7417ae8 100644 --- a/js/components/interface/loadingSpinner/LoadingSpinner.js +++ b/js/components/interface/loadingSpinner/LoadingSpinner.js @@ -8,7 +8,6 @@ define(function (require) { return CreateClass({ mixins: [require('../../controls/mixins/bootstrap/modal.js')], timer1:null, - timer2:null, visible: false, getInitialState: function () { @@ -26,7 +25,6 @@ define(function (require) { if (this.visible){ if (this.timer1 != null){ clearTimeout(this.timer1); - clearTimeout(this.timer2); } this.visible = false; @@ -43,16 +41,12 @@ define(function (require) { if (this.timer1 != null){ clearTimeout(this.timer1); - clearTimeout(this.timer2); } this.timer1 = setTimeout((function (){ that.setState({ text:'Loading is taking longer than usual, either a large amount of data is being loaded or bandwidth is limited' }); }).bind(this), 20000); - - this.timer2 = setTimeout((function (){ - that.setState({ text:GEPPETTO.Resources.SPOTLIGHT_HINT }); - }).bind(this), 5000); + }, componentDidMount: function (){