From cf62eebf2d16d2584d7ebd087df9b39e4780cdb2 Mon Sep 17 00:00:00 2001 From: Adam Moore Date: Wed, 6 Jan 2010 13:10:26 -0800 Subject: [PATCH] 2009 -> 2010 --- bin/const.py | 2 +- bin/yuidoc.py | 2 +- bin/yuidoc_generate.py | 63 ++++++++++++++++++++++++++++++++++++----- bin/yuidoc_highlight.py | 2 +- bin/yuidoc_parse.py | 2 +- license.txt | 2 +- template/assets/ac-js | 34 +++++++++++++--------- template/main.tmpl | 5 +++- 8 files changed, 86 insertions(+), 26 deletions(-) diff --git a/bin/const.py b/bin/const.py index 6017d8b4..f6018404 100644 --- a/bin/const.py +++ b/bin/const.py @@ -1,5 +1,5 @@ ''' -Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.html version: 1.0.0b1 diff --git a/bin/yuidoc.py b/bin/yuidoc.py index f9b38b96..911a1a92 100755 --- a/bin/yuidoc.py +++ b/bin/yuidoc.py @@ -3,7 +3,7 @@ # vim: et sw=4 ts=4 ''' -Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.html version: 1.0.0b1 diff --git a/bin/yuidoc_generate.py b/bin/yuidoc_generate.py index 8b9ca302..c7ae4313 100755 --- a/bin/yuidoc_generate.py +++ b/bin/yuidoc_generate.py @@ -3,7 +3,7 @@ # vim: et sw=4 ts=4 ''' -Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.html version: 1.0.0b1 @@ -103,6 +103,8 @@ def _mkdir(newdir): self.classnames = "" self.filenames = "" self.allprops = [] + self.allprops_ext = [] + def cleanseStr(self, strg): cleanregex= re.compile(r"[^\w\-]") @@ -274,6 +276,31 @@ def allprop_sort(x, y): cy = pat.sub('', cy) return cmp(cx, cy) + def completeProp(main, ext): + data = main.copy() + if DESCRIPTION in ext: + data[DESCRIPTION] = ext[DESCRIPTION] + else: + data[DESCRIPTION] = '' + + if PARAMS in ext: + params = ext[PARAMS] + count = 0 + result = [] + itemtemplate = '%s <%s> %s' + for p in params: + if count > 0: + result.append(', ') + result.append(itemtemplate % (p[NAME] or 'unknown', p[TYPE] or 'Object', p[DESCRIPTION] or '')) + count+=1 + + data[PARAMS] = ''.join(result) + else: + data[PARAMS] = '' + + return data + + log.info("-------------------------------------------------------") # copy the json file @@ -391,14 +418,21 @@ def allprop_sort(x, y): for propertykey in keys: prop = c[PROPERTIES][propertykey] if self.showprivate or PRIVATE not in prop: - propdata = {NAME: propertykey, HOST: i, TYPE: 'property', URL:getUrl(i, propertykey, PROPERTY)} - + propdata = { + NAME: propertykey, + HOST: i, + TYPE: 'property', + URL: getUrl(i, propertykey, PROPERTY) + } transferToDict( ACCESS, prop, propdata ) if PRIVATE in prop: propdata[ACCESS] = PRIVATE elif PROTECTED in prop: propdata[ACCESS] = PROTECTED self.allprops.append(propdata.copy()) + # completeProp(propdata, prop) + self.allprops_ext.append(completeProp(propdata, prop)) + moduleprops.append(propdata.copy()) transferToDict( TYPE, prop, propdata, OBJECT ) @@ -428,6 +462,8 @@ def allprop_sort(x, y): elif PROTECTED in method: methoddata[ACCESS] = PROTECTED self.allprops.append(methoddata.copy()) + # completeProp(methodData, method) + self.allprops_ext.append(completeProp(methoddata, method)) moduleprops.append(methoddata.copy()) transferToDict( DESCRIPTION, method, methoddata ) @@ -466,13 +502,21 @@ def allprop_sort(x, y): for eventkey in keys: event = c[EVENTS][eventkey] if self.showprivate or PRIVATE not in event: - eventdata = {NAME: eventkey, HOST: i, TYPE: 'event', URL:getUrl(i, eventkey, EVENT)} + eventdata = { + NAME: eventkey, + HOST: i, + TYPE: 'event', + URL: getUrl(i, eventkey, EVENT) + } transferToDict( ACCESS, event, eventdata ) if PRIVATE in event: eventdata[ACCESS] = PRIVATE elif PROTECTED in event: eventdata[ACCESS] = PROTECTED self.allprops.append(eventdata.copy()) + # completeProp(eventdata, event) + self.allprops_ext.append(completeProp(eventdata, event)) + moduleprops.append(eventdata.copy()) transferToDict( DESCRIPTION, event, eventdata ) @@ -495,8 +539,6 @@ def allprop_sort(x, y): transferToDict( CANCELABLE, event, eventdata ) if CANCELABLE in event: eventdata[CANCELABLE] = CANCELABLE - - params = eventdata[PARAMS] = [] if PARAMS in event: mp = event[PARAMS] @@ -524,6 +566,10 @@ def allprop_sort(x, y): elif PROTECTED in config: configdata[ACCESS] = PROTECTED self.allprops.append(configdata.copy()) + + # completeProp(configdata, config) + self.allprops_ext.append(completeProp(configdata, config)) + moduleprops.append(configdata.copy()) transferToDict( TYPE, config, configdata, OBJECT ) @@ -626,13 +672,16 @@ def allprop_sort(x, y): #remove dups allprops = [] propmap = {} - for i in self.allprops: + # for i in self.allprops: + for i in self.allprops_ext: url = i[URL] if url not in propmap: allprops.append(i) propmap[url] = True allprops.sort(allprop_sort) + + # self.allprops_ext.sort(allprop_sort) allprops_json = simplejson.dumps(allprops, ensure_ascii=False) self.write("index.json", allprops_json, False) diff --git a/bin/yuidoc_highlight.py b/bin/yuidoc_highlight.py index b4daea7e..d766883d 100755 --- a/bin/yuidoc_highlight.py +++ b/bin/yuidoc_highlight.py @@ -3,7 +3,7 @@ # vim: et sw=4 ts=4 ''' -Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.html version: 1.0.0b1 diff --git a/bin/yuidoc_parse.py b/bin/yuidoc_parse.py index 0335f7e9..e1420cc6 100755 --- a/bin/yuidoc_parse.py +++ b/bin/yuidoc_parse.py @@ -3,7 +3,7 @@ # vim: et sw=4 ts=4 ''' -Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.html version: 1.0.0b1 diff --git a/license.txt b/license.txt index 32012336..6e8889e2 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: Redistribution and use of this software in source and binary forms, with or diff --git a/template/assets/ac-js b/template/assets/ac-js index c739d610..8bc3d0b4 100644 --- a/template/assets/ac-js +++ b/template/assets/ac-js @@ -12,13 +12,22 @@ ITEM_TEMPLATE = '{host} {name}', // ITEM_TEMPLATE = '{host} {params} {name}', // ITEM_TEMPLATE = '{host} {params} {name}
{description}
', - yuidoc = YAHOO.namespace('yuidoc'); - -yuidoc.init = function() { + yuidoc = YAHOO.namespace('yuidoc'), + propdata, + initialized = false; +yuidoc.init = function(altdata) { + yuidoc.initUI(altdata); }; -yuidoc.initUI = function() { +yuidoc.initUI = function(altdata) { + + if (initialized) { + return; + } + + propdata = ALL_YUI_PROPS || altdata; + //Checkboxes are available.. var handleClick = function(e) { var id, checked = false; @@ -75,14 +84,10 @@ yuidoc.initUI = function() { //Starting the AutoComplete code var getResults = function(query) { var results = []; - if(query && query.length > 0) { - + if (query && query.length > 0) { var q = query.toLowerCase(); - - for (var i=0, len=ALL_YUI_PROPS.length; i #if $ydn