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

Merge branch 'extjs-4.1'

parents 205b2bf0 f3200d22

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.8.4'

  s.date = '2012-04-05'

  s.version = '3.9.0.pre'

  s.date = '2012-04-10'

  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
@@ -73,7 +73,7 @@ module JsDuck 
      ]

      @meta_tag_paths = []



      @version = "3.8.4"

      @version = "3.9.0.pre"



      # Customizing output

      @title = "Sencha Docs - Ext JS"

template/app.js

+0 −4
Original line number Diff line number Diff line 
Ext.ns("Docs");



// Ext 4.0.7 has a bug that when creating cors request

// the Ext.isIe property is mistakenly checked instead of Ext.isIE.

Ext.isIe = Ext.isIE;



Ext.Loader.setConfig({

    enabled: true,

    paths: {

template/app/controller/Comments.js

+6 −10
Original line number Diff line number Diff line
@@ -136,14 +136,10 @@ Ext.define('Docs.controller.Comments', { 
            },



            'classoverview toolbar': {

                afterrender: function(cmp) {

                    cmp.el.addListener('click', function() {

                commentcountclick: function(cmp) {

                    var commentsDiv = Ext.get(Ext.query('.comments-section .comments-div')[0]);

                    this.getOverview().scrollToEl('.comments-section', -20);

                    this.openComments(commentsDiv);

                    }, this, {

                        delegate: '.comment-btn'

                    });

                }

            }

        });
@@ -614,14 +610,14 @@ Ext.define('Docs.controller.Comments', { 
    },



    renderGuideCommentContainers: function(guide) {

        Docs.view.Comments.classCommentsTpl.append(Ext.get('guide'), {

        Docs.view.Comments.classCommentsTpl.append(Ext.get('guide').down(".x-panel-body"), {

            num: 0,

            id: 'guide-' + guide

        });

    },



    renderVideoCommentContainers: function(video) {

        Docs.view.Comments.classCommentsTpl.append(Ext.get('video'), {

        Docs.view.Comments.classCommentsTpl.append(Ext.get('video').down(".x-panel-body"), {

            num: 0,

            id: 'video-' + video

        });

template/app/view/Comments.js

+7 −10
Original line number Diff line number Diff line
@@ -316,14 +316,7 @@ Ext.define('Docs.view.Comments', { 
     */

    renderClassCommentContainers: function(cls) {

        // Add comment button to class toolbar

        Ext.ComponentQuery.query('classoverview toolbar')[0].insert(-2, {

            xtype: 'container',

            id: 'classCommentToolbarBtn',

            width: 24,

            margin: '0 4 0 0',

            cls: 'comment-btn',

            html: '0'

        });

        this.getClassToolbar().showCommentCount();



        // Insert class level comment container under class intro docs

        this.classCommentsTpl.insertFirst(Ext.query('.members')[0], {
@@ -350,7 +343,7 @@ Ext.define('Docs.view.Comments', { 
        if (clsMeta && clsMeta['']) {



            // Update toolbar icon

            Ext.getCmp('classCommentToolbarBtn').update(clsMeta['']);

            this.getClassToolbar().setCommentCount(clsMeta['']);



            // Update class level comments meta

            this.numCommentsTpl.overwrite(Ext.get(Ext.query('.comments-section a.name')[0]), {
@@ -358,7 +351,7 @@ Ext.define('Docs.view.Comments', { 
            });

        } else {

            // Update toolbar icon

            Ext.getCmp('classCommentToolbarBtn').update('0');

            this.getClassToolbar().setCommentCount(0);



            // Update class level comments meta

            this.numCommentsTpl.overwrite(Ext.get(Ext.query('.comments-section a.name')[0]), {
@@ -398,6 +391,10 @@ Ext.define('Docs.view.Comments', { 
        });

    },



    getClassToolbar: function() {

        return Ext.ComponentQuery.query('classoverview toolbar')[0];

    },



    updateGuideCommentMeta: function(guide) {

        var guideMeta = Docs.commentMeta['guide'][guide];