@chikathreesix fixed an issue where data-setup options could be missed.

closes #1514

CHANGELOG.md

@@ -7,6 +7,7 @@ CHANGELOG
 * @mynameisstephen fixed an issue where slider event listeners were not being cleaned up ([view](https://github.com/videojs/video.js/pull/1475))
 * @alexrqs cleaned up the Spanish translation ([view](https://github.com/videojs/video.js/pull/1494))
 * @t2y added a Japanese translation ([view](https://github.com/videojs/video.js/pull/1497))
+* @chikathreesix fixed an issue where data-setup options could be missed ([view](https://github.com/videojs/video.js/pull/1514))
 
 --------------------
 

src/js/player.js

@@ -170,12 +170,24 @@ vjs.Player.prototype.dispose = function(){
 };
 
 vjs.Player.prototype.getTagSettings = function(tag){
-  var options = {
-    'sources': [],
-    'tracks': []
-  };
+  var tagOptions,
+      dataSetup,
+      options = {
+        'sources': [],
+        'tracks': []
+      };
+
+  tagOptions = vjs.getElementAttributes(tag);
+  dataSetup = tagOptions['data-setup'];
+
+  // Check if data-setup attr exists.
+  if (dataSetup !== null){
+    // Parse options JSON
+    // If empty string, make it a parsable json object.
+    vjs.obj.merge(tagOptions, vjs.JSON.parse(dataSetup || '{}'));
+  }
 
-  vjs.obj.merge(options, vjs.getElementAttributes(tag));
+  vjs.obj.merge(options, tagOptions);
 
   // Get tag children settings
   if (tag.hasChildNodes()) {

src/js/setup.js

@@ -25,13 +25,8 @@ vjs.autoSetup = function(){
           // Check if data-setup attr exists.
           // We only auto-setup if they've added the data-setup attr.
           if (options !== null) {
-
-            // Parse options JSON
-            // If empty string, make it a parsable json object.
-            options = vjs.JSON.parse(options || '{}');
-
             // Create new video.js instance.
-            player = videojs(vid, options);
+            player = videojs(vid);
           }
         }
 

test/unit/setup.js

@@ -1 +1,12 @@
 module('Setup');
+
+test('should set options from data-setup even if autoSetup is not called before initialisation', function(){
+  var el = PlayerTest.makeTag();
+  el.setAttribute('data-setup', '{"controls": true, "autoplay": false, "preload": "auto"}');
+
+  var player = PlayerTest.makePlayer({}, el);
+
+  ok(player.options_['controls'] === true);
+  ok(player.options_['autoplay'] === false);
+  ok(player.options_['preload'] === 'auto');
+});