0
-Copyright (c) 20
09, Yahoo! Inc. All rights reserved.
0
+Copyright (c) 20
10, Yahoo! Inc. All rights reserved.
0
Code licensed under the BSD License:
0
http://developer.yahoo.net/yui/license.html
0
@@ -103,6 +103,8 @@ class DocGenerator(object):
0
+ self.allprops_ext = []
0
def cleanseStr(self, strg):
0
cleanregex= re.compile(r"[^\w\-]")
0
@@ -274,6 +276,31 @@ class DocGenerator(object):
0
+ def completeProp(main, ext):
0
+ if DESCRIPTION in ext:
0
+ data[DESCRIPTION] = ext[DESCRIPTION]
0
+ data[DESCRIPTION] = ''
0
+ itemtemplate = '%s <%s> %s'
0
+ result.append(itemtemplate % (p[NAME] or 'unknown', p[TYPE] or 'Object', p[DESCRIPTION] or ''))
0
+ data[PARAMS] = ''.join(result)
0
log.info("-------------------------------------------------------")
0
@@ -391,14 +418,21 @@ class DocGenerator(object):
0
for propertykey in keys:
0
prop = c[PROPERTIES][propertykey]
0
if self.showprivate or PRIVATE not in prop:
0
- propdata = {NAME: propertykey, HOST: i, TYPE: 'property', URL:getUrl(i, propertykey, PROPERTY)}
0
+ URL: getUrl(i, propertykey, PROPERTY)
0
transferToDict( ACCESS, prop, propdata )
0
if PRIVATE in prop: propdata[ACCESS] = PRIVATE
0
elif PROTECTED in prop: propdata[ACCESS] = PROTECTED
0
self.allprops.append(propdata.copy())
0
+ # completeProp(propdata, prop)
0
+ self.allprops_ext.append(completeProp(propdata, prop))
0
moduleprops.append(propdata.copy())
0
transferToDict( TYPE, prop, propdata, OBJECT )
0
@@ -428,6 +462,8 @@ class DocGenerator(object):
0
elif PROTECTED in method: methoddata[ACCESS] = PROTECTED
0
self.allprops.append(methoddata.copy())
0
+ # completeProp(methodData, method)
0
+ self.allprops_ext.append(completeProp(methoddata, method))
0
moduleprops.append(methoddata.copy())
0
transferToDict( DESCRIPTION, method, methoddata )
0
@@ -466,13 +502,21 @@ class DocGenerator(object):
0
event = c[EVENTS][eventkey]
0
if self.showprivate or PRIVATE not in event:
0
- eventdata = {NAME: eventkey, HOST: i, TYPE: 'event', URL:getUrl(i, eventkey, EVENT)}
0
+ URL: getUrl(i, eventkey, EVENT)
0
transferToDict( ACCESS, event, eventdata )
0
if PRIVATE in event: eventdata[ACCESS] = PRIVATE
0
elif PROTECTED in event: eventdata[ACCESS] = PROTECTED
0
self.allprops.append(eventdata.copy())
0
+ # completeProp(eventdata, event)
0
+ self.allprops_ext.append(completeProp(eventdata, event))
0
moduleprops.append(eventdata.copy())
0
transferToDict( DESCRIPTION, event, eventdata )
0
@@ -495,8 +539,6 @@ class DocGenerator(object):
0
transferToDict( CANCELABLE, event, eventdata )
0
if CANCELABLE in event: eventdata[CANCELABLE] = CANCELABLE
0
params = eventdata[PARAMS] = []
0
@@ -524,6 +566,10 @@ class DocGenerator(object):
0
elif PROTECTED in config: configdata[ACCESS] = PROTECTED
0
self.allprops.append(configdata.copy())
0
+ # completeProp(configdata, config)
0
+ self.allprops_ext.append(completeProp(configdata, config))
0
moduleprops.append(configdata.copy())
0
transferToDict( TYPE, config, configdata, OBJECT )
0
@@ -626,13 +672,16 @@ class DocGenerator(object):
0
- for i in self.allprops:
0
+ # for i in self.allprops:
0
+ for i in self.allprops_ext:
0
allprops.sort(allprop_sort)
0
+ # self.allprops_ext.sort(allprop_sort)
0
allprops_json = simplejson.dumps(allprops, ensure_ascii=False)
0
self.write("index.json", allprops_json, False)
The
$indexasdfsdfavariable should be$indexhere, as the former does not exist inbin/yuidoc_generate.pyThe trailing
);on this line causes a syntax error