Merge pull request #1 from walsh9/refactor

Refactor
walsh9 · Oct 8, 2014 · 5d5d768 · 5d5d768
2 parents 4a1c9be + 3d9d5a7
commit 5d5d768
Show file tree

Hide file tree

Showing 18 changed files with 1,007 additions and 622 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -17,9 +17,13 @@ module.exports = function(grunt) {
       },
       build: {
         src: ['src/intro.js',
+              'src/polyfill.js',
+              'src/options.js',
               'src/utils.js',
-              'src/html.js',
+              'src/events.js',
               'src/scroller.js',
+              'src/tracklist.js',
+              'src/widget.js',
               'src/main.js',
               'src/outro.js'],
         dest: 'dist/<%= pkg.name %>.js'
@@ -90,7 +94,7 @@ module.exports = function(grunt) {
 
   grunt.registerTask('default',
                      ['clean',
-                      'jshint:src',
+                      //'jshint:src',
                       'concat',
                       'jshint:build',
                       'jshint:test',

diff --git a/css/videojs-transcript.css b/css/videojs-transcript.css
@@ -4,7 +4,7 @@
   font-family: Arial, sans-serif;
 }
 
-.transcript {
+.transcript-body {
   height: 200px;
   overflow-y: scroll;
 }
@@ -34,4 +34,4 @@
 
 .transcript-line.is-active {
   background-color: #e2fbfb;
-}
+}
diff --git a/css/videojs-transcript3.css b/css/videojs-transcript3.css
@@ -4,7 +4,7 @@
   font-family: Arial, sans-serif;
 }
 
-.transcript-lines {
+.transcript-body {
   height: 200px;
   overflow-y: scroll;
   border: 1px solid #111;