More tests

walsh9 · Oct 9, 2014 · 3e1079c · 3e1079c
1 parent 5d5d768
commit 3e1079c
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 44 deletions.
diff --git a/dist/videojs-transcript.js b/dist/videojs-transcript.js
@@ -146,21 +146,11 @@ var eventEmitter = {
             h[2].apply();
       }
     });
-  },
-  delegate: function (obj) {
-    obj.on = function (event, callback) {
-      eventEmitter.on(obj, event, callback);
-    };
-    obj.trigger = function (obj) {
-      eventEmitter.trigget(obj, event);
-    };
-    return obj;
   }
 };
 
 var scrollerProto = function(plugin) {
 
-
   var initHandlers = function (el) {
     var self = this;
     // The scroll event. We want to keep track of when the user is scrolling the transcript.
@@ -201,7 +191,9 @@ var scrollerProto = function(plugin) {
   var init = function (element, plugin) {
     this.element = element;
     this.userIsScrolling = false;
-    this.mouseIsOverTranscript = false;
+
+    //default to true in case user isn't using a mouse;
+    this.mouseIsOverTranscript = true;
     this.isAutoScrolling = true;
     initHandlers.call(this, this.element);
     return this;
@@ -242,7 +234,7 @@ var scrollerProto = function(plugin) {
       var parent = element.parentElement;
       var parentOffsetBottom = parent.offsetTop + parent.clientHeight;
       var elementOffsetBottom = element.offsetTop + element.clientHeight;
-      var relPos = (element.offsetTop + element.clientHeight) - parent.offsetTop;
+      var relPos = element.offsetTop - parent.offsetTop;
       var newPos;
 
       // If the line is above the top of the parent view, were scrolling up,

diff --git a/dist/videojs-transcript.min.js b/dist/videojs-transcript.min.js
diff --git a/src/scroller.js b/src/scroller.js
@@ -1,10 +1,8 @@
 /*
  *  Scroller object to handle scrolling.
  */
-
 var scrollerProto = function(plugin) {
 
-
   var initHandlers = function (el) {
     var self = this;
     // The scroll event. We want to keep track of when the user is scrolling the transcript.
@@ -45,7 +43,9 @@ var scrollerProto = function(plugin) {
   var init = function (element, plugin) {
     this.element = element;
     this.userIsScrolling = false;
-    this.mouseIsOverTranscript = false;
+
+    //default to true in case user isn't using a mouse;
+    this.mouseIsOverTranscript = true;
     this.isAutoScrolling = true;
     initHandlers.call(this, this.element);
     return this;
@@ -86,7 +86,7 @@ var scrollerProto = function(plugin) {
       var parent = element.parentElement;
       var parentOffsetBottom = parent.offsetTop + parent.clientHeight;
       var elementOffsetBottom = element.offsetTop + element.clientHeight;
-      var relPos = (element.offsetTop + element.clientHeight) - parent.offsetTop;
+      var relPos = element.offsetTop - parent.offsetTop;
       var newPos;
 
       // If the line is above the top of the parent view, were scrolling up,

diff --git a/test/modules.html b/test/modules.html
@@ -7,14 +7,24 @@
 </head>
 <body>
   <div id="qunit"></div>
-  <div id="qunit-fixture"></div>
+  <div id="qunit-fixture">
+    <div id="scrollable-container" style="height:100px; overflow-y:scroll">
+      <div id="item1" style="height: 50px">1</div>
+      <div id="item2" style="height: 50px">2</div>
+      <div id="item3" style="height: 50px">3</div>
+      <div id="item4" style="height: 50px">4</div>
+    </div>
+    <div id="non-scrollable-container" style="height:100px;"></div>
+
+  </div>
   <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
   <script>
     test('the environment is sane', function() {
       ok(true, 'everything is swell');
     });
   </script>
   <script src="../node_modules/video.js/dist/video-js/video.js"></script>
+  <script src="../src/polyfill.js"></script>
   <script src="../src/options.js"></script>
   <script src="../src/events.js"></script>
   <script src="../src/tracklist.js"></script>