- some minor refactoring Utils

Author: Valodya

src/messaging/cancel.js

@@ -1,4 +1,3 @@
-import Utils from '../utils'
 import Urls from '../urls'
 import Request from '../request'
 import Async from '../request/async'
@@ -7,7 +6,7 @@ export function cancel(messageId, asyncHandler) {
   return Request.delete({
     url         : Urls.messagingMessage(messageId),
     isAsync     : !!asyncHandler,
-    asyncHandler: new Async(Utils.emptyFn)
+    asyncHandler: new Async()
   })
 }
 

src/messaging/subscription.js

@@ -12,7 +12,7 @@ export default class Subscription {
     this.channelProperties = config.channelProperties
     this.subscriptionId = null
     this.restUrl = config.restUrl + '/' + config.channelName
-    this.responder = config.responder || Utils.emptyFn
+    this.responder = config.responder
     this._subscribe(config.onSubscribe)
   }
 
@@ -51,18 +51,22 @@ export default class Subscription {
       })
 
       this.proxy.on('messageReceived', () => {
-        this.responder()
+        if (this.responder) {
+          this.responder()
+        }
       })
     } else {
       this._switchToPolling()
     }
 
-    this._startSubscription = Utils.emptyFn
+    this._startSubscription = function() {
+    }
   }
 
   cancelSubscription() {
     this.proxy && this.proxy.close()
-    this._startSubscription = function(){}
+    this._startSubscription = function() {
+    }
   }
 
   _switchToPolling() {

src/request/async.js

@@ -3,7 +3,7 @@ export default class Async {
   constructor(successCallback, faultCallback, context) {
     if (!(faultCallback instanceof Function)) {
       context = faultCallback
-      faultCallback = null
+      faultCallback = undefined
     }
 
     this.successCallback = successCallback

src/users/social/login.js

@@ -14,7 +14,7 @@ export function loginSocial(socialType, fieldsMapping, permissions, container, s
   asyncHandler = Utils.extractResponder(arguments)
   asyncHandler = wrapAsync(asyncHandler, stayLoggedIn)
 
-  Utils.addEvent('message', window, function(e) {
+  addWindowEventListener('message', window, function(e) {
     if (e.origin === LocalVars.serverURL) {
       const result = JSON.parse(e.data)
 
@@ -24,7 +24,7 @@ export function loginSocial(socialType, fieldsMapping, permissions, container, s
         asyncHandler.success(result)
       }
 
-      Utils.removeEvent('message', window)
+      removeWindowEventListener('message', window)
       socialContainer.closeContainer()
     }
   })
@@ -47,3 +47,26 @@ export function loginSocial(socialType, fieldsMapping, permissions, container, s
     data        : request
   })
 }
+
+
+function addWindowEventListener(event, elem, func) {
+  if (elem.addEventListener) {
+    elem.addEventListener(event, func, false)
+
+  } else if (elem.attachEvent) {
+    elem.attachEvent('on' + event, func)
+
+  } else {
+    elem[event] = func
+  }
+}
+
+function removeWindowEventListener(event, elem) {
+  if (elem.removeEventListener) {
+    elem.removeEventListener(event, null, false)
+  } else if (elem.detachEvent) {
+    elem.detachEvent('on' + event, null)
+  }
+
+  elem[event] = null
+}

src/utils.js

@@ -31,13 +31,6 @@ const Utils = {
 
   isBrowser: (new Function('try {return this===window;}catch(e){ return false;}'))(),
 
-  emptyFn: function() {
-  },
-
-  getNow() {
-    return new Date().getTime()
-  },
-
   castArray(value) {
     if (Utils.isArray(value)) {
       return value
@@ -46,18 +39,6 @@ const Utils = {
     return [value]
   },
 
-  addEvent(evnt, elem, func) {
-    if (elem.addEventListener) {
-      elem.addEventListener(evnt, func, false)
-    }
-    else if (elem.attachEvent) {
-      elem.attachEvent('on' + evnt, func)
-    }
-    else {
-      elem[evnt] = func
-    }
-  },
-
   isEmpty(obj) {
     if (obj === null || obj === undefined) {
       return true
@@ -76,16 +57,6 @@ const Utils = {
     return true
   },
 
-  removeEvent(event, elem) {
-    if (elem.removeEventListener) {
-      elem.removeEventListener(event, null, false)
-    } else if (elem.detachEvent) {
-      elem.detachEvent('on' + event, null)
-    }
-
-    elem[event] = null
-  },
-
   stringToBiteArray(str) {
     const data = new ArrayBuffer(str.length)
     const ui8a = new Uint8Array(data, 0)
@@ -97,20 +68,6 @@ const Utils = {
     return ui8a
   },
 
-  onHttpRequestErrorHandler(xhr, errorHandler, responseParser) {
-    return function() {
-      let errorMessage = 'Unable to connect to the network'
-
-      //this part is needed for those implementations of XMLHttpRequest
-      //which call the onerror handler on an any bad request
-      if (xhr.status >= 400) {
-        errorMessage = responseParser(xhr)
-      }
-
-      errorHandler(errorMessage)
-    }
-  },
-
   toQueryParams(params) {
     params = params || {}
     const result = []
@@ -125,6 +82,7 @@ const Utils = {
   },
 
   toUri() {
+    //TODO: refactor it
     let uri = ''
     let arg
 
@@ -173,49 +131,12 @@ const Utils = {
     return arr.map(item => encodeURIComponent(item)).join(',')
   },
 
-  classWrapper(obj) {
-    const wrapper = obj => {
-      let wrapperName = null
-      let Wrapper = null
-
-      for (const property in obj) {
-        if (obj.hasOwnProperty(property)) {
-          if (property === '___class') {
-            wrapperName = obj[property]
-            break
-          }
-        }
-      }
-
-      if (wrapperName) {
-        try {
-          Wrapper = eval(wrapperName)
-          obj = Utils.deepExtend(new Wrapper(), obj)
-        } catch (e) {
-        }
-      }
-
-      return obj
-    }
-
-    if (Utils.isObject(obj) && obj != null) {
-      if (Utils.isArray(obj)) {
-        for (let i = obj.length; i--;) {
-          obj[i] = wrapper(obj[i])
-        }
-      } else {
-        obj = wrapper(obj)
-      }
-    }
-
-    return obj
-  },
-
   deepExtend(destination, source) {
+    //TODO: refactor it
     for (const property in source) {
       if (source[property] !== undefined && source.hasOwnProperty(property)) {
         destination[property] = destination[property] || {}
-        destination[property] = Utils.classWrapper(source[property])
+        destination[property] = classWrapper(source[property])
 
         if (
           destination[property]
@@ -224,30 +145,28 @@ const Utils = {
           && destination[property][property].hasOwnProperty('__originSubID')
         ) {
 
-          destination[property][property] = Utils.classWrapper(destination[property])
+          destination[property][property] = classWrapper(destination[property])
         }
       }
     }
 
     return destination
   },
 
-  cloneObject(obj) {
-    return Utils.isArray(obj) ? obj.slice() : Utils.deepExtend({}, obj)
-  },
-
   extractResponder(args) {
-    let i, len
-    for (i = 0, len = args.length; i < len; ++i) {
+    for (let i = 0; i < args.length; i++) {
       if (args[i] instanceof Async) {
         return args[i]
       }
     }
-
-    return null
   },
 
   wrapAsync(asyncHandler, parser, context) {
+    //TODO: should we remove it?
+    if (asyncHandler instanceof Async && !parser) {
+      return asyncHandler
+    }
+
     const success = data => {
       if (parser) {
         data = parser.call(context, data)
@@ -285,20 +204,46 @@ const Utils = {
 
       return fn.apply(context, arguments)
     }
-  },
+  }
+}
 
-  mirrorKeys(obj) {
-    const mirroredObject = {}
+function classWrapper(obj) {
+  //TODO: refactor it
+  const wrapper = obj => {
+    let wrapperName = null
+    let Wrapper = null
+
+    for (const property in obj) {
+      if (obj.hasOwnProperty(property)) {
+        if (property === '___class') {
+          wrapperName = obj[property]
+          break
+        }
+      }
+    }
 
-    for (const key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        mirroredObject[key] = key
+    if (wrapperName) {
+      try {
+        Wrapper = eval(wrapperName)
+        obj = Utils.deepExtend(new Wrapper(), obj)
+      } catch (e) {
       }
     }
 
-    return mirroredObject
+    return obj
+  }
+
+  if (Utils.isObject(obj) && obj != null) {
+    if (Utils.isArray(obj)) {
+      for (let i = obj.length; i--;) {
+        obj[i] = wrapper(obj[i])
+      }
+    } else {
+      obj = wrapper(obj)
+    }
   }
 
+  return obj
 }
 
 export default Utils