Commit 75ce6f60 authored by Nick Poulden's avatar Nick Poulden
Browse files

Use ext-all.js again

parent 7a88cd1c

Rakefile

+5 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ desc "Run JSDuck on ExtJS SDK" 
task :sdk do

  load_sdk_vars

  run_jsduck([

    "--extjs-path", "extjs/ext-debug.js",

    "--extjs-path", "extjs/ext-all.js",

    # to create symbolic links to template files instead of copying them over.

    # Useful for development.  Turn off for deployment.

    "--template-links",
@@ -243,14 +243,17 @@ task :compress do 


  # Clean up SASS files

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

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

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

  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}/ext-all.js #{OUT_DIR}/extjs"

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

  system "cp -r #{EXT_DIR}/examples #{OUT_DIR}/extjs"

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

end

lib/jsduck/options.rb

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ module JsDuck 
      @processes = nil

      @template_dir = File.dirname(File.dirname(File.dirname(__FILE__))) + "/template"

      @template_links = false

      @extjs_path = "extjs/ext.js"

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

      @local_storage_db = "docs"

    end

template/app/Application.js

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Ext.define('Docs.Application', { 
    ],



    controllers: [

        'Index',

        'Content',

        'Classes',

        'Search',

template/index.html

+2 −2
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
  <script type="text/javascript" src="http://use.typekit.com/uxj6dew.js"></script>

  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>

  <script type="text/javascript">Docs = {localStorageDb: "{local_storage_db}"};</script>

  <script type="text/javascript" src="{extjs_path}"></script>

  <!-- BEGIN JS -->

  <script type="text/javascript" src="resources/codemirror/codemirror.js"></script>

  <script type="text/javascript" src="resources/codemirror/javascript.js"></script>

  <script type="text/javascript" src="{extjs_path}"></script>

  <script type="text/javascript" src="resources/prettify/prettify.js"></script>

  <script type="text/javascript" src="app.js"></script>

  <!-- END JS -->

  <script type="text/javascript" src="data.js"></script>

  <!-- END JS -->



  {head_html}

template/resources/sass/viewport.scss

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ a { 
    position: relative;

    -webkit-transition: background-color 0.15s linear;

    @include icons;

    a { color: #000; }

    a.fav {

      display: block;

      width: 15px;