joosy.js.coffee in joosy-0.1.0.RC2

- old
+ new

@@ -1,26 +1,26 @@
-@Joosy = Object.extended(if @Joosy? then @Joosy else {})
-
-@Joosy.merge
+@Joosy = Object.extended
   debug: false
   Modules: {}
   Resource: {}
   Templaters: {}
 
 Joosy.namespace = (name, generator=false) ->
-  name  = name.split('.')
+  name  = name.split '.'
   space = window
-  space = space[part] ?= {} for part in name
+  for part in name
+    space = space[part] ?= {}
 
-  generator = generator.apply(space) if generator
+  if generator
+    generator = generator.apply space
   for key, klass of space
     if space.hasOwnProperty(key) &&
-          Joosy.Module.hasAncestor(klass, Joosy.Module)
+       Joosy.Module.hasAncestor klass, Joosy.Module
       klass.__namespace__ = name
 
 Joosy.helpers = (name, generator) ->
-  Joosy.namespace("Joosy.Helpers.#{name}", generator)
+  Joosy.namespace "Joosy.Helpers.#{name}", generator
 
 Joosy.test = ->
   text = "Hi :). I'm Joosy. And everything is just fine!"
 
   if console
@@ -34,32 +34,37 @@
     v = if c is 'x' then r else r & 3 | 8
     v.toString 16
   .toUpperCase()
 
 Joosy.preloadImages = (images, callback) ->
-  images = [images] if !Object.isArray(images)
-  callback() if images.length == 0
+  unless Object.isArray(images)
+    images = [images]
+  if images.length == 0
+    callback()
 
   ticks   = images.length
   result  = []
   checker = ->
-    callback?() if (ticks -= 1) == 0
+    if (ticks -= 1) == 0
+      callback?()
 
   for p in images
     result.push $('<img/>').load(checker).attr('src', p)
 
   result
 
 Joosy.buildUrl = (url, params) ->
   paramsString = []
 
   Object.each params, (key, value) ->
-    paramsString.push("#{key}=#{value}")
+    paramsString.push "#{key}=#{value}"
 
   hash = url.match(/(\#.*)?$/)[0]
-  url  = url.replace(/\#.*$/, '')
-  url  = url + "?" if !paramsString.isEmpty() && !url.has(/\?/)
+  url  = url.replace /\#.*$/, ''
+  if !paramsString.isEmpty() && !url.has(/\?/)
+    url  = url + "?"
 
-  paramsString = paramsString.join('&')
-  paramsString = '&' + paramsString if paramsString != '' && url.last() != '?'
+  paramsString = paramsString.join '&'
+  if !paramsString.isBlank() && url.last() != '?'
+    paramsString = '&' + paramsString
 
-  url + paramsString + hash
\ No newline at end of file
+  url + paramsString + hash