1.0.5

* console scroll fix * console sets existing plugins on load Omniture plugin * options bugfix
brewster1134 · Oct 29, 2014 · 3672323 · 3672323
1 parent d8db606
commit 3672323
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 38 deletions.
diff --git a/lib/atrackt.console.js b/lib/atrackt.console.js
diff --git a/lib/plugins/atrackt.omniture.js b/lib/plugins/atrackt.omniture.js
diff --git a/src/README.md b/src/README.md
@@ -1,4 +1,8 @@
 ### CHANGE LOG
+###### 1.0.5
+* console scroll fix
+* console sets existing plugins on load
+
 ###### 1.0.4
 * console loads after document ready and collects all existing element
 * console now has scrolling support on hover

diff --git a/src/atrackt.console.coffee b/src/atrackt.console.coffee
@@ -1,7 +1,7 @@
 ###
 Atrackt Tracking Library
 https://github.com/brewster1134/atrackt
-@version 1.0.2
+@version 1.0.5
 @author Ryan Brewster
 ###
 
@@ -46,6 +46,7 @@ https://github.com/brewster1134/atrackt
       $('#atrackt-location', @$console).text @_getLocation()
       $('body').addClass('atrackt-console').prepend @$console
 
+      @_setPlugins()
       @_renderConsoleElements()
 
     # Override the custom class to just log tracking data to the console
@@ -59,6 +60,11 @@ https://github.com/brewster1134/atrackt
         plugin.send = (data, options) ->
           console.log plugin.name, data, options
 
+    _setPlugins: ->
+      for pluginName, plugin of @plugins
+        unless plugin._send
+          @setPlugin pluginName, plugin
+
     # Re-render console elements
     #
     _renderConsoleElements: ->
@@ -129,9 +135,9 @@ https://github.com/brewster1134/atrackt
               offset:
                 top: -300
           else if @ == $trackEl[0]
-            self.$console.scrollTo $rowEl, 0
+            self.$console.scrollTo $rowEl, 0,
               offset:
-                top: -50
+                top: -100
       , ->
         $rowEl.removeClass 'atrackt-console-active'
         $trackEl.removeClass 'atrackt-console-active'
diff --git a/src/plugins/README.md b/src/plugins/README.md
@@ -14,6 +14,9 @@
 * Just a simple send method!
 
 ##### Omniture Plugin
+###### 1.0.5
+* options bugfix
+
 ###### 1.0.0
 * updated to new api
 

diff --git a/src/plugins/atrackt.omniture.coffee b/src/plugins/atrackt.omniture.coffee
@@ -2,35 +2,37 @@
 Atrackt Omniture Plugin
 https://github.com/brewster1134/atrackt
 @author Ryan Brewster
-@version 1.0.2
+@version 1.0.5
 ###
 
 ((root, factory) ->
   if typeof define == 'function' && define.amd
     define [
+      'jquery'
       'atrackt'
-    ], (Atrackt) ->
-      factory Atrackt
+    ], ($, Atrackt) ->
+      factory $, Atrackt
   else
-    factory Atrackt
-) @, (Atrackt) ->
+    factory $, Atrackt
+) @, ($, Atrackt) ->
 
   window.Atrackt.setPlugin 'omniture',
     send: (data, options) ->
       return console.error 'ATRACKT ERROR: PLUGIN `omniture` - Site catalyst library not loaded' if typeof s == 'undefined'
 
+      $.extend true, @options, options
       data._categories = data._categories?.join @options.delimiters.category
-      data = @translatePropMap data
+      data = @_translatePropMap data
 
-      @buildSObject data
-      if options.page && s.t?
+      @_buildSObject data
+      if @options.page && s.t?
         s.t()
       else if s.tl?
-        arg = if options.el?.attr('href')
-          options.el[0]
+        arg = if @options.el?.attr('href')
+          @options.el[0]
         else
           true
-        s.tl arg, options['trackingType'], @buildLinkName data
+        s.tl arg, @options['trackingType'], @_buildLinkName data
       data
 
     options:
@@ -48,7 +50,7 @@ https://github.com/brewster1134/atrackt
         _event       : 'prop4'
 
     # omniture specific
-    buildSObject: (obj) ->
+    _buildSObject: (obj) ->
       switch @options.version
         when 14
           linkTrackVars = @options.linkTrackVars
@@ -61,7 +63,7 @@ https://github.com/brewster1134/atrackt
           s.contextData = obj
       s
 
-    buildLinkName: (obj) ->
+    _buildLinkName: (obj) ->
       linkName = [
         obj[@options.propMap._location]
         obj[@options.propMap._categories]
@@ -70,15 +72,15 @@ https://github.com/brewster1134/atrackt
 
       linkName.join(@options.delimiters.linkName)
 
-    translatePropMap: (obj) ->
+    _translatePropMap: (obj) ->
       return obj if @options.version > 14
 
       _globalData = {}
       $.each obj, (k,v) =>
-        _globalData[@keyLookup k] = v?.toString().replace? @options.charReplaceRegex, ''
+        _globalData[@_keyLookup k] = v?.toString().replace? @options.charReplaceRegex, ''
       _globalData
 
-    keyLookup: (key) ->
+    _keyLookup: (key) ->
       _newKey = @options.propMap[key]
       console.error "ATRACKT ERROR: PLUGIN `omniture` - No mapping for `#{key}` in omniture config" unless _newKey
       _newKey || key