Changeset 226

Timestamp:

04/10/08 08:48:54 (2 years ago)

Author:

akaihola

Message:

[yui] Fixed onDOMReady handling.

Files:

• trunk/yui/templatetags/yui.py (modified) (3 diffs)

trunk/yui/templatetags/yui.py

@@ -84 +84 @@
     return ''.join((
         script_src(url),
-        script('_DOMReady_funcs=[];'
-               'function _onDOMReady(f){_DOMReady_funcs.push(f);}')))
+        script('if (typeof(_DOMReady_funcs) == "undefined") {'
+               '  _DOMReady_funcs=[];'
+               '  function _onDOMReady(f){_DOMReady_funcs.push(f);} }')))
 
-ONDOMREADY = ('for(var i=0;i<_DOMReady_funcs.length;++i)'
-              '_DOMReady_funcs[i]();'
-              '_onDOMReady=function(f){f()};')
+ONDOMREADY = ('YAHOO.util.Event.onDOMReady(function() {'
+              '  for(var i=0;i<_DOMReady_funcs.length;++i)'
+              '  _DOMReady_funcs[i]();'
+              '  _onDOMReady=function(f){f()}; });')
 
 
@@ -172 +174 @@
                       ''.join('%s=%s;' % (varname, module)
                               for varname, module in assignments))
+        #return script('YAHOO.util.Event.onDOMReady(function(){%s});' %
+        #              ''.join('%s=%s;' % (varname, module)
+        #                      for varname, module in assignments))
 
 
@@ -178 +183 @@
         self.nodelist = nodelist
     def render(self, context):
+        #return script('YAHOO.util.Event.onDOMReady(%s);') % \
+        #       self.nodelist.render(context)
         return script('_onDOMReady(%s);') % self.nodelist.render(context)