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

Merge branch 'master' into esprima-parser

parents e51e5dd8 663030a4

Rakefile

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ def compress 
  system "mkdir #{dir}/extjs"

  system "cp template/extjs/ext-all.js #{dir}/extjs"

  system "mkdir -p #{dir}/extjs/resources/themes/images"

  system "cp -r #{EXT_BUILD}/resources/themes/images/default #{dir}/extjs/resources/themes/images"

  system "cp -r template/extjs/resources/themes/images/default #{dir}/extjs/resources/themes/images"

end

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'

  s.date = '2012-04-17'

  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"



      # 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

        });