Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'stable'

Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video.dev.js
	dist/video-js/video.js
	dist/video-js/video.novtt.dev.js
	dist/video-js/video.novtt.js
commit 0020ba15b9ae2b60e51d4d8d2751ffa31d18694d 2 parents 999dd60 + 9009593
Steve Heffernan heff authored
3  CHANGELOG.md
View
@@ -6,6 +6,9 @@ _(none)_
--------------------
+## 4.12.4 (2015-03-05)
+* Randomized the Google Analytics calls to stay under the limit ([view](https://github.com/videojs/video.js/pull/1916))
+
## 4.12.3 (2015-02-28)
* @heff fixed setting the source to an empty string ([view](https://github.com/videojs/video.js/pull/1905))
2  bower.json
View
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
- "version": "4.12.3",
+ "version": "4.12.4",
"main": [
"dist/video-js/video.js",
"dist/video-js/video-js.css",
2  component.json
View
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
- "version": "4.12.3",
+ "version": "4.12.4",
"keywords": [
"videojs",
"html5",
2  package.json
View
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
- "version": "4.12.3",
+ "version": "4.12.4",
"copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
"keywords": [
"videojs",
6 src/js/cdn.js
View
@@ -11,6 +11,12 @@
;(function(i,w,n,e,l){
l=w.location;
+ // Google Analytics has a limit of 10 million hits per month for free accounts.
+ // The Video.js CDN goes over this (by a lot) and they've asked us to stop.
+ if (Math.random() > 0.01) {
+ return;
+ }
+
// Setting the source of an image will load the URL even without adding to dom
// Using //www, still seems to work for https even though ssl.google is used by google
i.src='//www.google-analytics.com/__utm.gif'
Please sign in to comment.
Something went wrong with that request. Please try again.