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

Use ext.js as the default extjs file. 

The Docs App JavaScript file now gets build with minimal amount
of ExtJS in it.  Added a missing dependancy to app.js to make it
work.
parent 78b51a17

Rakefile

+15 −16
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ task :sdk do 
  ])

end



def run_jsduck_export(extra_options, ext_dir)

def run_jsduck_export(extra_options)

  load_sdk_vars

  rev = `git rev-parse HEAD`.slice(0, 7)

  head_html = <<-EOHTML
@@ -86,19 +86,6 @@ def run_jsduck_export(extra_options, ext_dir) 
    "#{SDK_DIR}/platform/core/src",

  ].concat(extra_options))



  # Empty th extjs dir

  system "rm #{OUT_DIR}/extjs"

  system "mkdir -p #{OUT_DIR}/extjs/resources/css"

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

  # Clean up SASS files

  system "rm -rf #{OUT_DIR}/resources/sass"

  system "rm -rf #{OUT_DIR}/resources/.sass-cache"

  # Copy over ext-all.js for Docs app

  system "cp #{EXT_DIR}/ext-all.js #{OUT_DIR}/extjs"

  # Copy the standard ExtJS files for use with inline examples

  system "cp #{EXT_DIR}/ext-all-debug.js #{OUT_DIR}/extjs"

  system "cp #{EXT_DIR}/resources/css/ext-all.css #{OUT_DIR}/extjs/resources/css"

  system "cp -r #{EXT_DIR}/resources/themes/images/default #{OUT_DIR}/extjs/resources/themes/images"

end



desc "Run JSDuck on ExtJS SDK to create release version of docs app"
@@ -110,7 +97,7 @@ task :export do 
      Use <a href="http://docs.sencha.com/ext-js/4-0">http://docs.sencha.com/ext-js/4-0</a> for up to date documentation and features

    </div>

    EOHTML

  ], EXT_DIR)

  ])

end



desc "Run JSDuck on ExtJS SDK to create live docs app"
@@ -146,7 +133,7 @@ task :live_docs do 
      }

    </script>

  EOHTML

  ], "#{SDK_DIR}/extjs/build/sdk")

  ])

end



desc "Run JSDuck on the Docs app itself"
@@ -223,6 +210,18 @@ task :compress do 
  html = combine_css(html, OUT_DIR)

  html = combine_js(html, OUT_DIR)

  File.open("#{OUT_DIR}/index.html", 'w') {|f| f.write(html) }



  # Clean up SASS files

  system "rm -rf #{OUT_DIR}/resources/sass"

  system "rm -rf #{OUT_DIR}/resources/.sass-cache"



  # Empty the extjs dir, leave only the main JS file, CSS and images (for inline examples)

  system "rm -rf #{OUT_DIR}/extjs"

  system "mkdir -p #{OUT_DIR}/extjs/resources/css"

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

  system "cp #{EXT_DIR}/ext-all-debug.js #{OUT_DIR}/extjs"

  system "cp #{EXT_DIR}/resources/css/ext-all.css #{OUT_DIR}/extjs/resources/css"

  system "cp -r #{EXT_DIR}/resources/themes/images/default #{OUT_DIR}/extjs/resources/themes/images"

end



task :default => :spec

bin/jsduck

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ opts = OptionParser.new do | opts | 


  opts.on('--extjs-path=PATH',

    "Path for main ExtJS JavaScript file.  Useful for specifying",

    "something different than extjs/ext-all.js", " ") do |path|

    "something different than extjs/ext.js", " ") do |path|

    app.extjs_path = path

  end

lib/jsduck/app.rb

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ module JsDuck 
      @show_private_classes = false

      @title = "Ext JS API Documentation"

      @footer = 'Generated with <a href="https://github.com/senchalabs/jsduck">JSDuck</a>.'

      @extjs_path = "extjs/ext-all.js"

      @extjs_path = "extjs/ext.js"

      @local_storage_db = "docs"

      @head_html = ""

      @body_html = ""

template/app.js

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Ext.require('Ext.grid.column.Action'); 
Ext.require('Ext.grid.plugin.DragDrop');

Ext.require('Ext.layout.container.Border');

Ext.require('Ext.data.TreeStore');

Ext.require('Ext.toolbar.Spacer');



// The following is exactly what Ext.application() function does, but

// we use our own Application class that extends Ext.app.Application