language
stringclasses
1 value
owner
stringlengths
2
15
repo
stringlengths
2
21
sha
stringlengths
45
45
message
stringlengths
7
36.3k
path
stringlengths
1
199
patch
stringlengths
15
102k
is_multipart
bool
2 classes
Other
videojs
video.js
7caa2fc1a703988532c61ffba17879f5d3d52520.json
Append Feature to 'features'. Update tests.
src/js/media/media.js
@@ -13,7 +13,6 @@ vjs.MediaTechController = vjs.Component.extend({ /** @constructor */ init: function(player, options, ready){ options = options || {}; - // we don't want the tech to report user activity automatically. // This is done manually in addControlsListeners options.reportTouchActivit...
true
Other
videojs
video.js
7caa2fc1a703988532c61ffba17879f5d3d52520.json
Append Feature to 'features'. Update tests.
src/js/player.js
@@ -1530,7 +1530,7 @@ vjs.Player.prototype.playbackRate = function(rate) { return this; } - if (this.tech && this.tech['playbackRate']) { + if (this.tech && this.tech['playbackRateFeature']) { return this.techGet('playbackRate'); } else { return 1.0;
true
Other
videojs
video.js
7caa2fc1a703988532c61ffba17879f5d3d52520.json
Append Feature to 'features'. Update tests.
test/unit/controls.js
@@ -12,9 +12,7 @@ test('should hide volume control if it\'s not supported', function(){ language: noop, languages: noop, tech: { - features: { - 'volumeControl': false - } + 'volumeControlFeature': false }, volume: function(){}, muted: function(){}, @@ -47,9 +45,7 @@ ...
true
Other
videojs
video.js
7caa2fc1a703988532c61ffba17879f5d3d52520.json
Append Feature to 'features'. Update tests.
test/unit/mediafaker.js
@@ -42,7 +42,6 @@ vjs.MediaFaker.prototype.muted = function(){ return false; }; vjs.MediaFaker.prototype.pause = function(){ return false; }; vjs.MediaFaker.prototype.paused = function(){ return true; }; vjs.MediaFaker.prototype.supportsFullScreen = function(){ return false; }; -vjs.MediaFaker.prototype.features = {...
true
Other
videojs
video.js
c0f91674e44c8d6ccccf591719595eed001e99bc.json
Promote 'features' to the prototype
src/js/control-bar/mute-toggle.js
@@ -13,11 +13,11 @@ vjs.MuteToggle = vjs.Button.extend({ player.on('volumechange', vjs.bind(this, this.update)); // hide mute toggle if the current tech doesn't support volume control - if (player.tech && player.tech.features && player.tech.features['volumeControl'] === false) { + if (player.tech && p...
true
Other
videojs
video.js
c0f91674e44c8d6ccccf591719595eed001e99bc.json
Promote 'features' to the prototype
src/js/control-bar/playback-rate-menu-button.js
@@ -72,7 +72,7 @@ vjs.PlaybackRateMenuButton.prototype.onClick = function(){ vjs.PlaybackRateMenuButton.prototype.playbackRateSupported = function(){ return this.player().tech - && this.player().tech.features['playbackRate'] + && this.player().tech['playbackRate'] && this.player().options()['playbackRa...
true
Other
videojs
video.js
c0f91674e44c8d6ccccf591719595eed001e99bc.json
Promote 'features' to the prototype
src/js/control-bar/volume-control.js
@@ -11,11 +11,11 @@ vjs.VolumeControl = vjs.Component.extend({ vjs.Component.call(this, player, options); // hide volume controls when they're not supported by the current tech - if (player.tech && player.tech.features && player.tech.features['volumeControl'] === false) { + if (player.tech && player.t...
true
Other
videojs
video.js
c0f91674e44c8d6ccccf591719595eed001e99bc.json
Promote 'features' to the prototype
src/js/control-bar/volume-menu-button.js
@@ -11,11 +11,11 @@ vjs.VolumeMenuButton = vjs.MenuButton.extend({ player.on('volumechange', vjs.bind(this, this.update)); // hide mute toggle if the current tech doesn't support volume control - if (player.tech && player.tech.features && player.tech.features.volumeControl === false) { + if (player.te...
true
Other
videojs
video.js
c0f91674e44c8d6ccccf591719595eed001e99bc.json
Promote 'features' to the prototype
src/js/exports.js
@@ -121,11 +121,10 @@ goog.exportSymbol('videojs.CaptionsButton', vjs.CaptionsButton); goog.exportSymbol('videojs.ChaptersButton', vjs.ChaptersButton); goog.exportSymbol('videojs.MediaTechController', vjs.MediaTechController); -goog.exportProperty(vjs.MediaTechController.prototype, 'features', vjs.MediaTechControll...
true
Other
videojs
video.js
c0f91674e44c8d6ccccf591719595eed001e99bc.json
Promote 'features' to the prototype
src/js/media/html5.js
@@ -13,16 +13,16 @@ vjs.Html5 = vjs.MediaTechController.extend({ /** @constructor */ init: function(player, options, ready){ // volume cannot be changed from 1 on iOS - this.features['volumeControl'] = vjs.Html5.canControlVolume(); + this['volumeControl'] = vjs.Html5.canControlVolume(); // just ...
true
Other
videojs
video.js
c0f91674e44c8d6ccccf591719595eed001e99bc.json
Promote 'features' to the prototype
src/js/media/media.js
@@ -14,10 +14,6 @@ vjs.MediaTechController = vjs.Component.extend({ init: function(player, options, ready){ options = options || {}; - // Make sure that `this.features` isn't directly tied to `vjs.MediaTechController.prototype.features` - // Using `vjs.obj.create` allows us to receive default updates fr...
true
Other
videojs
video.js
c0f91674e44c8d6ccccf591719595eed001e99bc.json
Promote 'features' to the prototype
src/js/player.js
@@ -349,7 +349,6 @@ vjs.Player.prototype.unloadTech = function(){ // vjs.log('loadedTech') // }, - // /* Player event handlers (how the player reacts to certain events) // ================================================================================ */ @@ -1531,7 +1530,7 @@ vjs.Player.prototype.playbackRat...
true
Other
videojs
video.js
011861bbdb3b35d73702e03a951c9c28de069f89.json
add support for videojs-grunt-languages updates to change build/lang to build/files/lang update grunt languages references and version remove build/lang reference update languages plugin reference for array support
Gruntfile.js
@@ -31,8 +31,12 @@ module.exports = function(grunt) { // Project configuration. grunt.initConfig({ pkg: pkg, - lang: { - src: 'lang/*.json' + vjslanguages: { + defaults: { + files: { + 'build/files/lang': ['lang/*.json'] + } + } }, build: { src: 's...
true
Other
videojs
video.js
011861bbdb3b35d73702e03a951c9c28de069f89.json
add support for videojs-grunt-languages updates to change build/lang to build/files/lang update grunt languages references and version remove build/lang reference update languages plugin reference for array support
package.json
@@ -60,6 +60,7 @@ "semver": "~1.1.4", "sinon": "~1.9.1", "uglify-js": "~2.3.6", - "videojs-doc-generator": "0.0.1" + "videojs-doc-generator": "0.0.1", + "grunt-videojs-languages": "0.0.4" } }
true
Other
videojs
video.js
c4b4ebea4a1679f4148a5f314d6c54c9b564170b.json
Remove unneeded html5Mock
test/unit/player.js
@@ -525,9 +525,6 @@ test('should honor default inactivity timeout', function() { // default timeout is 2000ms player = PlayerTest.makePlayer({}); - html5Mock = { player_: player }; - - vjs.Html5.prototype.createEl.call(html5Mock); equal(player.userActive(), true, 'User is active on creation'); ...
false
Other
videojs
video.js
68ad48d8e82b874f0cbe8975cd88cac042ae3b88.json
Ignore null, undefined, and NaN is dimension() Add vjs.isNaN to have a better cross browser isNaN checker. Previously, only undefined was ignored, so, it tried setting the dimension using null and NaN as values. In most browsers this isn't a problem, but in particular on IE8, things break. With this PR, all three of th...
src/js/component.js
@@ -805,7 +805,7 @@ vjs.Component.prototype.dimensions = function(width, height){ * @private */ vjs.Component.prototype.dimension = function(widthOrHeight, num, skipListeners){ - if (num !== undefined) { + if (num !== undefined && num !== null && !vjs.isNaN(num)) { // Check if using css width/height (% or...
true
Other
videojs
video.js
68ad48d8e82b874f0cbe8975cd88cac042ae3b88.json
Ignore null, undefined, and NaN is dimension() Add vjs.isNaN to have a better cross browser isNaN checker. Previously, only undefined was ignored, so, it tried setting the dimension using null and NaN as values. In most browsers this isn't a problem, but in particular on IE8, things break. With this PR, all three of th...
src/js/lib.js
@@ -171,6 +171,17 @@ vjs.obj.isArray = Array.isArray || function(arr) { return Object.prototype.toString.call(arr) === '[object Array]'; }; +/** + * Check to see whether the input is NaN or not. + * NaN is the only JavaScript construct that isn't equal to itself + * @param {Number} num Number to check + * @return...
true
Other
videojs
video.js
68ad48d8e82b874f0cbe8975cd88cac042ae3b88.json
Ignore null, undefined, and NaN is dimension() Add vjs.isNaN to have a better cross browser isNaN checker. Previously, only undefined was ignored, so, it tried setting the dimension using null and NaN as values. In most browsers this isn't a problem, but in particular on IE8, things break. With this PR, all three of th...
test/unit/component.js
@@ -199,6 +199,29 @@ test('should show and hide an element', function(){ ok(comp.el().style.display === 'block'); }); +test('dimension() should ignore undefined, null, and NaN values', function() { + var comp, width, height, newWidth, newHeight; + width = 300; + height = 150; + + comp = new vjs.Component(getF...
true
Other
videojs
video.js
f7168078523419c97eb09603c338634ae8eac297.json
Add test cases for default and disabled timeout
test/unit/player.js
@@ -519,6 +519,32 @@ test('should restore attributes from the original video tag when creating a new equal(el.getAttribute('webkit-playsinline'), '', 'webkit-playsinline attribute was set properly'); }); +test('should honor default inactivity timeout', function() { + var player, html5Mock; + + // default ti...
false
Other
videojs
video.js
c19a3f3f48be0e4a5d485b648f2fa0c1186203c3.json
add fix for localization of not supported message add base documentation for language support typo fix added utility function for adding languages per conversation with @heff. Includes test. move addLanguage to core. update both core and util tests. added export property added language sandbox for demo fix commen...
docs/guides/languages.md
@@ -0,0 +1,299 @@ +Languages +========= + +Multiple language support allows for users of non-English locales to natively interact with the displayed player. Video.js will compile multiple langauge files (see below) and instantiate with a global dictionary of language key/value support. Video.js player instances can be ...
true
Other
videojs
video.js
c19a3f3f48be0e4a5d485b648f2fa0c1186203c3.json
add fix for localization of not supported message add base documentation for language support typo fix added utility function for adding languages per conversation with @heff. Includes test. move addLanguage to core. update both core and util tests. added export property added language sandbox for demo fix commen...
sandbox/language.html.example
@@ -0,0 +1,63 @@ +<!DOCTYPE html> +<!-- Set Page Language Here --> +<html lang="es"> +<head> + <meta charset="utf-8" /> + <title>VideoJS Languages Demo</title> + + <link href="../build/files/video-js.css" rel="stylesheet" type="text/css"> + + <!-- LOAD VIDEO.JS SOURCE FILES IN ORDER --> + <script src="../build/sou...
true
Other
videojs
video.js
c19a3f3f48be0e4a5d485b648f2fa0c1186203c3.json
add fix for localization of not supported message add base documentation for language support typo fix added utility function for adding languages per conversation with @heff. Includes test. move addLanguage to core. update both core and util tests. added export property added language sandbox for demo fix commen...
src/js/core.js
@@ -118,6 +118,25 @@ if (vjs.CDN_VERSION !== 'GENERATED'+'_CDN_VSN') { videojs.options['flash']['swf'] = vjs.ACCESS_PROTOCOL + 'vjs.zencdn.net/'+vjs.CDN_VERSION+'/video-js.swf'; } +/** + * Utility function for adding languages to the default options. Useful for + * amending multiple language support at runtime. +...
true
Other
videojs
video.js
c19a3f3f48be0e4a5d485b648f2fa0c1186203c3.json
add fix for localization of not supported message add base documentation for language support typo fix added utility function for adding languages per conversation with @heff. Includes test. move addLanguage to core. update both core and util tests. added export property added language sandbox for demo fix commen...
src/js/exports.js
@@ -173,3 +173,4 @@ goog.exportSymbol('videojs.createTimeRange', vjs.createTimeRange); goog.exportSymbol('videojs.util', vjs.util); goog.exportProperty(vjs.util, 'mergeOptions', vjs.util.mergeOptions); +goog.exportProperty(vjs, 'addLanguage', vjs.addLanguage); \ No newline at end of file
true
Other
videojs
video.js
c19a3f3f48be0e4a5d485b648f2fa0c1186203c3.json
add fix for localization of not supported message add base documentation for language support typo fix added utility function for adding languages per conversation with @heff. Includes test. move addLanguage to core. update both core and util tests. added export property added language sandbox for demo fix commen...
src/js/player.js
@@ -1167,7 +1167,7 @@ vjs.Player.prototype.sourceList_ = function(sources){ this.loadTech(sourceTech.tech, sourceTech.source); } } else { - this.error({ code: 4, message: this.options()['notSupportedMessage'] }); + this.error({ code: 4, message: this.localize(this.options()['notSupportedMessage']) ...
true
Other
videojs
video.js
c19a3f3f48be0e4a5d485b648f2fa0c1186203c3.json
add fix for localization of not supported message add base documentation for language support typo fix added utility function for adding languages per conversation with @heff. Includes test. move addLanguage to core. update both core and util tests. added export property added language sandbox for demo fix commen...
src/js/util.js
@@ -16,7 +16,7 @@ vjs.util = {}; vjs.util.mergeOptions = function(obj1, obj2){ var key, val1, val2; - // make a copy of obj1 so we're not ovewriting original values. + // make a copy of obj1 so we're not overwriting original values. // like prototype.options_ and all sub options objects obj1 = vjs.obj.cop...
true
Other
videojs
video.js
c19a3f3f48be0e4a5d485b648f2fa0c1186203c3.json
add fix for localization of not supported message add base documentation for language support typo fix added utility function for adding languages per conversation with @heff. Includes test. move addLanguage to core. update both core and util tests. added export property added language sandbox for demo fix commen...
test/unit/core.js
@@ -27,3 +27,15 @@ test('should return a video player instance', function(){ var player2 = videojs(tag2); ok(player2.id() === 'test_vid_id2', 'created player from element'); }); + +test('should add the value to the languages object', function() { + var code, data, result; + + code = 'es'; + data = {'Hello': '...
true
Other
videojs
video.js
c19a3f3f48be0e4a5d485b648f2fa0c1186203c3.json
add fix for localization of not supported message add base documentation for language support typo fix added utility function for adding languages per conversation with @heff. Includes test. move addLanguage to core. update both core and util tests. added export property added language sandbox for demo fix commen...
test/unit/util.js
@@ -26,4 +26,4 @@ test('should merge options objects', function(){ c: true, d: true }, 'options objects merged correctly'); -}); +}); \ No newline at end of file
true
Other
videojs
video.js
a1eb8dd975c20702e9af07ebdad89f307037efc0.json
Add test for manual time tracking and dispose Make sure time and progress event synthesis is turned off after the tech is disposed.For #1431.
test/unit/media.js
@@ -115,3 +115,21 @@ test('should synthesize progress events by default', function() { clock.tick(500); equal(progresses, 1, 'triggered one event'); }); + +test('dispose() should stop time tracking', function() { + var tech = new videojs.MediaTechController({ + id: noop, + on: noop, + trigger: noop + ...
false
Other
videojs
video.js
ec61386f47b3a9ce5c468508867e945fc89192d2.json
Fix typo in video tracks documentation small typo
docs/guides/tracks.md
@@ -17,7 +17,7 @@ When creating captions, there's also additional [caption formatting techniques] Adding to Video.js ------------------ -Once you have your WebVTT file created, you can add it to Video.js using the track trag. Put your track track tag after all the source elements, and before any fallback content. +...
false
Other
videojs
video.js
98edeccb3fd2d444bd895f6932edd156ca49a10f.json
Allow disabling of inactivity timeout
src/js/player.js
@@ -1615,16 +1615,19 @@ vjs.Player.prototype.listenForUserActivity = function(){ // Clear any existing inactivity timeout to start the timer over clearTimeout(inactivityTimeout); - // In X seconds, if no more activity has occurred the user will be - // considered inactive - inactivityTime...
false
Other
videojs
video.js
f4ce62d4b1e72b783f1eeb82b80e3050b3be7e83.json
Move manual events into tech controller Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to th...
src/js/media/flash.js
@@ -145,6 +145,7 @@ vjs.Flash.prototype.src = function(src){ vjs.Flash.prototype['setCurrentTime'] = function(time){ this.lastSeekTarget_ = time; this.el_.vjs_setProperty('currentTime', time); + vjs.MediaTechController.prototype.setCurrentTime.call(this); }; vjs.Flash.prototype['currentTime'] = function(tim...
true
Other
videojs
video.js
f4ce62d4b1e72b783f1eeb82b80e3050b3be7e83.json
Move manual events into tech controller Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to th...
src/js/media/media.js
@@ -18,6 +18,16 @@ vjs.MediaTechController = vjs.Component.extend({ options.reportTouchActivity = false; vjs.Component.call(this, player, options, ready); + // Manually track progress in cases where the browser/flash player doesn't report it. + if (!this.features['progressEvents']) { + this.manua...
true
Other
videojs
video.js
f4ce62d4b1e72b783f1eeb82b80e3050b3be7e83.json
Move manual events into tech controller Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to th...
src/js/player.js
@@ -163,10 +163,6 @@ vjs.Player.prototype.dispose = function(){ if (this.tag && this.tag['player']) { this.tag['player'] = null; } if (this.el_ && this.el_['player']) { this.el_['player'] = null; } - // Ensure that tracking progress and time progress will stop and plater deleted - this.stopTrackingProgress();...
true
Other
videojs
video.js
f4ce62d4b1e72b783f1eeb82b80e3050b3be7e83.json
Move manual events into tech controller Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to th...
test/index.html
@@ -29,6 +29,7 @@ 'test/unit/mediafaker.js', 'test/unit/player.js', 'test/unit/core.js', + 'test/unit/media.js', 'test/unit/media.html5.js', 'test/unit/controls.js', 'test/unit/poster.js',
true
Other
videojs
video.js
f4ce62d4b1e72b783f1eeb82b80e3050b3be7e83.json
Move manual events into tech controller Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to th...
test/sinon-externs.js
@@ -6,6 +6,8 @@ function sinon(){} sinon.stub = function(){}; sinon.spy = function(){}; sinon.mock = function(){}; +sinon.useFakeTimers = function(){}; +sinon.clock.tick = function(){}; Function.prototype.alwaysCalledOn = function(){}; Function.prototype.alwaysCalledWith = function(){};
true
Other
videojs
video.js
f4ce62d4b1e72b783f1eeb82b80e3050b3be7e83.json
Move manual events into tech controller Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to th...
test/unit/flash.js
@@ -69,7 +69,9 @@ test('currentTime is the seek target during seeking', function() { parentEl = document.createElement('div'), tech = new vjs.Flash({ id: noop, + bufferedPercent: noop, on: noop, + trigger: noop, options_: {} }, { 'parentEl': parentE...
true
Other
videojs
video.js
f4ce62d4b1e72b783f1eeb82b80e3050b3be7e83.json
Move manual events into tech controller Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to th...
test/unit/media.html5.js
@@ -11,11 +11,13 @@ module('HTML5', { el: function(){ return el; }, options_: {}, options: function(){ return {}; }, + bufferedPercent: function() { return 0; }, controls: function(){ return false; }, usingNativeControls: function(){ return false; }, on: function(){ return...
true
Other
videojs
video.js
f4ce62d4b1e72b783f1eeb82b80e3050b3be7e83.json
Move manual events into tech controller Migrate the timers that manage creating timeupdate and progress events when the tech doesn't support them natively. Now, techs that extend MediaTechController will continue to automatically pick up synthetic playback and buffering events but they're scoped much more closely to th...
test/unit/media.js
@@ -0,0 +1,142 @@ +var noop = function() {}, clock, features; + +module('Media Tech', { + 'setup': function() { + clock = sinon.useFakeTimers(); + features = videojs.util.mergeOptions({}, videojs.MediaTechController.prototype.features); + }, + 'teardown': function() { + clock.restore(); + videojs.MediaTe...
true
Other
videojs
video.js
3cfbf94245ad525ea46e9395c0f064b12042c87e.json
Fix issue with minified version
src/js/player.js
@@ -1624,7 +1624,7 @@ vjs.Player.prototype.listenForUserActivity = function(){ if (!this.userActivity_) { this.userActive(false); } - }), vjs.options.inactivityTimeout); + }), vjs.options['inactivityTimeout']); } }), 250);
false
Other
videojs
video.js
cfb688983b98322ff745fddfd6036af201812b7c.json
Add svg to font-face. fixes #1390
src/css/video-js.less
@@ -78,7 +78,8 @@ The control icons are from a custom font. Each icon corresponds to a character src: url('font/vjs.eot'); src: url('font/vjs.eot?#iefix') format('embedded-opentype'), url('font/vjs.woff') format('woff'), - url('font/vjs.ttf') format('truetype'); + url('font/vjs.ttf') format('truetype'), + u...
false
Other
videojs
video.js
6921b552ef625f3e5c37ecdc58cd57311f413e24.json
Update tracks.md with Caption Key info. Closes #1379
docs/guides/tracks.md
@@ -13,7 +13,7 @@ Creating the Text File ---------------------- Timed text requires a text file in [WebVTT](http://dev.w3.org/html5/webvtt/) format. This format defines a list of "cues" that have a start time, and end time, and text to display. [Microsoft has a builder](http://ie.microsoft.com/testdrive/Graphics/Capt...
false
Other
videojs
video.js
6789c921f52b5be713a9fb84f6ef6203c8c9b649.json
fix whitespace in util.js
src/js/util.js
@@ -6,10 +6,9 @@ vjs.util = {}; /** - * Merge two options objects, - * recursively merging any plain object properties as well. - * Previously `deepMerge` - * + * Merge two options objects, recursively merging any plain object properties as + * well. Previously `deepMerge` + * * @param {Object} obj1 Object to...
false
Other
videojs
video.js
bdc89a0b24421dc764299ae4f9ce1fbf0ba4cc83.json
bower: ignore dot files, build and tests
bower.json
@@ -12,5 +12,13 @@ "flash", "video", "player" - ] + ], + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests", + "build" + ], }
false
Other
videojs
video.js
95c29e684f405cb410a7e19dbf9668b5b46d349b.json
Reset player on source change. closes #1050 closes #1124
CHANGELOG.md
@@ -3,6 +3,7 @@ CHANGELOG ## HEAD (Unreleased) * Updated the UI to support live video ([view](https://github.com/videojs/video.js/pull/1121)) +* The UI now resets after a source change [[view](https://github.com/videojs/video.js/pull/1124)] --------------------
true
Other
videojs
video.js
95c29e684f405cb410a7e19dbf9668b5b46d349b.json
Reset player on source change. closes #1050 closes #1124
src/js/player.js
@@ -77,20 +77,7 @@ vjs.Player = vjs.Component.extend({ // this.addClass('vjs-touch-enabled'); // } - // Firstplay event implimentation. Not sold on the event yet. - // Could probably just check currentTime==0? - this.one('play', function(e){ - var fpEvent = { type: 'firstplay', target: this....
true
Other
videojs
video.js
95c29e684f405cb410a7e19dbf9668b5b46d349b.json
Reset player on source change. closes #1050 closes #1124
test/unit/player.js
@@ -371,3 +371,34 @@ test('should register players with generated ids', function(){ equal(player.el().id, player.id(), 'the player and element ids are equal'); ok(vjs.players[id], 'the generated id is registered'); }); + +test('should not add multiple first play events despite subsequent loads', function() { + ...
true
Other
videojs
video.js
c8bd862e3e2c9f1462d1f3fbb7722cd0d56ec9e5.json
Fix currentSrc when Flash returns null It looks like GCC was mangling `rtmpConnection` and `rtmpStream` before invoking them. Unfortunately, we define those methods as string literals so they do not have mangled equivalents. Invoke them using string literals so GCC never mangles the method names.
src/js/media/flash.js
@@ -284,8 +284,8 @@ vjs.Flash.prototype.currentSrc = function(){ var src = this.el_.vjs_getProperty('currentSrc'); // no src, check and see if RTMP if (src == null) { - var connection = this.rtmpConnection(), - stream = this.rtmpStream(); + var connection = this['rtmpConnection'](), + strea...
false
Other
videojs
video.js
e2a1cac13613ab17833b38a8248d062d952c9027.json
fix typo for unpatchCanPlayType
test/unit/media.html5.js
@@ -41,7 +41,7 @@ test('should re-link the player if the tech is moved', function(){ test('patchCanPlayType and unpatchCanPlayType are available on Html5 object', function() { ok(vjs.Html5.patchCanPlayType, 'patchCanPlayType is available'); - ok(vjs.Html5.unatchCanPlayType, 'unpatchCanPlayType is available'); + ...
false
Other
videojs
video.js
d21019ad785b49084bc99f1a97cf103f4d75384f.json
add existence test for patch and unpatch methods
test/unit/media.html5.js
@@ -39,6 +39,11 @@ test('should re-link the player if the tech is moved', function(){ strictEqual(player, tech.el()['player']); }); +test('patchCanPlayType and unpatchCanPlayType are available on Html5 object', function() { + ok(vjs.Html5.patchCanPlayType, 'patchCanPlayType is available'); + ok(vjs.Html5.unatch...
false
Other
videojs
video.js
fef6282d5532ddb211e3d72bc9f49c7d0c17ae0b.json
remove unused var
test/unit/media.html5.js
@@ -1,7 +1,5 @@ module('HTML5'); -var oldAndroidVersion; - test('should detect whether the volume can be changed', function(){ var testVid, ConstVolumeVideo; if (!{}['__defineSetter__']) {
false
Other
videojs
video.js
0a1d4b26457077afc9e58160086f3606883b49bf.json
use grunt connect for development
Gruntfile.js
@@ -71,6 +71,14 @@ module.exports = function(grunt) { files: [ 'src/**/*', 'test/unit/*.js', 'Gruntfile.js' ], tasks: 'dev' }, + connect: { + dev: { + options: { + port: 9999, + keepalive: true + } + } + }, copy: { minor: { files: [...
true
Other
videojs
video.js
0a1d4b26457077afc9e58160086f3606883b49bf.json
use grunt connect for development
package.json
@@ -26,6 +26,7 @@ "devDependencies": { "grunt-cli": "~0.1.0", "grunt": "~0.4", + "grunt-contrib-connect": "~0.7.1", "grunt-contrib-jshint": "~0.4.3", "grunt-contrib-watch": "~0.1.4", "grunt-contrib-qunit": "~0.2.1",
true
Other
videojs
video.js
f86e073f03aa504c11e272d40daf4ab6a6728483.json
Switch HTMLVideoElement to constructor reference
src/js/media/html5.js
@@ -276,10 +276,10 @@ vjs.Html5.canControlVolume = function(){ // Android 4.0 and above can play HLS to some extent but it reports being unable to do so if (vjs.ANDROID_VERSION >= 4.0) { if (!canPlayType) { - canPlayType = HTMLVideoElement.prototype.canPlayType; + canPlayType = vjs.TEST_V...
false
Other
videojs
video.js
d48d6cf99db8feefec4ee3961ff1cb9e7b2c5ad2.json
add a test
test/unit/events.js
@@ -114,3 +114,20 @@ test('should bubble up DOM unless bubbles == false', function(){ }); vjs.trigger(inner, { type:'nobub', target:inner, bubbles:false }); }); + +test('should have a defaultPrevented property on an event that was prevent from doing default action', function() { + expect(2); + + var el = docum...
false
Other
videojs
video.js
416ee1b2a05af5f4d0a65c08955ccaa94dd2ce90.json
Fix code in examples. The examples are broken with extra parentheses. Fixed.
docs/guides/setup.md
@@ -89,13 +89,13 @@ The third argument is a 'ready' callback. Once Video.js has initialized it will Instead of using an element ID, you can also pass a reference to the element itself. ```js -videojs(document.getElementsById('example_video_1')), {}, function()) { +videojs(document.getElementsById('example_video_1')...
false
Other
videojs
video.js
b7cc2a8a4c6e329322cc182447b7052850ed48ff.json
Prevent mousemove spam Some platforms produce frequent mousemove events whether or not the mouse has moved. This causes the UI to always be displayed since userActive_ is always `true`. By keeping track of the last mouse position and only firing if the new position is different, we can eleminate the event spam.
src/js/player.js
@@ -1294,38 +1294,47 @@ vjs.Player.prototype.userActive = function(bool){ }; vjs.Player.prototype.listenForUserActivity = function(){ - var onMouseActivity, onMouseDown, mouseInProgress, onMouseUp, - activityCheck, inactivityTimeout; + var onActivity, onMouseMove, onMouseDown, mouseInProgress, onMouseUp, + ...
false
Other
videojs
video.js
f3166ad082612d156fb36fbec173105939f6c609.json
Add speced event.defaultPrevented
src/js/events.js
@@ -206,9 +206,11 @@ vjs.fixEvent = function(event) { } event.returnValue = false; event.isDefaultPrevented = returnTrue; + event.defaultPrevented = true; }; event.isDefaultPrevented = returnFalse; + event.defaultPrevented = false; // Stop the event from bubbling eve...
false
Other
videojs
video.js
efd4822c6be0688e8c87848160a06d1368c00092.json
Update the Readme.md file with the current year.
README.md
@@ -1,4 +1,3 @@ - # [Video.js - HTML5 Video Player](http://videojs.com) [![Build Status](https://travis-ci.org/zencoder/video-js.png?branch=master)](https://travis-ci.org/zencoder/video-js) > Video.js is a web video player built from the ground up for an HTML5 world. It supports HTML5 and Flash video, as well as Y...
false
Other
videojs
video.js
b0a6cf335a20f07d58e9f73117e032685ec34057.json
Move captions down when controls are inactive
src/css/video-js.less
@@ -770,6 +770,8 @@ body.vjs-full-window { left: 1em; right: 1em; } +/* Move captions down when controls aren't being shown */ +.video-js.vjs-user-inactive .vjs-text-track-display { bottom: 1em; } /* Individual tracks */ .video-js .vjs-text-track { display: none;
false
Other
videojs
video.js
5146c1fa4a3715ab32e519b36549775b6bdba1a8.json
Add component.json file
component.json
@@ -0,0 +1,22 @@ +{ + "name": "video.js", + "description": "An HTML5 and Flash video player with a common API and skin for both.", + "version": "4.4.1", + "keywords": [ + "videojs", + "html5", + "flash", + "video", + "player" + ], + "scripts": ["dist/video-js/video.dev.js"], + "styles": ["dist/vid...
false
Other
videojs
video.js
4d9d06e1c9e378b5ba677a8974dcdfbdbac4cd28.json
Enable building videojs with browserify. This uses browserify-shim to get browserify to recognize videojs. It uses dist/video-js/video.js for the main file of the module. To build using browserify, you just run browserify on the module and use --standalone (or -s) to make it produce a UMD file. This seems to work just ...
package.json
@@ -36,6 +36,19 @@ "karma-qunit": "~0.0.2", "videojs-doc-generator": "0.0.1", "qunitjs": "~1.12.0", - "grunt-zip": "0.10.2" + "grunt-zip": "0.10.2", + "browserify-shim": "~3.2.2" + }, + "main": "./dist/video-js/video.dev.js", + "browser": { + "videojs": "./dist/video-js/video.js" + }, + ...
false
Other
videojs
video.js
75a23135e62ad23fec6a6bb1d39a02af104fcf09.json
Report user activity on touchmove if userWasActive
src/js/media/media.js
@@ -61,6 +61,8 @@ vjs.MediaTechController.prototype.initControlsListeners = function(){ }; vjs.MediaTechController.prototype.addControlsListeners = function(){ + var userWasActive; + // Some browsers (Chrome & IE) don't trigger a click on a flash swf, but do // trigger mousedown/up. // http://stackoverflo...
false
Other
videojs
video.js
4d2267c1bc91bcc4acada17d730d431a7787d6a1.json
use tap events. Report activity on touch move.
src/js/media/media.js
@@ -61,9 +61,6 @@ vjs.MediaTechController.prototype.initControlsListeners = function(){ }; vjs.MediaTechController.prototype.addControlsListeners = function(){ - var userWasActive, - touchmove = false; - // Some browsers (Chrome & IE) don't trigger a click on a flash swf, but do // trigger mousedown/up....
false
Other
videojs
video.js
a7d624affe53ead68bf70bf0bb6eedee34f728da.json
stop immediate propagation on tap events Make media tech controller only hide control bar.
src/js/component.js
@@ -868,7 +868,9 @@ vjs.Component.prototype.emitTapEvents = function(){ // When the touch ends, measure how long it took and trigger the appropriate // event - this.on('touchend', function() { + this.on('touchend', function(event) { + event.stopImmediatePropagation(); + // Proceed only if the touchmov...
true
Other
videojs
video.js
a7d624affe53ead68bf70bf0bb6eedee34f728da.json
stop immediate propagation on tap events Make media tech controller only hide control bar.
src/js/media/media.js
@@ -134,7 +134,10 @@ vjs.MediaTechController.prototype.onClick = function(event){ */ vjs.MediaTechController.prototype.onTap = function(){ - this.player().userActive(!this.player().userActive()); + var userActivity = this.player().userActive(); + if (userActivity) { + this.player().userActive(!userActivity);...
true
Other
videojs
video.js
4b254a07df8069e36803a8001234539c604916c2.json
remove unused var
src/js/component.js
@@ -78,7 +78,7 @@ vjs.Component = vjs.CoreObject.extend({ touchmove = true; })); this.on('touchend', vjs.bind(this, function(event) { - if (!touchmove && !didSomething) { + if (!touchmove) { this.player_.reportUserActivity(); } }));
false
Other
videojs
video.js
07cd9800e8cbd1b7822ead6b249d015650ef80c8.json
Fix touch events. Make components listen to touch events themselves. Components can have a "listenToTouchMove" property that would report user activity on touch moves. Currently, the only problem left is that the MediaTechController emits tap events to show/hide the controlbar but that causes the control bar to not be ...
src/js/component.js
@@ -65,6 +65,23 @@ vjs.Component = vjs.CoreObject.extend({ this.ready(ready); // Don't want to trigger ready here or it will before init is actually // finished for all children that run this constructor + + + var touchmove = false; + this.on('touchstart', function() { + touchmove = false; + ...
true
Other
videojs
video.js
07cd9800e8cbd1b7822ead6b249d015650ef80c8.json
Fix touch events. Make components listen to touch events themselves. Components can have a "listenToTouchMove" property that would report user activity on touch moves. Currently, the only problem left is that the MediaTechController emits tap events to show/hide the controlbar but that causes the control bar to not be ...
src/js/control-bar/control-bar.js
@@ -24,6 +24,8 @@ vjs.ControlBar.prototype.options_ = { } }; +vjs.ControlBar.prototype.listenToTouchMove = true; + vjs.ControlBar.prototype.createEl = function(){ return vjs.createEl('div', { className: 'vjs-control-bar'
true
Other
videojs
video.js
07cd9800e8cbd1b7822ead6b249d015650ef80c8.json
Fix touch events. Make components listen to touch events themselves. Components can have a "listenToTouchMove" property that would report user activity on touch moves. Currently, the only problem left is that the MediaTechController emits tap events to show/hide the controlbar but that causes the control bar to not be ...
src/js/control-bar/progress-control.js
@@ -19,6 +19,8 @@ vjs.ProgressControl.prototype.options_ = { } }; +vjs.ProgressControl.prototype.listenToTouchMove = true; + vjs.ProgressControl.prototype.createEl = function(){ return vjs.Component.prototype.createEl.call(this, 'div', { className: 'vjs-progress-control vjs-control'
true
Other
videojs
video.js
07cd9800e8cbd1b7822ead6b249d015650ef80c8.json
Fix touch events. Make components listen to touch events themselves. Components can have a "listenToTouchMove" property that would report user activity on touch moves. Currently, the only problem left is that the MediaTechController emits tap events to show/hide the controlbar but that causes the control bar to not be ...
src/js/media/media.js
@@ -82,24 +82,8 @@ vjs.MediaTechController.prototype.addControlsListeners = function(){ this.on('touchstart', function(event) { // Stop the mouse events from also happening event.preventDefault(); - event.stopPropagation(); - // Record if the user was active now so we don't have to keep polling it - ...
true
Other
videojs
video.js
07cd9800e8cbd1b7822ead6b249d015650ef80c8.json
Fix touch events. Make components listen to touch events themselves. Components can have a "listenToTouchMove" property that would report user activity on touch moves. Currently, the only problem left is that the MediaTechController emits tap events to show/hide the controlbar but that causes the control bar to not be ...
src/js/player.js
@@ -1316,14 +1316,6 @@ vjs.Player.prototype.listenForUserActivity = function(){ this.on('keydown', onMouseActivity); this.on('keyup', onMouseActivity); - // Consider any touch events that bubble up to be activity - // Certain touches on the tech will be blocked from bubbling because they - // toggle controls...
true
Other
videojs
video.js
07cd9800e8cbd1b7822ead6b249d015650ef80c8.json
Fix touch events. Make components listen to touch events themselves. Components can have a "listenToTouchMove" property that would report user activity on touch moves. Currently, the only problem left is that the MediaTechController emits tap events to show/hide the controlbar but that causes the control bar to not be ...
src/js/slider.js
@@ -50,6 +50,8 @@ vjs.Slider.prototype.createEl = function(type, props) { return vjs.Component.prototype.createEl.call(this, type, props); }; +vjs.Slider.prototype.listenToTouchMove = true; + vjs.Slider.prototype.onMouseDown = function(event){ event.preventDefault(); vjs.blockTextSelection(); @@ -230,3 +23...
true
Other
videojs
video.js
9088dfffc9b4c7f01f6169d7caf7b678d5770839.json
Use specific launcher versions
package.json
@@ -36,12 +36,12 @@ "grunt-contrib-less": "~0.6.4", "grunt-karma": "~0.6.2", "karma": "~0.10.0", - "karma-chrome-launcher": "*", - "karma-firefox-launcher": "*", - "karma-ie-launcher": "*", - "karma-opera-launcher": "*", - "karma-phantomjs-launcher": "*", - "karma-safari-launcher": "*",...
false
Other
videojs
video.js
491b9b232b73dc28946dc4cc8372c7810918e5b1.json
Remove added userActivity_ to global
src/js/player.js
@@ -1286,7 +1286,7 @@ vjs.Player.prototype.listenForUserActivity = function(){ var onMouseActivity, onMouseDown, mouseInProgress, onMouseUp, activityCheck, inactivityTimeout; - onMouseActivity = this.reportUserActivity; + onMouseActivity = vjs.bind(this, this.reportUserActivity); onMouseDown = functi...
false
Other
videojs
video.js
2aa09fd15aecdf366f355725e6c788d73f7aab97.json
Close GH-862: Add util namespace.
build/source-loader.js
@@ -19,6 +19,7 @@ var sourceFiles = [ "src/js/core-object.js", "src/js/events.js", "src/js/lib.js", + "src/js/util.js", "src/js/component.js", "src/js/button.js", "src/js/slider.js",
true
Other
videojs
video.js
2aa09fd15aecdf366f355725e6c788d73f7aab97.json
Close GH-862: Add util namespace.
src/js/component.js
@@ -169,7 +169,7 @@ vjs.Component.prototype.options_; vjs.Component.prototype.options = function(obj){ if (obj === undefined) return this.options_; - return this.options_ = vjs.obj.deepMerge(this.options_, obj); + return this.options_ = vjs.util.mergeOptions(this.options_, obj); }; /**
true
Other
videojs
video.js
2aa09fd15aecdf366f355725e6c788d73f7aab97.json
Close GH-862: Add util namespace.
src/js/util.js
@@ -0,0 +1,40 @@ +/** + * Utility functions namespace + * @namespace + * @type {Object} + */ +vjs.util = {}; + +/** + * Merge two options objects, + * recursively merging any plain object properties as well. + * Previously `deepMerge` + * + * @param {Object} obj1 Object to override values in + * @param {Object} obj...
true
Other
videojs
video.js
2aa09fd15aecdf366f355725e6c788d73f7aab97.json
Close GH-862: Add util namespace.
test/unit/util.js
@@ -0,0 +1,29 @@ +module('util'); + +test('should merge options objects', function(){ + var ob1, ob2, ob3; + + ob1 = { + a: true, + b: { b1: true, b2: true, b3: true }, + c: true + }; + + ob2 = { + // override value + a: false, + // merge sub-option values + b: { b1: true, b2: false, b4: true }...
true
Other
videojs
video.js
1cab78347d244996eb8b0c2a49f541c0283e9d3d.json
Close GH-845: Move player id generation.
src/js/player.js
@@ -32,6 +32,9 @@ vjs.Player = vjs.Component.extend({ init: function(tag, options, ready){ this.tag = tag; // Store the original tag used to set options + // Make sure tag ID exists + tag.id = tag.id || 'vjs_video_' + vjs.guid++; + // Set Options // The options argument overrides options set i...
true
Other
videojs
video.js
1cab78347d244996eb8b0c2a49f541c0283e9d3d.json
Close GH-845: Move player id generation.
test/unit/player.js
@@ -356,3 +356,18 @@ test('should use custom message when encountering an unsupported video type', player.dispose(); }); + +test('should register players with generated ids', function(){ + var fixture, video, player, id; + fixture = document.getElementById('qunit-fixture'); + + video = document.createElement('...
true
Other
videojs
video.js
7efcbd5e19686ef64764c5357e1be9a8fd860cfa.json
Use externs to prevent obfuscation Instead of using string literals, create an externs file for the player and use that to ensure fullscreen functionality is never minified.
Gruntfile.js
@@ -52,12 +52,12 @@ module.exports = function(grunt) { minify: { source:{ src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js'], - externs: ['src/js/media/flash.externs.js'], + externs: ['src/js/player.externs.js', 'src/js/media/flash.externs.js'],...
true
Other
videojs
video.js
7efcbd5e19686ef64764c5357e1be9a8fd860cfa.json
Use externs to prevent obfuscation Instead of using string literals, create an externs file for the player and use that to ensure fullscreen functionality is never minified.
src/js/control-bar/fullscreen-toggle.js
@@ -23,11 +23,11 @@ vjs.FullscreenToggle.prototype.buildCSSClass = function(){ }; vjs.FullscreenToggle.prototype.onClick = function(){ - if (!this.player_['isFullScreen']) { - this.player_['requestFullScreen'](); + if (!this.player_.isFullScreen) { + this.player_.requestFullScreen(); this.el_.children[...
true
Other
videojs
video.js
7efcbd5e19686ef64764c5357e1be9a8fd860cfa.json
Use externs to prevent obfuscation Instead of using string literals, create an externs file for the player and use that to ensure fullscreen functionality is never minified.
src/js/player.externs.js
@@ -0,0 +1,11 @@ +/** + * @fileoverview Externs for videojs.Player. Externs are functions that the + * compiler shouldn't obfuscate. + */ + +/** + * Fullscreen functionality + */ +videojs.Player.prototype.isFullScreen = undefined; +videojs.Player.prototype.requestFullScreen = function(){}; +videojs.Player.prototype.can...
true
Other
videojs
video.js
cb9447b2c3579e1f00b7d9318ca8ba7f42ff7beb.json
Fix typo in test description availble -> available
test/unit/api.js
@@ -91,7 +91,7 @@ test('should be able to initialize player twice on the same tag using string ref player.dispose(); }); -test('videojs.players should be availble after minification', function() { +test('videojs.players should be available after minification', function() { var videoTag = PlayerTest.makeTag(); ...
false
Other
videojs
video.js
f515ac02363b490974a052a772632d521ec090a6.json
Close GH-627: Use dashes to format invalid times.
src/js/control-bar/time-display.js
@@ -65,8 +65,9 @@ vjs.DurationDisplay.prototype.createEl = function(){ }; vjs.DurationDisplay.prototype.updateContent = function(){ - if (this.player_.duration()) { - this.content.innerHTML = '<span class="vjs-control-text">Duration Time </span>' + vjs.formatTime(this.player_.duration()); // label the duratio...
true
Other
videojs
video.js
f515ac02363b490974a052a772632d521ec090a6.json
Close GH-627: Use dashes to format invalid times.
src/js/lib.js
@@ -452,13 +452,21 @@ vjs.el = function(id){ * @return {String} Time formatted as H:MM:SS or M:SS */ vjs.formatTime = function(seconds, guide) { - guide = guide || seconds; // Default to using seconds as guide + // Default to using seconds as guide + guide = guide || seconds; var s = Math.floor(secon...
true
Other
videojs
video.js
f515ac02363b490974a052a772632d521ec090a6.json
Close GH-627: Use dashes to format invalid times.
test/unit/lib.js
@@ -194,6 +194,13 @@ test('should format time as a string', function(){ ok(vjs.formatTime(1,360000) === '0:00:01'); }); +test('should format invalid times as dashes', function(){ + equal(vjs.formatTime(Infinity, 90), '-:-'); + equal(vjs.formatTime(NaN), '-:-'); + equal(vjs.formatTime(10, Infinity), '0:00:10');...
true
Other
videojs
video.js
2f68bfc7c146b2a01ad67dc547698e09cdfedc65.json
Fix spinner position.
src/css/video-js.less
@@ -520,6 +520,8 @@ easily in the skin designer. http://designer.videojs.com/ font-family: VideoJS; position: absolute; + top: 0; + left: 0; width: 1em; height: 1em; text-align: center; @@ -534,6 +536,8 @@ easily in the skin designer. http://designer.videojs.com/ font-family: VideoJS; positio...
false
Other
videojs
video.js
a726b075382ee628ae5d494ecf14d1609d0dabde.json
Add player.dispose() API documentation to api.md
docs/api.md
@@ -186,6 +186,14 @@ myPlayer.cancelFullScreen(); ``` +### dispose() ### +Destroys the video player and does any necessary cleanup. This is especially helpfull if you are dynamically adding and removing videos to/from the DOM. Use after removing videos from the DOM +```js +myPlayer.dispose(); +``` + + + Events -...
false
Other
videojs
video.js
db97df69dcac407b011b04c1552c06a7d3bf4390.json
Close GH-606: Fix IE9 canPlayType error. Fixes #519
src/js/media/html5.js
@@ -207,11 +207,17 @@ vjs.Html5.prototype.defaultMuted = function(){ return this.el_.defaultMuted; }; /* HTML5 Support Testing ---------------------------------------------------- */ vjs.Html5.isSupported = function(){ - return !!document.createElement('video').canPlayType; + return !!vjs.TEST_VID.canPlayType; }...
false
Other
videojs
video.js
60d389e1f8b51ee3e9cb38e6607d86b96f6ce848.json
Close GH-571: Add analtyics to current CDN version. Fixes #568
Gruntfile.js
@@ -1,8 +1,9 @@ module.exports = function(grunt) { - var pkg, s3, semver, version, verParts; + var pkg, s3, semver, version, verParts, uglify; semver = require('semver'); pkg = grunt.file.readJSON('package.json'); + uglify = require('uglify-js'); try { s3 = grunt.file.readJSON('.s3config.json'); @...
true
Other
videojs
video.js
60d389e1f8b51ee3e9cb38e6607d86b96f6ce848.json
Close GH-571: Add analtyics to current CDN version. Fixes #568
contrib.json
@@ -1,6 +1,8 @@ { + "owner": "videojs", + "project": "video.js", "developmentBranch": "master", "releaseBranch": "stable", - "remote": "origin", - "upstream": "zencoder" -} \ No newline at end of file + "remote": "origin" +} +
true
Other
videojs
video.js
60d389e1f8b51ee3e9cb38e6607d86b96f6ce848.json
Close GH-571: Add analtyics to current CDN version. Fixes #568
src/js/cdn.js
@@ -0,0 +1,56 @@ +/** + * Google Analytics tracking pixel for the freely hosted version of Video.js + * at vjs.zencdn.net. We'll use this data to develop a support matrix of + * browsers and devices, and possibly track errors. + * + * This code generates the GA tracking URL without requiring the GA javascript + * libra...
true
Other
videojs
video.js
fc96ef68ac8cf84c9abeac5416a03ee1b24a10c1.json
fix jshint errors
test/unit/lib.js
@@ -208,17 +208,17 @@ test('should get an absolute URL', function(){ test('vjs.findPosition should find top and left position', function() { var d = document.createElement('div'), position = vjs.findPosition(d); - d.style.top = "10px"; - d.style.left = "20px"; - d.style.position = "absolute"; + d.style.top...
false
Other
videojs
video.js
90f975c20e2229c47bb403c70c1f46a3bc0f1fd1.json
Catch localStorage security exceptions. Fixes #351
src/js/lib.js
@@ -543,16 +543,20 @@ vjs.get = function(url, onSuccess, onError){ /* Local Storage ================================================================================ */ vjs.setLocalStorage = function(key, value){ - // IE was throwing errors referencing the var anywhere without this - var localStorage = window.local...
false
Other
videojs
video.js
9576710b2f20c142e0277a0342d967a21f1da17a.json
Update minify task to work with grunt-cli 0.1.6 It looks like the newer version of grunt-cli has changed how options objects are forwarded to tasks. The minify (Google closure compiler) task was looking for configuration in the wrong location and the new location no longer automatically expanded path wildcard patterns.
Gruntfile.js
@@ -105,18 +105,18 @@ module.exports = function(grunt) { var done = this.async(); var exec = require('child_process').exec; - var externs = this.files[0].externs || []; - var dest = this.files[0].dest; - var files = []; + var externs = this.data.externs || []; + var dest = this.data.dest; + ...
false
Other
videojs
video.js
b1b0ac0377b3fefe9c09c9d09bd83421c14672c7.json
Add videojs to window directly. Fix #448
src/js/core.js
@@ -52,6 +52,7 @@ var vjs = function(id, options, ready){ // Extended name, also available externally, window.videojs var videojs = vjs; +window.videojs = window.vjs = vjs; // CDN Version. Used to target right flash swf. vjs.CDN_VERSION = 'GENERATED_CDN_VSN';
false
Other
videojs
video.js
fd798f3dac7f8594ffc492b5d02bf2426d050ca4.json
Fix script after video DOM You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)
src/js/setup.js
@@ -58,4 +58,5 @@ vjs.one(window, 'load', function(){ }); // Run Auto-load players -vjs.autoSetup(); +// You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version) +vjs.autoSetupTimeout(1);
false
Other
videojs
video.js
bafaf49e7ee1cb7beac6d2aa27e88e87638c1e96.json
Close GH-433: Update contribflow version and add contrib.json.
contrib.json
@@ -0,0 +1,6 @@ +{ + "developmentBranch": "master", + "releaseBranch": "stable", + "remote": "origin", + "upstream": "zencoder" +} \ No newline at end of file
true
Other
videojs
video.js
bafaf49e7ee1cb7beac6d2aa27e88e87638c1e96.json
Close GH-433: Update contribflow version and add contrib.json.
package.json
@@ -27,7 +27,7 @@ "grunt-contrib-clean": "~0.4.0a", "grunt-contrib-copy": "~0.3.2", "mocha": "~1.8.1", - "contribflow": "~0.1.0" + "contribflow": "~0.2.0" }, "testling": { "browsers": [
true