Commit 07465c2a authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge branch 'master' into doc-tags

parents ce3dabdf a4b489a5

Rakefile

+3 −3
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ task :ext4 => :sass do 
  runner.add_debug

  runner.run



  system("cp -r #{EXT_BUILD} #{OUT_DIR}/extjs-build")

  system("ln -s #{EXT_BUILD} #{OUT_DIR}/extjs-build")

end



desc "Run JSDuck on Ext JS from SDK repo (for internal use at Sencha)"
@@ -265,7 +265,7 @@ task :sdk => :sass do 
  runner.add_comments('ext-js', '4')

  runner.run



  system("cp -r #{EXT_BUILD} #{OUT_DIR}/extjs-build")

  system("ln -s #{EXT_BUILD} #{OUT_DIR}/extjs-build")

end



desc "Run JSDuck on Sencha Touch 2 repo (for internal use at Sencha)"
@@ -286,7 +286,7 @@ task :touch2 => :sass do 
  runner.add_comments('touch', '2')

  runner.run



  system("cp -r #{TOUCH_BUILD} #{OUT_DIR}/touch-build")

  system("ln -s #{TOUCH_BUILD} #{OUT_DIR}/touch-build")

end



task :default => :spec

bin/jsduck

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
# For running when gem not installed

$:.unshift File.dirname(File.dirname(__FILE__)) + "/lib"



require 'rubygems'

require 'jsduck/app'

require 'jsduck/options'

lib/jsduck/format/doc.rb

+0 −1
Original line number Diff line number Diff line 
require 'rubygems'

require 'strscan'

require 'rdiscount'

require 'jsduck/format/html_stack'

template/app/controller/Examples.js

+9 −5
Original line number Diff line number Diff line
@@ -46,6 +46,15 @@ Ext.define('Docs.controller.Examples', { 
                    this.loadExample(url);

                }

            },

            'touchexamplecontainer, examplecontainer': {

                afterrender: function(cmp) {

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

                        this.openInNewWindow();

                    }, this, {

                        delegate: 'button.new-window'

                    });

                }

            },

            'touchexamplecontainer': {

                afterrender: function(cmp) {

                    cmp.el.addListener('click', function(e, el) {
@@ -68,11 +77,6 @@ Ext.define('Docs.controller.Examples', { 
                    }, this, {

                        delegate: 'button.landscape'

                    });

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

                        this.openInNewWindow();

                    }, this, {

                        delegate: 'button.new-window'

                    });

                }

            }

        });

template/app/view/examples/Container.js

+13 −1
Original line number Diff line number Diff line
@@ -4,11 +4,23 @@ 
 * Renders the example inside iframe.

 */

Ext.define('Docs.view.examples.Container', {

    extend: 'Ext.container.Container',

    extend: 'Ext.panel.Panel',

    alias: 'widget.examplecontainer',

    layout: 'fit',



    initComponent: function() {

        this.dockedItems = [{

            xtype: 'container',

            dock: 'top',

            html: [

                '<div class="cls-grouping example-toolbar">',

                    '<div>',

                        '<button class="new-window">Open in new window</button>',

                    '</div>',

                '</div>'

            ].join('')

        }];



        this.tpl = new Ext.XTemplate(

            '<iframe style="width: 100%; height: 100%; border: 0;" src="{url}"></iframe>'

        );