es6

Author: Olaf Kwant

lib/client.js

@@ -1,6 +1,5 @@
-var Client = require('./client')
-var Utils = require('./utils')
-var ZAFClient = {}
+import Client from './client'
+import { queryParameters } from './utils'
 
 /**
  * ### ZAFClient API
@@ -20,29 +19,30 @@ var ZAFClient = {}
  * Example:
  *
  * ```javascript
- * var client = ZAFClient.init(function(context) {
- *   var currentUser = context.currentUser;
+ * const client = ZAFClient.init((context) => {
+ *   const currentUser = context.currentUser;
  *   console.log('Hi ' + currentUser.name);
  * });
  * ```
  */
-ZAFClient.init = function (callback, loc) {
-  loc = loc || window.location
-  var queryParams = Utils.queryParameters(loc.search)
-  var hashParams = Utils.queryParameters(loc.hash)
-  var origin = queryParams.origin || hashParams.origin
-  var appGuid = queryParams.app_guid || hashParams.app_guid
-  var client
 
-  if (!origin || !appGuid) { return false }
+const ZAFClient = {
+  init: function (callback, loc) {
+    loc = loc || window.location
+    const queryParams = queryParameters(loc.search)
+    const hashParams = queryParameters(loc.hash)
+    const origin = queryParams.origin || hashParams.origin
+    const appGuid = queryParams.app_guid || hashParams.app_guid
+    if (!origin || !appGuid) { return false }
 
-  client = new Client({ origin: origin, appGuid: appGuid })
+    const client = new Client({ origin, appGuid })
 
-  if (typeof callback === 'function') {
-    client.on('app.registered', callback.bind(client))
-  }
+    if (typeof callback === 'function') {
+      client.on('app.registered', callback.bind(client))
+    }
 
-  return client
+    return client
+  }
 }
 
-module.exports = ZAFClient
+export default ZAFClient

lib/index.js

@@ -1,33 +1,29 @@
-function Tracker (client) {
-  this.startTime = Date.now()
-  this.client = client
-  this.MIN_HOVER_TIME = 200 // milliseconds
-
-  return this
-}
+export default class Tracker {
+  constructor (client) {
+    this.startTime = Date.now()
+    this.client = client
+    this.MIN_HOVER_TIME = 200 // milliseconds
+  }
 
-Tracker.prototype = {
-  handleMouseEnter: function () {
+  handleMouseEnter () {
     this.startTime = Date.now()
-  },
+  }
 
-  handleMouseLeave: function () {
-    var overFor = Date.now() - this.startTime
+  handleMouseLeave () {
+    const overFor = Date.now() - this.startTime
     if (overFor >= this.MIN_HOVER_TIME) {
       this.client.invoke('track', { type: 'hover', value: overFor })
     }
-  },
+  }
 
-  handleClick: function () {
+  handleClick () {
     this.client.invoke('track', { type: 'click' })
-  },
+  }
 
-  setup: function () {
-    var $html = document.querySelector('html')
+  setup () {
+    const $html = document.querySelector('html')
     $html.addEventListener('click', this.handleClick.bind(this))
     $html.addEventListener('mouseleave', this.handleMouseLeave.bind(this))
     $html.addEventListener('mouseenter', this.handleMouseEnter.bind(this))
   }
 }
-
-module.exports = { Tracker: Tracker }

lib/tracker.js

@@ -1,21 +1,19 @@
-var Promise = window.Promise || require('native-promise-only')
+import NativePromise from 'native-promise-only'
+const Promise = window.Promise || NativePromise
 
-function isObject (obj) {
+export function isObject (obj) {
   return (obj !== null && typeof obj === 'object')
 }
 
 function decode (s) {
   return decodeURIComponent((s || '').replace(/\+/g, ' '))
 }
 
-function queryParameters (queryString) {
+export function queryParameters (queryString) {
   queryString = queryString || ''
 
-  var result = {}
-  var keyValuePairs
-  var keyAndValue
-  var key
-  var value
+  const result = {}
+  let keyValuePairs, keyAndValue, key, value
 
   if (queryString.search(/\?|#/) === 0) {
     queryString = queryString.slice(1)
@@ -25,7 +23,7 @@ function queryParameters (queryString) {
 
   keyValuePairs = queryString.split('&')
 
-  for (var i = 0; i < keyValuePairs.length; i++) {
+  for (let i = 0; i < keyValuePairs.length; i++) {
     keyAndValue = keyValuePairs[i].split('=')
     key = decode(keyAndValue[0])
     value = decode(keyAndValue[1]) || ''
@@ -36,8 +34,8 @@ function queryParameters (queryString) {
 }
 
 function isPromise (obj) {
-  return obj instanceof Promise ||
-    (!!obj && obj.then && typeof obj.then === 'function')
+  if (obj instanceof Promise) return true
+  return !!obj && obj.then && typeof obj.then === 'function'
 }
 
 function shouldReject (val) {
@@ -46,7 +44,7 @@ function shouldReject (val) {
     typeof val === 'string'
 }
 
-function isString (key) {
+export function isString (key) {
   return typeof key === 'string'
 }
 
@@ -57,20 +55,19 @@ function isString (key) {
 //  c) first to settle with a falsy value
 // c) is sub-optimal, since it has a specific narrow use-case
 // for save hooks
-function when (items) {
+export function when (items) {
   items = items || []
-  var resolveAll
-  var rejectAll
-  var allResolvedPromise = new Promise(function (resolve, reject) {
+  let resolveAll, rejectAll
+  const allResolvedPromise = new Promise((resolve, reject) => {
     resolveAll = resolve
     rejectAll = reject
   })
-  var remaining = 0
-  var settledWith = []
-  var itemsCopy = Array.isArray(items)
-    ? items.slice()
-    : [items]
-  var resolveWith = function (data, index) {
+
+  let remaining = 0
+  const settledWith = []
+  const itemsCopy = Array.isArray(items) ? items.slice() : [items]
+
+  function resolveWith (data, index) {
     settledWith[index] = data
 
     if (--remaining <= 0) {
@@ -85,13 +82,12 @@ function when (items) {
     return allResolvedPromise
   }
 
-  itemsCopy.forEach(function (item, index) {
-    var promise
-
+  itemsCopy.forEach((item, index) => {
+    let promise
     if (isPromise(item)) {
       promise = item
     } else if (typeof item === 'function') {
-      var res
+      let res
       try {
         res = item()
         if (isPromise(res)) {
@@ -105,25 +101,16 @@ function when (items) {
         promise = Promise.reject(err)
       }
     } else {
-      promise = new Promise(function (resolve, reject) {
+      promise = new Promise((resolve, reject) => {
         shouldReject(item)
           ? reject(item)
           : resolve(item)
       })
     }
-    promise.then(
-      function (data) {
-        resolveWith(data, index)
-      }
-    ).catch(rejectAll.bind(rejectAll))
+    promise.then((data) => {
+      resolveWith(data, index)
+    }).catch(rejectAll.bind(rejectAll))
   })
 
   return allResolvedPromise
 }
-
-module.exports = {
-  queryParameters: queryParameters,
-  when: when,
-  isString: isString,
-  isObject: isObject
-}