Merge pull request #45 from slanningGH/dev

Moving setDomainName. Thank you slanningGH! Those are some great changes, and with test coverage. Fantastic.
revolunet · Oct 14, 2014 · 809419a · 809419a
2 parents e61861a + 450df5b
commit 809419a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dist/angular-google-analytics.js b/dist/angular-google-analytics.js
@@ -1,6 +1,6 @@
 /**
  * Angular Google Analytics - Easy tracking for your AngularJS application
- * @version v0.0.6 - 2014-10-07
+ * @version v0.0.6 - 2014-10-14
  * @link http://github.com/revolunet/angular-google-analytics
  * @author Julien Bouquillon <[email protected]>
  * @license MIT License, http://www.opensource.org/licenses/MIT
@@ -125,6 +125,7 @@ angular.module('angular-google-analytics', [])
             if (!accountId) return;
             $window._gaq = [];
             $window._gaq.push(['_setAccount', accountId]);
+            if(domainName) $window._gaq.push(['_setDomainName', domainName]);
             if (enhancedLinkAttribution) {
               $window._gaq.push(['_require', 'inpage_linkid', '//www.google-analytics.com/plugins/ga/inpage_linkid.js']);
             }
@@ -135,7 +136,6 @@ angular.module('angular-google-analytics', [])
                 $window._gaq.push(['_trackPageview']);
               }
             }
-            if(domainName) $window._gaq.push(['_setDomainName', domainName]);
             var gaSrc;
             if(displayFeatures) {
               gaSrc = ('https:' === document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';

diff --git a/dist/angular-google-analytics.min.js b/dist/angular-google-analytics.min.js
diff --git a/src/angular-google-analytics.js b/src/angular-google-analytics.js
@@ -118,6 +118,7 @@ angular.module('angular-google-analytics', [])
             if (!accountId) return;
             $window._gaq = [];
             $window._gaq.push(['_setAccount', accountId]);
+            if(domainName) $window._gaq.push(['_setDomainName', domainName]);
             if (enhancedLinkAttribution) {
               $window._gaq.push(['_require', 'inpage_linkid', '//www.google-analytics.com/plugins/ga/inpage_linkid.js']);
             }
@@ -128,7 +129,6 @@ angular.module('angular-google-analytics', [])
                 $window._gaq.push(['_trackPageview']);
               }
             }
-            if(domainName) $window._gaq.push(['_setDomainName', domainName]);
             var gaSrc;
             if(displayFeatures) {
               gaSrc = ('https:' === document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';