diff --git a/src/js/level/index.js b/src/js/level/index.js index 914260f8..b066409b 100644 --- a/src/js/level/index.js +++ b/src/js/level/index.js @@ -1,5 +1,4 @@ var _ = require('underscore'); -var Backbone = require('backbone'); var Q = require('q'); var util = require('../util'); @@ -9,13 +8,10 @@ var log = require('../log'); var Errors = require('../util/errors'); var Sandbox = require('../sandbox/').Sandbox; -var Constants = require('../util/constants'); -var GlobalState = require('../util/globalState'); +var GlobalStateActions = require('../actions/GlobalStateActions'); var Visualization = require('../visuals/visualization').Visualization; -var ParseWaterfall = require('../level/parseWaterfall').ParseWaterfall; var DisabledMap = require('../level/disabledMap').DisabledMap; -var Command = require('../models/commandModel').Command; var GitShim = require('../git/gitShim').GitShim; var Commands = require('../commands'); @@ -442,7 +438,7 @@ var Level = Sandbox.extend({ 'echo "level solved!"' ); } else { - GlobalState.isAnimating = true; + GlobalStateActions.changeIsAnimating(true); finishAnimationChain = this.mainVis.gitVisuals.finishAnimation(); if (this.mainVis.originVis) { finishAnimationChain = finishAnimationChain.then( @@ -479,7 +475,7 @@ var Level = Sandbox.extend({ // nothing to do, we will just close }) .done(function() { - GlobalState.isAnimating = false; + GlobalStateActions.changeIsAnimating(false); defer.resolve(); }); }, diff --git a/src/js/util/globalState.js b/src/js/util/globalState.js deleted file mode 100644 index ffc95cf6..00000000 --- a/src/js/util/globalState.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Random grab bag of global state variables so we - * dont just straight up use window - */ - -var GlobalState = { - flipTreeY: false, - isAnimating: false -}; - -module.exports = GlobalState; diff --git a/src/js/visuals/animation/index.js b/src/js/visuals/animation/index.js index f2071368..07cbc574 100644 --- a/src/js/visuals/animation/index.js +++ b/src/js/visuals/animation/index.js @@ -1,7 +1,7 @@ var _ = require('underscore'); var Q = require('q'); var Backbone = require('backbone'); -var GlobalState = require('../../util/globalState'); +var GlobalStateActions = require('../actions/GlobalStateActions'); var GRAPHICS = require('../../util/constants').GRAPHICS; var Animation = Backbone.Model.extend({ @@ -67,13 +67,13 @@ var AnimationQueue = Backbone.Model.extend({ this.set('index', 0); // set the global lock that we are animating - GlobalState.isAnimating = true; + GlobalStateActions.changeIsAnimating(true); this.next(); }, finish: function() { // release lock here - GlobalState.isAnimating = false; + GlobalStateActions.changeIsAnimating(false); this.get('callback')(); },