Develop

.gitignore

@@ -61,3 +61,6 @@ node_modules
 /buildtheme/
 
 *.cson
+
+# IntelliJ #
+.idea

Gruntfile.js

@@ -6,6 +6,8 @@ module.exports = function(grunt) {
         replace: 'grunt-text-replace'
     });
 
+    const sass = require('node-sass');
+
     grunt.loadNpmTasks('grunt-wp-i18n');
 
     // require it at the top and pass in the grunt instance
@@ -33,6 +35,10 @@ module.exports = function(grunt) {
 
         // sass
         sass: {
+            options: {
+                implementation: sass,
+                sourceMap: true
+            },
             dist: {
                 files: {
                     'assets/admin/css/style.css': 'assets/admin/scss/style.scss',
@@ -162,7 +168,7 @@ module.exports = function(grunt) {
                     'templates/default/js/main.min.js': [
                         'templates/default/js/source/likes.js',
                         'templates/default/js/source/main.js'
-                    ]
+                    ],
                 }
             },
 
@@ -184,9 +190,7 @@ module.exports = function(grunt) {
                 files: {
                     'assets/admin/js/import.min.js'         : 'assets/admin/js/source/import.js',
                     'assets/admin/js/meta.min.js'           : 'assets/admin/js/source/meta.js',
-                    'assets/admin/js/debug-bar.min.js'      : 'assets/admin/js/source/debug-bar.js',
-                    'assets/admin/js/mce-playlist-view.js'  : 'assets/admin/js/source/playlist/mce-playlist-view.js',
-                    'assets/admin/js/modal-playlist-view.js': 'assets/admin/js/source/playlist/modal-playlist-view.js',
+                    'assets/admin/js/debug-bar.min.js'      : 'assets/admin/js/source/debug-bar.js'
                 }
             }
 
@@ -305,7 +309,8 @@ module.exports = function(grunt) {
     ] );
 
     // register task
-    grunt.registerTask( 'default', [ 
+    grunt.registerTask( 'default', [
+        'sass',
         'i18n',
         'styles',
         'scripts',

Radium/Video/Shortcodes.php

@@ -635,7 +635,7 @@ function player( $atts, $content=null ) {
         //Output the <video> tag
         $videojs = <<<_end_
 
-        <video class="video-js vjs-default-skin{$class}" width="{$width}" height="{$height}"{$poster_attribute}{$controls_attribute}{$preload_attribute}{$autoplay_attribute}{$loop_attribute}{$muted_attribute} data-setup='{$jsonDataSetup}'>
+        <video class="video-js vjs-default-skin{$class}" width="{$width}" height="{$height}" {$poster_attribute} {$controls_attribute} {$preload_attribute} {$autoplay_attribute} {$loop_attribute} {$muted_attribute}>
             {$mp4_source}
             {$webm_source}
             {$ogg_source}{$track}
@@ -819,7 +819,7 @@ function video_player( $attr ) {
         if ( 'mediaelement' === $library && 1 === $instances )
             $html .= "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n";
 
-        $html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
+        $html .= sprintf( '<video %s>', join( ' ', $attr_strings ) );
 
         $fileurl = '';
 

Radium/Video/Template.php

@@ -87,6 +87,7 @@ public function register_project_templates($atts)
     public function view_project_template($template)
     {
         $page_template = get_post_meta(get_the_ID(), '_wp_page_template', true);
+        $file = '';
 
         if ($page_template == 'video-home.php' || $page_template == 'video-list.php') {
             add_filter('video_central_is_video_archive', '__return_true');
@@ -109,7 +110,6 @@ public function view_project_template($template)
             // Check child theme first
             if (file_exists(trailingslashit($template_location).'page-templates/'.$wp_page_template)) {
                 $file = trailingslashit($template_location).'page-templates/'.$wp_page_template;
-
                 break;
             }
         }