From 75ce6f608225ea3847cf642f79c380790bb04fc9 Mon Sep 17 00:00:00 2001 From: Nick Poulden Date: Fri, 5 Aug 2011 15:09:22 -0700 Subject: [PATCH] Use ext-all.js again --- Rakefile | 7 +++++-- lib/jsduck/options.rb | 2 +- template/app/Application.js | 1 + template/index.html | 4 ++-- template/resources/sass/viewport.scss | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Rakefile b/Rakefile index bfe98d66..291b03cc 100644 --- a/Rakefile +++ b/Rakefile @@ -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 diff --git a/lib/jsduck/options.rb b/lib/jsduck/options.rb index b4edeb00..9953f770 100644 --- a/lib/jsduck/options.rb +++ b/lib/jsduck/options.rb @@ -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 diff --git a/template/app/Application.js b/template/app/Application.js index 77485f19..bd5ca15c 100644 --- a/template/app/Application.js +++ b/template/app/Application.js @@ -20,6 +20,7 @@ Ext.define('Docs.Application', { ], controllers: [ + 'Index', 'Content', 'Classes', 'Search', diff --git a/template/index.html b/template/index.html index c219e8af..2cd01702 100644 --- a/template/index.html +++ b/template/index.html @@ -21,14 +21,14 @@ + - - + {head_html} diff --git a/template/resources/sass/viewport.scss b/template/resources/sass/viewport.scss index b393c605..a9cc28b4 100644 --- a/template/resources/sass/viewport.scss +++ b/template/resources/sass/viewport.scss @@ -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; -- GitLab