dan/api_docs
1
0
Fork 0
mirror of https://github.com/danbulant/api_docs synced 2026-05-24 12:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #159 from tripit/dev

Browse source 
Update master. Thanks @lord
This commit is contained in:
Tariq Islam 2015-01-20 09:51:28 -08:00
commit 73d2997a24
3 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gemfile
View file

@ -2,6 +2,8 @@
# the following line to use "https" # the following line to use "https"
source 'http://rubygems.org' source 'http://rubygems.org'
gem "rouge", "1.7.2"
gem "middleman", "~>3.3.0" gem "middleman", "~>3.3.0"
# For syntax highlighting # For syntax highlighting
@ -13,7 +15,7 @@ gem 'middleman-gh-pages'
# Live-reloading plugin # Live-reloading plugin
gem "middleman-livereload", "~> 3.3.0" gem "middleman-livereload", "~> 3.3.0"
gem 'redcarpet', '~> 3.1.1' gem 'redcarpet', '~> 3.2.1'
# For faster file watcher updates on Windows: # For faster file watcher updates on Windows:
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw] gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
@ -23,6 +25,6 @@ platforms :mri_18 do
gem "ruby18_source_location" gem "ruby18_source_location"
end end
gem "rake", "~> 10.3.0" gem "rake", "~> 10.4.0"
gem 'therubyracer', :platforms => :ruby gem 'therubyracer', :platforms => :ruby

45
Gemfile.lock
View file

@ -1,7 +1,7 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
activesupport (4.1.7) activesupport (4.1.9)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -30,10 +30,10 @@ GEM
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.4)
execjs (2.2.2) execjs (2.2.2)
ffi (1.9.6) ffi (1.9.6)
haml (4.0.5) haml (4.0.6)
tilt tilt
hike (1.2.3) hike (1.2.3)
hitimes (1.2.2) hitimes (1.2.2)
@ -41,25 +41,25 @@ GEM
uber (~> 0.0.4) uber (~> 0.0.4)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (0.6.11) i18n (0.6.11)
json (1.8.1) json (1.8.2)
kramdown (1.5.0) kramdown (1.5.0)
libv8 (3.16.14.7) libv8 (3.16.14.7)
listen (2.7.11) listen (2.8.5)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
middleman (3.3.6) middleman (3.3.7)
coffee-script (~> 2.2) coffee-script (~> 2.2)
compass (>= 1.0.0, < 2.0.0) compass (>= 1.0.0, < 2.0.0)
compass-import-once (= 1.0.5) compass-import-once (= 1.0.5)
execjs (~> 2.0) execjs (~> 2.0)
haml (>= 4.0.5) haml (>= 4.0.5)
kramdown (~> 1.2) kramdown (~> 1.2)
middleman-core (= 3.3.6) middleman-core (= 3.3.7)
middleman-sprockets (>= 3.1.2) middleman-sprockets (>= 3.1.2)
sass (>= 3.4.0, < 4.0) sass (>= 3.4.0, < 4.0)
uglifier (~> 2.5) uglifier (~> 2.5)
middleman-core (3.3.6) middleman-core (3.3.7)
activesupport (~> 4.1.0) activesupport (~> 4.1.0)
bundler (~> 1.1) bundler (~> 1.1)
erubis erubis
@ -77,15 +77,15 @@ GEM
em-websocket (~> 0.5.1) em-websocket (~> 0.5.1)
middleman-core (~> 3.2) middleman-core (~> 3.2)
rack-livereload (~> 0.3.15) rack-livereload (~> 0.3.15)
middleman-sprockets (3.3.10) middleman-sprockets (3.4.1)
middleman-core (~> 3.3) middleman-core (>= 3.3)
sprockets (~> 2.12.1) sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0) sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.2.0) sprockets-sass (~> 1.3.0)
middleman-syntax (2.0.0) middleman-syntax (2.0.0)
middleman-core (~> 3.2) middleman-core (~> 3.2)
rouge (~> 1.0) rouge (~> 1.0)
minitest (5.4.2) minitest (5.5.1)
multi_json (1.10.1) multi_json (1.10.1)
padrino-helpers (0.12.4) padrino-helpers (0.12.4)
i18n (~> 0.6, >= 0.6.7) i18n (~> 0.6, >= 0.6.7)
@ -93,20 +93,20 @@ GEM
tilt (~> 1.4.1) tilt (~> 1.4.1)
padrino-support (0.12.4) padrino-support (0.12.4)
activesupport (>= 3.1) activesupport (>= 3.1)
rack (1.5.2) rack (1.6.0)
rack-livereload (0.3.15) rack-livereload (0.3.15)
rack rack
rack-test (0.6.2) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rake (10.3.2) rake (10.4.2)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (3.1.2) redcarpet (3.2.2)
ref (1.0.5) ref (1.0.5)
rouge (1.7.2) rouge (1.7.2)
ruby18_source_location (0.2) ruby18_source_location (0.2)
sass (3.4.7) sass (3.4.9)
sprockets (2.12.3) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -114,7 +114,7 @@ GEM
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.1.0) sprockets-helpers (1.1.0)
sprockets (~> 2.0) sprockets (~> 2.0)
sprockets-sass (1.2.0) sprockets-sass (1.3.1)
sprockets (~> 2.0) sprockets (~> 2.0)
tilt (~> 1.1) tilt (~> 1.1)
therubyracer (0.12.1) therubyracer (0.12.1)
@ -127,8 +127,8 @@ GEM
hitimes hitimes
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uber (0.0.10) uber (0.0.13)
uglifier (2.5.3) uglifier (2.7.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
@ -140,8 +140,9 @@ DEPENDENCIES
middleman-gh-pages middleman-gh-pages
middleman-livereload (~> 3.3.0) middleman-livereload (~> 3.3.0)
middleman-syntax middleman-syntax
rake (~> 10.3.0) rake (~> 10.4.0)
redcarpet (~> 3.1.1) redcarpet (~> 3.2.1)
rouge (= 1.7.2)
ruby18_source_location ruby18_source_location
therubyracer therubyracer
wdm (~> 0.1.0) wdm (~> 0.1.0)

6
source/javascripts/app/lang.js
View file

@ -26,15 +26,17 @@ under the License.
$(".lang-selector a").removeClass('active'); $(".lang-selector a").removeClass('active');
$(".lang-selector a[data-language-name='" + language + "']").addClass('active'); $(".lang-selector a[data-language-name='" + language + "']").addClass('active');
for (var i=0; i < languages.length; i++) { for (var i=0; i < languages.length; i++) {
$(".highlight." + languages[i]).parent().hide(); $(".highlight." + languages[i]).hide();
} }
$(".highlight." + language).parent().show(); $(".highlight." + language).show();
global.toc.calculateHeights(); global.toc.calculateHeights();
// scroll to the new location of the position // scroll to the new location of the position
if ($(window.location.hash).get(0)) {
$(window.location.hash).get(0).scrollIntoView(true); $(window.location.hash).get(0).scrollIntoView(true);
} }
}
// if a button is clicked, add the state to the history // if a button is clicked, add the state to the history
function pushURL(language) { function pushURL(language) {