Permalink
Browse files

Merge branch 'develop' of github.com:CardinalPath/gas into develop

  • Loading branch information...
2 parents f4ad2c2 + bc23a7f commit 42a47b97eb0f5ecfb26747d9bb4e5ea6e8f13d15 @eduardocereto eduardocereto committed Apr 18, 2012
Showing with 8 additions and 7 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 Makefile
  3. +1 −2 src/core.js
  4. +2 −2 src/header.js
  5. +2 −1 src/plugins/mailto.js
  6. +1 −1 src/plugins/outbound.js
View
@@ -2,6 +2,7 @@
Thumbs.db
Icon?
*.swp
+*.swo
*~
*.zip
_site
View
@@ -3,7 +3,7 @@
CLOSURE_COMPILER = java -jar ~/compiler.jar --compilation_level ADVANCED_OPTIMIZATIONS
#CLOSURE_COMPILER = java -jar ~/compiler.jar --compilation_level ADVANCED_OPTIMIZATIONS --formatting PRETTY_PRINT
#CLOSURE_COMPILER = java -jar ~/compiler.jar --formatting PRETTY_PRINT
-UGLIFYJS = uglifyjs -v
+UGLIFYJS = uglifyjs --ascii -v
# http://code.google.com/closure/utilities/index.html
CLOSURE_LINTER = gjslint
View
@@ -30,7 +30,6 @@ var document = window.document,
slice = Array.prototype.slice,
trim = String.prototype.trim,
sindexOf = String.prototype.indexOf,
- aindexOf = Array.prototype.indexOf,
url = document.location.href,
documentElement = document.documentElement;
@@ -40,7 +39,7 @@ var document = window.document,
*/
function GAS() {
var self = this;
- self['version'] = '1.6';
+ self['version'] = '1.7';
self._accounts = {};
self._accounts_length = 0;
self._queue = _prev_gas;
View
@@ -1,8 +1,8 @@
/**
- * @preserve Copyright 2011, Cardinal Path and Direct Performance.
+ * @preserve Copyright 2011, Cardinal Path and DigitalInc.
*
* GAS - Google Analytics on Steroids
- * https://bitbucket.org/dpc/gas
+ * https://github.com/CardinalPath/gas
*
* @author Eduardo Cereto <eduardocereto@gmail.com>
* Licensed under the GPLv3 license.
View
@@ -27,7 +27,8 @@ var _gasTrackMailto = function(opts) {
this._liveEvent('a', 'mousedown', function(e) {
var el = e.target;
- if (el && el.href && el.href.toLowerCase().indexOf('mailto:') === 0) {
+ if (el && el.href && el.href.toLowerCase &&
+ sindexOf.call(el.href.toLowerCase(), 'mailto:') === 0) {
_gas.push(['_trackEvent', opts['category'], el.href.substr(7)]);
}
});
View
@@ -32,7 +32,7 @@ var _gasTrackOutboundLinks = function(opts) {
var l = this;
if (
(l.protocol == 'http:' || l.protocol == 'https:') &&
- sindexOf.call(l.href, document.location.hostname) === -1)
+ sindexOf.call(l.hostname, document.location.hostname) === -1)
{
var path = (l.pathname + l.search + ''),
utm = sindexOf.call(path, '__utm');

0 comments on commit 42a47b9

Please sign in to comment.