diff --git a/build/jsdoc-toolkit/app/frame/Link.js b/build/jsdoc-toolkit/app/frame/Link.js index 0e8aadf3..be316eb0 100644 --- a/build/jsdoc-toolkit/app/frame/Link.js +++ b/build/jsdoc-toolkit/app/frame/Link.js @@ -82,7 +82,7 @@ Link.symbolNameToLinkName = function(symbol) { var linker = "", ns = ""; - if (symbol.isStatic) linker = "."; + if (symbol.isStatic) linker = "-"; else if (symbol.isInner) linker = "-"; if (symbol.isEvent && !/^event:/.test(symbol.name)) { @@ -137,7 +137,7 @@ Link.prototype._makeSymbolLink = function(alias, parameters) { // it's a symbol in another file if (!linkTo.is("CONSTRUCTOR") && !linkTo.isNamespace) { // it's a method or property linkPath= (Link.filemap) ? Link.filemap[linkTo.memberOf] : - escape(linkTo.memberOf) || "_global_"; + escape(linkTo.memberOf) || "global"; linkPath += publish.conf.ext + "#" + Link.symbolNameToLinkName(linkTo).toLowerCase(); if (parameters) { linkPath += '-' + parameters.replace(/[()]+/g, '').split(', ').join('-').toLowerCase(); diff --git a/build/jsdoc-toolkit/app/plugins/ignore.js b/build/jsdoc-toolkit/app/plugins/ignore.js new file mode 100644 index 00000000..de8eae61 --- /dev/null +++ b/build/jsdoc-toolkit/app/plugins/ignore.js @@ -0,0 +1,10 @@ +JSDOC.PluginManager.registerPlugin( + "JSDOC.ignore", + { + onSymbol: function(symbol) { + if (symbol.comment.getTag('ignore').length) { + symbol.ignore = true; + } + } + } +); \ No newline at end of file diff --git a/build/jsdoc-toolkit/templates/jsdoc/classLayout.js b/build/jsdoc-toolkit/templates/jsdoc/classLayout.js new file mode 100644 index 00000000..d7f95f97 --- /dev/null +++ b/build/jsdoc-toolkit/templates/jsdoc/classLayout.js @@ -0,0 +1,14 @@ +var classLayout = { + 'Paper.js': ['global'], + 'Basic Types': ['Point', 'Size', 'Rectangle', 'Matrix'], + 'Items': ['Item', 'Layer', 'Group', 'Raster', 'PlacedSymbol'], + 'Paths': ['Path', 'CompoundPath', 'Segment', 'Curve', 'PathStyle', 'ruler', + 'CurveLocation'], + 'Tools': ['Tool', 'ToolEvent', 'Key', 'KeyEvent'], + 'Projects': ['Project', 'View', 'Symbol'], + 'Colors': ['Color', 'RGBColor', 'GrayColor', 'HSBColor'], + 'Gradients': ['GradientColor', 'Gradient', 'GradientStop'], + 'Typography': ['TextItem', 'PointText', { + 'Style': ['CharacterStyle', 'ParagraphStyle'] + }] +}; \ No newline at end of file diff --git a/build/jsdoc-toolkit/templates/jsdoc/publish.js b/build/jsdoc-toolkit/templates/jsdoc/publish.js index c024dcbe..01164c53 100644 --- a/build/jsdoc-toolkit/templates/jsdoc/publish.js +++ b/build/jsdoc-toolkit/templates/jsdoc/publish.js @@ -63,13 +63,13 @@ var Helpers = { function publish(symbolSet) { publish.conf = { // trailing slash expected for dirs ext: '.html', - outDir: JSDOC.opt.d || SYS.pwd + '../out/jsdoc/', + outDir: JSDOC.opt.d || SYS.pwd + '../out/jsdoc/', templateDir: JSDOC.opt.t || SYS.pwd + '../templates/jsdoc/', - resourcesDir: (JSDOC.opt.t || SYS.pwd + '../templates/jsdoc/') + 'resources/', - symbolsDir: 'symbols/', - srcDir: 'symbols/src/' + staticDir: (JSDOC.opt.t || SYS.pwd + '../templates/jsdoc/') + 'static/', + symbolsDir: 'symbols/', + srcDir: 'symbols/src/' }; - + publish.conf.packagesDir = publish.conf.outDir + 'packages/'; var templatesDir = publish.conf.templateDir + 'templates/'; publish.templates = { _class: 'class.tmpl', @@ -81,7 +81,7 @@ function publish(symbolSet) { constructor: 'constructor.tmpl', html: 'html.tmpl', allClasses: 'allClasses.tmpl', - classesIndex: 'index.tmpl' + menu: 'packages.tmpl' }; for (var i in publish.templates) { @@ -91,8 +91,8 @@ function publish(symbolSet) { // Copy over the static files copyDirectory( - new java.io.File(publish.conf.resourcesDir), - new java.io.File(publish.conf.outDir + 'resources/') + new java.io.File(publish.conf.staticDir), + new java.io.File(publish.conf.outDir) ); // used to allow Link to check the details of things being linked to @@ -143,15 +143,53 @@ function publish(symbolSet) { }) var name = ((JSDOC.opt.u)? Link.filemap[symbol.alias] : symbol.alias) + publish.conf.ext; - IO.saveFile(publish.conf.outDir + 'symbols/', name, html); + IO.saveFile(publish.conf.packagesDir, name, html); } - // regenerate the index with different relative links, used in the index pages - Link.base = ''; - publish.conf.classesIndex = publish.templates.allClasses.process(classes); + publishMenu(); +} + +function publishMenu() { + load(JSDOC.opt.t + 'classLayout.js'); + function parseClassNames(classNames) { + var out = ''; + for (var i = 0, l = classNames.length; i < l; i++) { + if (typeof classNames[i] == 'string') { + var name = classNames[i]; + out += (name == 'ruler') ? getRuler() : getLink(name); + } else { + for (var j in classNames[i]) { + out += getHeading(j); + out += parseClassNames(classNames[i][j]); + } + } + } + return out; + } + function getLink(name) { + return '
  • ' + name + '
    • '; + } - var classesIndex = publish.templates.classesIndex.process(classes); - IO.saveFile(publish.conf.outDir, 'index' + publish.conf.ext, classesIndex); + function getRuler() { + return '
    • '; + } + + function getHeading(title) { + return '

  • ' + title + '

    • '; + } + var first = true, + out = '