Dont attach viewable to events if visibility is undefined

jwplayer · Feb 21, 2017 · c0a9e8f · c0a9e8f
1 parent 9998dfd
commit c0a9e8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/js/controller/events-middleware.js b/src/js/controller/events-middleware.js
@@ -3,18 +3,20 @@ define([
     'events/events',
 ], function (_, Events) {
     return function middleware(model, type, currentState) {
-        var newState = {};
+        var newState = currentState;
 
         switch (type) {
             case Events.JWPLAYER_MEDIA_TIME:
             case 'play':
             case 'pause': {
-                var viewable = Math.round(model.get('visibility') || 0);
-                newState = _.extend({}, currentState, { viewable: viewable });
+                var visibility = model.get('visibility');
+                if (!_.isUndefined(visibility)) {
+                    var viewable = Math.round(visibility);
+                    newState = _.extend({}, currentState, { viewable: viewable });
+                }
                 break;
             }
             default: {
-                newState = currentState;
                 break;
             }
         }

diff --git a/test/unit/events-middleware-test.js b/test/unit/events-middleware-test.js
@@ -36,6 +36,13 @@ define([
         assert.deepEqual(actual, expected);
     });
 
+    test('should not add viewable if visibility is undefined', function (assert) {
+        var model = mockModel({ visibility: undefined });
+        var expected = { foo: 'bar' };
+        var actual = middleware(model, 'time', { foo: 'bar' });
+        assert.deepEqual(actual, expected);
+    });
+
     test('does not modify original data when the type does not have a case', function (assert) {
         var expected = { foo: 'bar' };
         var actual = middleware(mockModel({}), 'cat', expected);