widget.coffee in joosy-1.2.0.beta.1

- old
+ new

@@ -128,12 +128,12 @@
   #     '.selector1': Widget1
   #     '.selector2': -> @widget = new Widget2
   #
   @mapWidgets: (map) ->
     unless @::hasOwnProperty "__widgets"
-      @::__widgets = Object.clone(@.__super__.__widgets) || {}
-    Object.merge @::__widgets, map
+      @::__widgets = Joosy.Module.merge {}, @.__super__.__widgets
+    Joosy.Module.merge @::__widgets, map
 
   #
   # Declares widget as indepent changing the way it behaves during the bootstrap
   #
   @independent: ->
@@ -154,11 +154,11 @@
   #
   # @param [DOM] container              jQuery or direct dom node object
   # @param [Joosy.Widget] widget        Class or object of Joosy.Widget to register
   #
   registerWidget: ($container, widget) ->
-    if Object.isString $container
+    if typeof($container) == 'string'
       $container = @__normalizeSelector($container)
 
     widget = @__normalizeWidget(widget)
     widget.__bootstrapDefault @, $container
 
@@ -249,16 +249,17 @@
   #
   __fetch: (nestingMap) ->
     @data = {}
 
     @synchronize (context) =>
-      Object.each nestingMap, (selector, section) ->
-        section.instance.__fetch(section.nested)
+      for selector, section of nestingMap
+        do (selector, section) ->
+          section.instance.__fetch(section.nested)
 
-        if !section.instance.__independent
-          context.do (done) ->
-            section.instance.wait 'section:fetched', done
+          if !section.instance.__independent
+            context.do (done) ->
+              section.instance.wait 'section:fetched', done
 
       context.do (done) =>
         @__runFetchs [], done
 
       context.after =>
@@ -285,17 +286,18 @@
     @__nestedSections = []
     @$container.html @__renderDefault?(@data || {})
 
     @__load()
 
-    Object.each nestingMap, (selector, section) =>
-      $container = @__normalizeSelector(selector)
+    for selector, section of nestingMap
+      do (selector, section) =>
+        $container = @__normalizeSelector(selector)
 
-      if !section.instance.__independent || section.instance.__triggeredEvents?['section:fetched']
-        section.instance.__paint @, section.nested, $container
-      else
-        section.instance.__bootstrap @, section.nested, $container, false
+        if !section.instance.__independent || section.instance.__triggeredEvents?['section:fetched']
+          section.instance.__paint @, section.nested, $container
+        else
+          section.instance.__bootstrap @, section.nested, $container, false
 
   #
   # Initializes section that was injected into DOM
   #
   __load: ->
@@ -345,10 +347,10 @@
   # Normalizes widget descrpition to its instance
   #
   # Besides already being instance it cann be either class or lambda
   #
   __normalizeWidget: (widget) ->
-    if Object.isFunction(widget) && !Joosy.Module.hasAncestor(widget, Joosy.Widget)
+    if typeof(widget) == 'function' && !Joosy.Module.hasAncestor(widget, Joosy.Widget)
       widget = widget.call(@)
 
     if Joosy.Module.hasAncestor widget, Joosy.Widget
       widget = new widget
 