Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:sstephenson/prototype
Browse files Browse the repository at this point in the history
  • Loading branch information
savetheclocktower committed May 18, 2010
2 parents 7a4a5c7 + 6a584d2 commit b8081bd
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
17 changes: 12 additions & 5 deletions Rakefile
Expand Up @@ -67,24 +67,31 @@ module PrototypeHelper
def self.build_doc_for(file)
rm_rf(DOC_DIR)
mkdir_p(DOC_DIR)

index_header = <<EOF
<h1 style="margin-top: 31px; height: 75px; padding: 1px 0; background: url(images/header-stripe-small.png) repeat-x;">
<a href="http://prototypejs.org" style="padding-left: 120px;">
<img src="images/header-logo-small.png" alt="Prototype JavaScript Framework API" />
</a>
</h1>
EOF
PDoc.run({
:source_files => Dir[File.join('src', '**', '*.js')],
:destination => DOC_DIR,
:index_page => 'README.markdown',
:syntax_highlighter => syntax_highlighter,
:markdown_parser => :bluecloth,
:src_code_href => proc { |file, line|
"http://github.com/sstephenson/prototype/blob/#{current_head}/#{file}#LID#{line}"
:src_code_href => proc { |obj|
"http://github.com/sstephenson/prototype/blob/#{hash}/#{obj.file}#LID#{obj.line_number}"
},
:pretty_urls => false,
:bust_cache => false,
:name => 'Prototype JavaScript Framework',
:short_name => 'Prototype',
:home_url => 'http://prototypejs.org',
:doc_url => 'http://prototypejs.org/doc',
:version => PrototypeHelper::VERSION,
:copyright_notice => 'This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</a>.'
:index_header => index_header,
:footer => 'This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</a>.',
:assets => 'doc_assets'
})
end

Expand Down
Binary file added doc_assets/images/header-logo-small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc_assets/images/header-stripe-small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion vendor/pdoc
Submodule pdoc updated 67 files
+2 −0 lib/pdoc/generators.rb
+10 −36 lib/pdoc/generators/html/helpers.rb
+1 −1 lib/pdoc/generators/html/page.rb
+38 −8 lib/pdoc/generators/html/website.rb
+15 −0 lib/pdoc/generators/json.rb
+105 −0 lib/pdoc/generators/pythonesque.rb
+5 −0 lib/pdoc/models.rb
+15 −3 lib/pdoc/models/argument.rb
+54 −0 lib/pdoc/models/base.rb
+6 −0 lib/pdoc/models/callable.rb
+8 −0 lib/pdoc/models/class.rb
+7 −0 lib/pdoc/models/class_method.rb
+24 −0 lib/pdoc/models/container.rb
+14 −11 lib/pdoc/models/entity.rb
+7 −0 lib/pdoc/models/instance_method.rb
+4 −0 lib/pdoc/models/section.rb
+8 −1 lib/pdoc/models/signature.rb
+13 −3 lib/pdoc/parser/documentation_nodes.rb
+4 −0 lib/pdoc/parser/ebnf_expression_nodes.rb
+9 −7 lib/pdoc/runner.rb
+23 −1 lib/pdoc/treemaker.rb
+ templates/html/assets/images/grid.png
+ templates/html/assets/images/header-logo-small.png
+ templates/html/assets/images/header-logo.png
+ templates/html/assets/images/header-stripe-small.png
+ templates/html/assets/images/header-stripe.png
+ templates/html/assets/images/logo.png
+ templates/html/assets/images/menu-flap.png
+ templates/html/assets/images/pdoc/alias.png
+ templates/html/assets/images/pdoc/class.png
+ templates/html/assets/images/pdoc/class_deprecated.png
+ templates/html/assets/images/pdoc/class_method.png
+ templates/html/assets/images/pdoc/class_property.png
+ templates/html/assets/images/pdoc/constant.png
+ templates/html/assets/images/pdoc/constructor.png
+ templates/html/assets/images/pdoc/deprecated.png
+ templates/html/assets/images/pdoc/description.png
+ templates/html/assets/images/pdoc/information.png
+ templates/html/assets/images/pdoc/instance_method.png
+ templates/html/assets/images/pdoc/instance_property.png
+ templates/html/assets/images/pdoc/method.png
+ templates/html/assets/images/pdoc/method_deprecated.png
+ templates/html/assets/images/pdoc/mixin.png
+ templates/html/assets/images/pdoc/namespace.png
+ templates/html/assets/images/pdoc/property.png
+ templates/html/assets/images/pdoc/related_to.png
+ templates/html/assets/images/pdoc/search-background.png
+ templates/html/assets/images/pdoc/section-background.png
+ templates/html/assets/images/pdoc/section.png
+ templates/html/assets/images/pdoc/selected-section-background.png
+ templates/html/assets/images/pdoc/subclass.png
+ templates/html/assets/images/pdoc/superclass.png
+ templates/html/assets/images/pdoc/utility.png
+ templates/html/assets/images/tagline.png
+0 −963 templates/html/assets/javascripts/controls.js
+0 −1,120 templates/html/assets/javascripts/effects.js
+0 −0 templates/html/assets/javascripts/pdoc/application.js
+0 −0 templates/html/assets/javascripts/pdoc/prototype.js
+0 −0 templates/html/assets/javascripts/pdoc/tabs.js
+37 −53 templates/html/assets/stylesheets/pdoc/api.css
+0 −0 templates/html/assets/stylesheets/pdoc/pygments.css
+1 −1 templates/html/item_index.js.erb
+6 −14 templates/html/layout.erb
+8 −7 templates/html/node.erb
+2 −2 templates/html/partials/class_relationships.erb
+1 −1 templates/html/partials/relationships.erb
+2 −2 templates/html/partials/title.erb

0 comments on commit b8081bd

Please sign in to comment.