Code cleanup

This should not change any functionality, just remove unused flags
jwplayer · Sep 28, 2015 · 88b14d4 · 88b14d4
1 parent 0025bf4
commit 88b14d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/src/js/controller/controller.js b/src/js/controller/controller.js
@@ -77,9 +77,7 @@ define([
             _setup = new Setup(_api, _model, _view);
 
             _setup.on(events.JWPLAYER_READY, _playerReady, this);
-            _setup.on(events.JWPLAYER_SETUP_ERROR, function(evt) {
-                _this.setupError(evt.message);
-            });
+            _setup.on(events.JWPLAYER_SETUP_ERROR, this.setupError, this);
 
             _model.mediaController.on(events.JWPLAYER_MEDIA_COMPLETE, function() {
                 // Insert a small delay here so that other complete handlers can execute
@@ -681,7 +679,8 @@ define([
             this.currentContainer = viewElement;
         },
 
-        setupError: function(message){
+        setupError: function(evt){
+            var message = evt.message;
             var errorElement = utils.createElement(error(this._model.get('id'), this._model.get('skin'), message));
 
             var width = this._model.get('width'),

diff --git a/src/js/view/view.js b/src/js/view/view.js
@@ -49,9 +49,7 @@ define([
             _title,
             _captionsRenderer,
             _audioMode,
-            _errorState = false,
             _showing = false,
-            _replayState,
             _rightClickMenu,
             _resizeMediaTimeout = -1,
             _currentState,
@@ -324,9 +322,6 @@ define([
         };
 
         this.setup = function() {
-            if (_errorState) {
-                return;
-            }
 
             this.handleColorOverrides();
 
@@ -400,7 +395,7 @@ define([
             // watch for changes
             _model.on('change:stretching', _onStretchChange);
 
-            _stateHandler(null, states.IDLE);
+            _stateHandler(_model, states.IDLE);
 
             if (!_isMobile) {
                 _displayClickHandler.element().addEventListener('mouseout', _userActivity, false);
@@ -711,7 +706,7 @@ define([
             if (_controlbar) {
                 if (!_audioMode) {
                     var model = _instreamMode ? _instreamModel : _model;
-                    _updateState(model.get('state'));
+                    _stateHandler(model, model.get('state'));
                 }
             }
 
@@ -867,7 +862,6 @@ define([
         }
 
         function _playlistCompleteHandler() {
-            _replayState = true;
             _fullscreen(false);
         }
 
@@ -888,11 +882,6 @@ define([
             _this.setAltText((live) ? 'Live Broadcast' : '');
         }
 
-        function _stateHandler(model, state) {
-            _replayState = false;
-            _updateState(state);
-        }
-
         function _errorHandler(evt) {
             _stateHandler(_model, states.ERROR);
 
@@ -911,7 +900,8 @@ define([
             return false;
         }
 
-        function _updateState(state) {
+
+        function _stateHandler(model, state) {
             utils.removeClass(_playerElement, 'jw-state-' + _currentState);
             utils.addClass(_playerElement, 'jw-state-' + state);
             _currentState = state;