Commit b6f9bd71 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge branch 'master' into esprima-parser

parents 4796daa7 9f064c0c

Gemfile.lock

+1 −1
Original line number Diff line number Diff line 
PATH

  remote: .

  specs:

    jsduck (3.10.3)

    jsduck (3.10.5)

      json

      parallel

      rdiscount

README.md

+17 −4
Original line number Diff line number Diff line 
JsDuck

JSDuck

======



API documentation generator for Sencha JavaScript frameworks.



JsDuck aims to be a better documentation generator for [Ext JS][] than

JSDuck aims to be a better documentation generator for [Ext JS][] than

the old [ext-doc][] was. It is used by Sencha to document [Ext JS

4][ext4-docs], [Sencha Touch][touch2-docs] and [several other][other-docs]

products.
@@ -108,13 +108,26 @@ Hacking it 
See [Hacking guide](https://github.com/senchalabs/jsduck/wiki/Hacking) in wiki.





Who's using JSDuck?

-------------------



- Appcelerator [Titanium SDK](http://docs.appcelerator.com/titanium/2.0/index.html)

- AT&T [API Platform SDK for HTML5](https://code-api-att.com/SenchaSdk20Drop23Docs/)

- Bryntum [Siesta unit testing framework](http://www.bryntum.com/products/siesta/docs/)

- [GeoExt 2](https://github.com/geoext/geoext2)

- Rally Software [Rally App SDK](https://rally1.rallydev.com/apps/2.0p/doc/)

- [Sencha](http://docs.sencha.com) - obviously :)



These are some that we know of. Want your project listed here? Drop us a line.





Copying

-------



JsDuck is distributed under the terms of the GNU General Public

JSDuck is distributed under the terms of the GNU General Public

License version 3.



JsDuck was developed by [Rene Saarsoo](http://triin.net),

JSDuck was developed by [Rene Saarsoo](http://triin.net),

with many contributions from [Nick Poulden](https://github.com/nick).



Thanks to [Ondřej Jirman](https://github.com/megous),

jsduck.gemspec

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ Gem::Specification.new do |s| 
  s.required_rubygems_version = ">= 1.3.5"



  s.name = 'jsduck'

  s.version = '3.10.4'

  s.date = '2012-05-16'

  s.version = '3.10.5'

  s.date = '2012-05-23'

  s.summary = "Simple JavaScript Duckumentation generator"

  s.description = "Documentation generator for Sencha JS frameworks"

  s.homepage = "https://github.com/senchalabs/jsduck"

lib/jsduck/options.rb

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ module JsDuck 
      ]

      @meta_tag_paths = []



      @version = "3.10.4"

      @version = "3.10.5"



      # Customizing output

      @title = "Sencha Docs - Ext JS"

opt/comments-server-side/app.js

+3 −5
Original line number Diff line number Diff line
@@ -293,11 +293,7 @@ app.post('/auth/:sdk/:version/comments/:commentId', util.requireLoggedInUser, ut 
            comment.content = req.body.content;

            comment.contentHtml = util.markdown(req.body.content);



            comment.updates = comment.updates || [];

            comment.updates.push({

                updatedAt: String(new Date()),

                author: req.session.user.username

            });

            util.logUpdate(comment, req.session.user.username);



            comment.save(function(err) {

                res.json({ success: true, content: comment.contentHtml });
@@ -311,6 +307,7 @@ app.post('/auth/:sdk/:version/comments/:commentId', util.requireLoggedInUser, ut 
 */

app.post('/auth/:sdk/:version/comments/:commentId/delete', util.requireLoggedInUser, util.findComment, util.requireOwner, function(req, res) {

    req.comment.deleted = true;

    util.logUpdate(req.comment, req.session.user.username, "delete");

    req.comment.save(function(err) {

        res.send({ success: true });

    });
@@ -321,6 +318,7 @@ app.post('/auth/:sdk/:version/comments/:commentId/delete', util.requireLoggedInU 
 */

app.post('/auth/:sdk/:version/comments/:commentId/undo_delete', util.requireLoggedInUser, util.findComment, util.requireOwner, util.getCommentReads, function(req, res) {

    req.comment.deleted = false;

    util.logUpdate(req.comment, req.session.user.username, "undo_delete");

    req.comment.save(function(err) {

        res.send({ success: true, comment: util.scoreComments([req.comment], req)[0] });

    });