wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-12 12:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/videojs' of https://github.com/vbortone/DefinitelyTyped into feature/videojs

Browse Source 
Conflicts:
	videojs/videojs-tests.ts
	videojs/videojs.d.ts
This commit is contained in:
Vincent Bortone
2013-02-11 02:38:57 -05:00
parent 3871861d4e f8b142ba4c
commit fd73abbfdb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
videojs/videojs-tests.ts
+5 -1
View File
@@ -1,6 +1,7 @@
// Tests for Video.js API
/// <reference path="videojs.d.ts" />
<<<<<<< HEAD
_V_("example_video_1").ready(function(){
var myPlayer:VideoJSPlayer = this;
@@ -71,4 +72,7 @@ _V_("example_video_1").ready(function(){
myPlayer.addEvent("volumechange", myFunc);
myPlayer.removeEvent("volumechange", myFunc);
});
});
=======
var myPlayer:VideoJSPlayer = _V_("example_video_1");
>>>>>>> f8b142ba4c1a906b03601cd1f0d53484250f11b3