Skip to content

Commit

Permalink
Merge pull request #1 from timonbandit/master
Browse files Browse the repository at this point in the history
issue mickey#28 fixed
  • Loading branch information
devkinetic authored Jan 12, 2017
2 parents aca7a58 + 1683026 commit a144955
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions dist/videojs.ga.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* videojs-ga - v0.4.2 - 2015-02-06
* Copyright (c) 2015 Michael Bensoussan
* videojs-ga - v0.4.2 - 2016-07-23
* Copyright (c) 2016 Michael Bensoussan
* Licensed MIT
*/
(function() {
Expand All @@ -12,8 +12,8 @@
options = {};
}
dataSetupOptions = {};
if (this.options()["data-setup"]) {
parsedOptions = JSON.parse(this.options()["data-setup"]);
if (this.options_["data-setup"]) {
parsedOptions = JSON.parse(this.options_["data-setup"]);
if (parsedOptions.ga) {
dataSetupOptions = parsedOptions.ga;
}
Expand Down
6 changes: 3 additions & 3 deletions dist/videojs.ga.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/videojs.ga.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
videojs.plugin 'ga', (options = {}) ->
# this loads options from the data-setup attribute of the video tag
dataSetupOptions = {}
if @options()["data-setup"]
parsedOptions = JSON.parse(@options()["data-setup"])
if @options_["data-setup"]
parsedOptions = JSON.parse(@options_["data-setup"])
dataSetupOptions = parsedOptions.ga if parsedOptions.ga

defaultsEventsToTrack = [
Expand Down

0 comments on commit a144955

Please sign in to comment.