Merge pull request #11 from videojs/feature/abort

Call into the SWF on abort()
videojs · May 27, 2014 · c1b0f3b · c1b0f3b
2 parents 513c9c4 + d042c81
commit c1b0f3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -30,9 +30,6 @@
     "grunt-contrib-jshint": "^0.10.0",
     "grunt-contrib-qunit": "^0.4.0",
     "qunitjs": "^1.14.0",
-    "video.js": "^4.4"
-  },
-  "peerDependencies": {
-    "video.js": "^4.4"
+    "video.js": "git+ssh://[email protected]:dmlap/video-js.git#0.6.1-alpha"
   }
 }
diff --git a/src/videojs-media-sources.js b/src/videojs-media-sources.js
@@ -212,6 +212,7 @@
     this.abort = function() {
       buffer = [];
       bufferSize = 0;
+      this.source.swfObj.vjs_abort();
     };
   };
   videojs.SourceBuffer.prototype = new EventEmitter();

diff --git a/test/media-sources_test.js b/test/media-sources_test.js
@@ -33,6 +33,9 @@
       mediaSource.swfObj = {
         CallFunction: function(xml) {
           swfCalls.push(xml);
+        },
+        vjs_abort: function() {
+          swfCalls.push('abort');
         }
       };
       player.src({
@@ -121,6 +124,7 @@
     sourceBuffer.abort();
 
     timers.pop()();
-    strictEqual(swfCalls.length, 0, 'made no appends');
+    strictEqual(swfCalls.length, 1, 'called the swf');
+    strictEqual(swfCalls[0], 'abort', 'invoked abort');
   });
 })(window, window.document, window.videojs);