Fix merge conflicts

pull/986/head
Jasper van Merle 6 years ago
commit 6e917001ce

1
.gitignore vendored

@ -1,5 +1,6 @@
.DS_Store .DS_Store
.bundle .bundle
log
tmp tmp
public/assets public/assets
public/fonts public/fonts

@ -1,2 +1 @@
public/icons test
test

@ -9,3 +9,11 @@ before_script:
script: script:
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ]; then bundle exec rake; fi - if [ "$TRAVIS_EVENT_TYPE" != "cron" ]; then bundle exec rake; fi
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then bundle exec thor updates:check --github-token $GH_TOKEN --upload; fi - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then bundle exec thor updates:check --github-token $GH_TOKEN --upload; fi
deploy:
provider: heroku
app: devdocs
on:
branch: master
api_key:
secure: "4p1klvWJZSOImzFcKOduILjP93hlOlAhceWlYMKS4tU+TCFE8qTBzdKdFPSCsCgjB+YR9pBss+L0lJpVVMjSwFHXqpKe6EeUSltO2k7DFHfW7kXLUM/L0AfqXz+YXk76XUyZMhvOEbldPfaMaj10e8vgDOQCSHABDyK/4CU+hnI="

@ -1,6 +1,7 @@
FROM ruby:2.6.0 FROM ruby:2.6.0
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
ENV ENABLE_SERVICE_WORKER=true
WORKDIR /devdocs WORKDIR /devdocs

@ -1,6 +1,7 @@
FROM ruby:2.6.0-alpine FROM ruby:2.6.0-alpine
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
ENV ENABLE_SERVICE_WORKER=true
WORKDIR /devdocs WORKDIR /devdocs

@ -22,6 +22,8 @@ group :app do
gem 'browser' gem 'browser'
gem 'sass' gem 'sass'
gem 'coffee-script' gem 'coffee-script'
gem 'chunky_png'
gem 'sprockets-sass'
end end
group :production do group :production do

@ -12,6 +12,7 @@ GEM
erubi (>= 1.0.0) erubi (>= 1.0.0)
rack (>= 0.9.0) rack (>= 0.9.0)
browser (2.5.3) browser (2.5.3)
chunky_png (1.3.10)
coderay (1.1.2) coderay (1.1.2)
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
@ -96,6 +97,8 @@ GEM
rack (> 1, < 3) rack (> 1, < 3)
sprockets-helpers (1.2.1) sprockets-helpers (1.2.1)
sprockets (>= 2.2) sprockets (>= 2.2)
sprockets-sass (2.0.0.beta2)
sprockets (>= 2.0, < 4.0)
strings (0.1.4) strings (0.1.4)
strings-ansi (~> 0.1.0) strings-ansi (~> 0.1.0)
unicode-display_width (~> 1.4.0) unicode-display_width (~> 1.4.0)
@ -134,6 +137,7 @@ DEPENDENCIES
activesupport (~> 5.2) activesupport (~> 5.2)
better_errors better_errors
browser browser
chunky_png
coffee-script coffee-script
erubi erubi
html-pipeline html-pipeline
@ -156,6 +160,7 @@ DEPENDENCIES
sprockets sprockets
sprockets-helpers sprockets-helpers
terminal-table terminal-table
sprockets-sass
thin thin
thor thor
tty-pager tty-pager

@ -59,14 +59,14 @@ The web app is all client-side JavaScript, written in [CoffeeScript](http://coff
Many of the code's design decisions were driven by the fact that the app uses XHR to load content directly into the main frame. This includes stripping the original documents of most of their HTML markup (e.g. scripts and stylesheets) to avoid polluting the main frame, and prefixing all CSS class names with an underscore to prevent conflicts. Many of the code's design decisions were driven by the fact that the app uses XHR to load content directly into the main frame. This includes stripping the original documents of most of their HTML markup (e.g. scripts and stylesheets) to avoid polluting the main frame, and prefixing all CSS class names with an underscore to prevent conflicts.
Another driving factor is performance and the fact that everything happens in the browser. `applicationCache` (which comes with its own set of constraints) and `localStorage` are used to speed up the boot time, while memory consumption is kept in check by allowing the user to pick his/her own set of documentations. The search algorithm is kept simple because it needs to be fast even searching through 100,000 strings. Another driving factor is performance and the fact that everything happens in the browser. A service worker (which comes with its own set of constraints) and `localStorage` are used to speed up the boot time, while memory consumption is kept in check by allowing the user to pick his/her own set of documentations. The search algorithm is kept simple because it needs to be fast even searching through 100,000 strings.
DevDocs being a developer tool, the browser requirements are high: DevDocs being a developer tool, the browser requirements are high:
* Recent versions of Firefox, Chrome, or Opera * Recent versions of Firefox, Chrome, or Opera
* Safari 9.1+ * Safari 11.1+
* Edge 16+ * Edge 17+
* iOS 10+ * iOS 11.3+
This allows the code to take advantage of the latest DOM and HTML5 APIs and make developing DevDocs a lot more fun! This allows the code to take advantage of the latest DOM and HTML5 APIs and make developing DevDocs a lot more fun!
@ -156,7 +156,7 @@ Contributions are welcome. Please read the [contributing guidelines](./.github/C
* [Doc Browser](https://github.com/qwfy/doc-browser) is a native Linux app that supports DevDocs docsets * [Doc Browser](https://github.com/qwfy/doc-browser) is a native Linux app that supports DevDocs docsets
* [GNOME Application](https://github.com/hardpixel/devdocs-desktop) GTK3 application with search integrated in headerbar * [GNOME Application](https://github.com/hardpixel/devdocs-desktop) GTK3 application with search integrated in headerbar
* [macOS Application](https://github.com/dteoh/devdocs-macos) * [macOS Application](https://github.com/dteoh/devdocs-macos)
* [Android Application](https://github.com/Merith-TK/devdocs_webapp_kotlin) is a fully working, advanced WebView with AppCache enabled * [Android Application](https://github.com/Merith-TK/devdocs_webapp_kotlin) is a fully working, advanced WebView
## Copyright / License ## Copyright / License

@ -0,0 +1 @@
sprites/**/*

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 119 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

@ -13,10 +13,12 @@
@el = $('._app') @el = $('._app')
@localStorage = new LocalStorageStore @localStorage = new LocalStorageStore
@appCache = new app.AppCache if app.AppCache.isEnabled() @serviceWorker = new app.ServiceWorker if app.ServiceWorker.isEnabled()
@settings = new app.Settings @settings = new app.Settings
@db = new app.DB() @db = new app.DB()
@settings.initLayout()
@docs = new app.collections.Docs @docs = new app.collections.Docs
@disabledDocs = new app.collections.Docs @disabledDocs = new app.collections.Docs
@entries = new app.collections.Entries @entries = new app.collections.Entries
@ -138,7 +140,10 @@
@docs.sort() @docs.sort()
@initDoc(doc) @initDoc(doc)
@saveDocs() @saveDocs()
_onSuccess() if app.settings.get('autoInstall')
doc.install(_onSuccess, onError)
else
_onSuccess()
return return
doc.load onSuccess, onError, writeCache: true doc.load onSuccess, onError, writeCache: true
@ -147,7 +152,7 @@
saveDocs: -> saveDocs: ->
@settings.setDocs(doc.slug for doc in @docs.all()) @settings.setDocs(doc.slug for doc in @docs.all())
@db.migrate() @db.migrate()
@appCache?.updateInBackground() @serviceWorker?.updateInBackground()
welcomeBack: -> welcomeBack: ->
visitCount = @settings.get('count') visitCount = @settings.get('count')
@ -167,14 +172,14 @@
reload: -> reload: ->
@docs.clearCache() @docs.clearCache()
@disabledDocs.clearCache() @disabledDocs.clearCache()
if @appCache then @appCache.reload() else @reboot() if @serviceWorker then @serviceWorker.reload() else @reboot()
return return
reset: -> reset: ->
@localStorage.reset() @localStorage.reset()
@settings.reset() @settings.reset()
@db?.reset() @db?.reset()
@appCache?.update() @serviceWorker?.update()
window.location = '/' window.location = '/'
return return
@ -193,9 +198,9 @@
return return
indexHost: -> indexHost: ->
# Can't load the index files from the host/CDN when applicationCache is # Can't load the index files from the host/CDN when service worker is
# enabled because it doesn't support caching URLs that use CORS. # enabled because it doesn't support caching URLs that use CORS.
@config[if @appCache and @settings.hasDocs() then 'index_path' else 'docs_origin'] @config[if @serviceWorker and @settings.hasDocs() then 'index_path' else 'docs_origin']
onBootError: (args...) -> onBootError: (args...) ->
@trigger 'bootError' @trigger 'bootError'
@ -252,7 +257,7 @@
matchMedia: !!window.matchMedia matchMedia: !!window.matchMedia
insertAdjacentHTML: !!document.body.insertAdjacentHTML insertAdjacentHTML: !!document.body.insertAdjacentHTML
defaultPrevented: document.createEvent('CustomEvent').defaultPrevented is false defaultPrevented: document.createEvent('CustomEvent').defaultPrevented is false
cssVariables: CSS.supports and CSS.supports('(--t: 0)') cssVariables: !!CSS?.supports?('(--t: 0)')
for key, value of features when not value for key, value of features when not value
Raven.captureMessage "unsupported/#{key}", level: 'info' Raven.captureMessage "unsupported/#{key}", level: 'info'

@ -1,42 +0,0 @@
class app.AppCache
$.extend @prototype, Events
@isEnabled: ->
try
applicationCache and applicationCache.status isnt applicationCache.UNCACHED
catch
constructor: ->
@cache = applicationCache
@notifyUpdate = true
@onUpdateReady() if @cache.status is @cache.UPDATEREADY
$.on @cache, 'progress', @onProgress
$.on @cache, 'updateready', @onUpdateReady
update: ->
@notifyUpdate = true
@notifyProgress = true
try @cache.update() catch
return
updateInBackground: ->
@notifyUpdate = false
@notifyProgress = false
try @cache.update() catch
return
reload: ->
$.on @cache, 'updateready noupdate error', -> app.reboot()
@notifyUpdate = false
@notifyProgress = true
try @cache.update() catch
return
onProgress: (event) =>
@trigger 'progress', event if @notifyProgress
return
onUpdateReady: =>
@trigger 'updateready' if @notifyUpdate
return

@ -13,3 +13,5 @@ app.config =
version: <%= Time.now.to_i %> version: <%= Time.now.to_i %>
release: <%= Time.now.utc.httpdate.to_json %> release: <%= Time.now.utc.httpdate.to_json %>
mathml_stylesheet: '<%= App.cdn_origin %>/mathml.css' mathml_stylesheet: '<%= App.cdn_origin %>/mathml.css'
service_worker_path: '/service-worker.js'
service_worker_enabled: <%= App.environment == :production || ENV['ENABLE_SERVICE_WORKER'] == 'true' %>

@ -0,0 +1,49 @@
class app.ServiceWorker
$.extend @prototype, Events
@isEnabled: ->
!!navigator.serviceWorker and app.config.service_worker_enabled
constructor: ->
@registration = null
@notifyUpdate = true
navigator.serviceWorker.register(app.config.service_worker_path, {scope: '/'})
.then(
(registration) => @updateRegistration(registration),
(error) -> console.error('Could not register service worker:', error)
)
update: ->
return unless @registration
@notifyUpdate = true
return @registration.update().catch(->)
updateInBackground: ->
return unless @registration
@notifyUpdate = false
return @registration.update().catch(->)
reload: ->
return @updateInBackground().then(() -> app.reboot())
updateRegistration: (registration) ->
@registration = registration
$.on @registration, 'updatefound', @onUpdateFound
return
onUpdateFound: =>
$.off @installingRegistration, 'statechange', @onStateChange() if @installingRegistration
@installingRegistration = @registration.installing
$.on @installingRegistration, 'statechange', @onStateChange
return
onStateChange: =>
if @installingRegistration and @installingRegistration.state == 'installed' and navigator.serviceWorker.controller
@installingRegistration = null
@onUpdateReady()
return
onUpdateReady: ->
@trigger 'updateready' if @notifyUpdate
return

@ -5,11 +5,13 @@ class app.Settings
'manualUpdate' 'manualUpdate'
'fastScroll' 'fastScroll'
'arrowScroll' 'arrowScroll'
'analyticsConsent'
'docs' 'docs'
'dark' 'dark'
'layout' 'layout'
'size' 'size'
'tips' 'tips'
'autoInstall'
] ]
INTERNAL_KEYS = [ INTERNAL_KEYS = [
@ -19,6 +21,8 @@ class app.Settings
'news' 'news'
] ]
LAYOUTS: ['_max-width', '_sidebar-hidden', '_native-scrollbars']
@defaults: @defaults:
count: 0 count: 0
hideDisabled: false hideDisabled: false
@ -26,6 +30,7 @@ class app.Settings
news: 0 news: 0
manualUpdate: false manualUpdate: false
schema: 1 schema: 1
analyticsConsent: false
constructor: -> constructor: ->
@store = new CookieStore @store = new CookieStore
@ -38,6 +43,7 @@ class app.Settings
set: (key, value) -> set: (key, value) ->
@store.set(key, value) @store.set(key, value)
delete @cache[key] delete @cache[key]
@toggleDark(value) if key == 'dark'
return return
del: (key) -> del: (key) ->
@ -63,6 +69,8 @@ class app.Settings
return return
setLayout: (name, enable) -> setLayout: (name, enable) ->
@toggleLayout(name, enable)
layout = (@store.get('layout') || '').split(' ') layout = (@store.get('layout') || '').split(' ')
$.arrayDelete(layout, '') $.arrayDelete(layout, '')
@ -104,3 +112,28 @@ class app.Settings
@store.reset() @store.reset()
@cache = {} @cache = {}
return return
initLayout: ->
@toggleDark(@get('dark') is 1)
@toggleLayout(layout, @hasLayout(layout)) for layout in @LAYOUTS
@initSidebarWidth()
return
toggleDark: (enable) ->
classList = document.documentElement.classList
classList.toggle('_theme-default', !enable)
classList.toggle('_theme-dark', enable)
color = getComputedStyle(document.documentElement).getPropertyValue('--headerBackground').trim()
$('meta[name=theme-color]').setAttribute('content', color)
return
toggleLayout: (layout, enable) ->
classList = document.body.classList
classList.toggle(layout, enable) unless layout is '_sidebar-hidden'
classList.toggle('_overlay-scrollbars', $.overlayScrollbarsEnabled())
return
initSidebarWidth: ->
size = @get('size')
document.documentElement.style.setProperty('--sidebarWidth', size + 'px') if size
return

@ -3,13 +3,13 @@ class app.UpdateChecker
@lastCheck = Date.now() @lastCheck = Date.now()
$.on window, 'focus', @onFocus $.on window, 'focus', @onFocus
app.appCache.on 'updateready', @onUpdateReady if app.appCache app.serviceWorker?.on 'updateready', @onUpdateReady
setTimeout @checkDocs, 0 setTimeout @checkDocs, 0
check: -> check: ->
if app.appCache if app.serviceWorker
app.appCache.update() app.serviceWorker.update()
else else
ajax ajax
url: $('script[src*="application"]').getAttribute('src') url: $('script[src*="application"]').getAttribute('src')

@ -199,5 +199,21 @@ page.track = (fn) ->
return return
track = -> track = ->
tracker.call() for tracker in trackers consentGiven = Cookies.get('analyticsConsent')
consentAsked = Cookies.get('analyticsConsentAsked')
if consentGiven == '1'
tracker.call() for tracker in trackers
else if consentGiven == undefined and consentAsked == undefined
# Only ask for consent once per browser session
Cookies.set('analyticsConsentAsked', '1')
new app.views.Notif 'AnalyticsConsent', autoHide: null
return
@resetAnalytics = ->
for cookie in document.cookie.split(/;\s?/)
name = cookie.split('=')[0]
if name[0] == '_'
Cookies.expire(name)
return return

@ -352,6 +352,10 @@ isIE = null
$.isIE = -> $.isIE = ->
isIE ?= navigator.userAgent?.indexOf('MSIE') >= 0 || navigator.userAgent?.indexOf('rv:11.0') >= 0 isIE ?= navigator.userAgent?.indexOf('MSIE') >= 0 || navigator.userAgent?.indexOf('rv:11.0') >= 0
isChromeForAndroid = null
$.isChromeForAndroid = ->
isChromeForAndroid ?= navigator.userAgent?.indexOf('Android') >= 0 && /Chrome\/([.0-9])+ Mobile/.test(navigator.userAgent)
isAndroid = null isAndroid = null
$.isAndroid = -> $.isAndroid = ->
isAndroid ?= navigator.userAgent?.indexOf('Android') >= 0 isAndroid ?= navigator.userAgent?.indexOf('Android') >= 0

@ -142,4 +142,6 @@ class app.models.Doc extends app.Model
return return
isOutdated: (status) -> isOutdated: (status) ->
status and status.installed and @mtime isnt status.mtime return false if not status
isInstalled = status.installed or app.settings.get('autoInstall')
isInstalled and @mtime isnt status.mtime

@ -1,4 +1,8 @@
[ [
[
"2019-07-19",
"Replaced the AppCache with a Service Worker (which makes DevDocs an installable PWA) and fixed layout preferences on Firefox."
],
[ [
"2018-09-23", "2018-09-23",
"New documentations: <a href=\"/puppeteer/\">Puppeteer</a> and <a href=\"/handlebars/\">Handlebars.js</a>" "New documentations: <a href=\"/puppeteer/\">Puppeteer</a> and <a href=\"/handlebars/\">Handlebars.js</a>"

@ -12,8 +12,8 @@ app.templates.notFoundPage = ->
app.templates.pageLoadError = -> app.templates.pageLoadError = ->
error """ The page failed to load. """, error """ The page failed to load. """,
""" It may be missing from the server (try reloading the app) or you could be offline.<br> """ It may be missing from the server (try reloading the app) or you could be offline (try <a href="/offline">installing the documentation for offline usage</a> when online again).<br>
If you keep seeing this, you're likely behind a proxy or firewall that blocks cross-domain requests. """, If you're online and you keep seeing this, you're likely behind a proxy or firewall that blocks cross-domain requests. """,
""" #{back} &middot; <a href="/##{location.pathname}" target="_top" class="_error-link">Reload</a> """ #{back} &middot; <a href="/##{location.pathname}" target="_top" class="_error-link">Reload</a>
&middot; <a href="#" class="_error-link" data-retry>Retry</a> """ &middot; <a href="#" class="_error-link" data-retry>Retry</a> """
@ -57,9 +57,9 @@ app.templates.unsupportedBrowser = """
<p class="_fail-text">DevDocs is an API documentation browser which supports the following browsers: <p class="_fail-text">DevDocs is an API documentation browser which supports the following browsers:
<ul class="_fail-list"> <ul class="_fail-list">
<li>Recent versions of Firefox, Chrome, or Opera <li>Recent versions of Firefox, Chrome, or Opera
<li>Safari 9.1+ <li>Safari 11.1+
<li>Edge 16+ <li>Edge 17+
<li>iOS 10+ <li>iOS 11.3+
</ul> </ul>
<p class="_fail-text"> <p class="_fail-text">
If you're unable to upgrade, we apologize. If you're unable to upgrade, we apologize.

@ -68,3 +68,9 @@ app.templates.notifShare = ->
app.templates.notifUpdateDocs = -> app.templates.notifUpdateDocs = ->
textNotif """ Documentation updates available. """, textNotif """ Documentation updates available. """,
""" <a href="/offline">Install them</a> as soon as possible to avoid broken pages. """ """ <a href="/offline">Install them</a> as soon as possible to avoid broken pages. """
app.templates.notifAnalyticsConsent = ->
textNotif """ Tracking cookies """,
""" We would like to gather usage data about how DevDocs is used through Google Analytics and Gauges. We only collect anonymous traffic information.
Please confirm if you accept our tracking cookies. You can always change your decision in the settings.
<br><span class="_notif-right"><a href="#" data-behavior="accept-analytics">Accept</a> or <a href="#" data-behavior="decline-analytics">Decline</a></span> """

@ -73,7 +73,8 @@ app.templates.aboutPage = -> """
<ul> <ul>
<li><a href="https://devdocs.io">devdocs.io</a> ("App") is operated by <a href="https://www.freecodecamp.org/">freeCodeCamp</a> ("We"). <li><a href="https://devdocs.io">devdocs.io</a> ("App") is operated by <a href="https://www.freecodecamp.org/">freeCodeCamp</a> ("We").
<li>We do not collect personal information through the app. <li>We do not collect personal information through the app.
<li>We use Google Analytics, Gauges and Sentry to collect anonymous traffic information and improve the app. <li>We use Google Analytics and Gauges to collect anonymous traffic information if you have given consent to this. You can change your decision in the <a href="/settings">settings</a>.
<li>We use Sentry to collect crash data and improve the app.
<li>The app uses cookies to store user preferences. <li>The app uses cookies to store user preferences.
<li>By using the app, you signify your acceptance of this policy. If you do not agree to this policy, please do not use the app. <li>By using the app, you signify your acceptance of this policy. If you do not agree to this policy, please do not use the app.
<li>If you have any questions regarding privacy, please email <a href="mailto:privacy@freecodecamp.org">privacy@freecodecamp.org</a>. <li>If you have any questions regarding privacy, please email <a href="mailto:privacy@freecodecamp.org">privacy@freecodecamp.org</a>.

@ -25,8 +25,8 @@ app.templates.offlinePage = (docs) -> """
<h2 class="_block-heading">Questions & Answers</h2> <h2 class="_block-heading">Questions & Answers</h2>
<dl> <dl>
<dt>How does this work? <dt>How does this work?
<dd>Each page is cached as a key-value pair in <a href="https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API">IndexedDB</a> (downloaded from a single file).<br> <dd>Each page is cached as a key-value pair in <a href="https://devdocs.io/dom/indexeddb_api">IndexedDB</a> (downloaded from a single file).<br>
The app also uses <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Using_the_application_cache">AppCache</a> and <a href="https://developer.mozilla.org/en-US/docs/Web/API/Web_Storage_API">localStorage</a> to cache the assets and index files. The app also uses <a href="https://devdocs.io/dom/service_worker_api/using_service_workers">Service Workers</a> and <a href="https://devdocs.io/dom/web_storage_api">localStorage</a> to cache the assets and index files.
<dt>Can I close the tab/browser? <dt>Can I close the tab/browser?
<dd>#{canICloseTheTab()} <dd>#{canICloseTheTab()}
<dt>What if I don't update a documentation? <dt>What if I don't update a documentation?
@ -41,10 +41,15 @@ app.templates.offlinePage = (docs) -> """
""" """
canICloseTheTab = -> canICloseTheTab = ->
if app.AppCache.isEnabled() if app.ServiceWorker.isEnabled()
""" Yes! Even offline, you can open a new tab, go to <a href="//devdocs.io">devdocs.io</a>, and everything will work as if you were online (provided you installed all the documentations you want to use beforehand). """ """ Yes! Even offline, you can open a new tab, go to <a href="//devdocs.io">devdocs.io</a>, and everything will work as if you were online (provided you installed all the documentations you want to use beforehand). """
else else
""" No. AppCache isn't available in your browser (or is disabled), so loading <a href="//devdocs.io">devdocs.io</a> offline won't work.<br> reason = "aren't available in your browser (or are disabled)"
if app.config.env != 'production'
reason = "are disabled in your development instance of DevDocs (enable them by setting the <code>ENABLE_SERVICE_WORKER</code> environment variable to <code>true</code>)"
""" No. Service Workers #{reason}, so loading <a href="//devdocs.io">devdocs.io</a> offline won't work.<br>
The current tab will continue to function even when you go offline (provided you installed all the documentations beforehand). """ The current tab will continue to function even when you go offline (provided you installed all the documentations beforehand). """
app.templates.offlineDoc = (doc, status) -> app.templates.offlineDoc = (doc, status) ->

@ -8,7 +8,7 @@ app.templates.intro = """
<p>Thanks for downloading DevDocs. Here are a few things you should know: <p>Thanks for downloading DevDocs. Here are a few things you should know:
<ol class="_intro-list"> <ol class="_intro-list">
<li>Your local version of DevDocs won't self-update. Unless you're modifying the code, <li>Your local version of DevDocs won't self-update. Unless you're modifying the code,
I&nbsp;recommend using the hosted version at <a href="https://devdocs.io">devdocs.io</a>. we&nbsp;recommend using the hosted version at <a href="https://devdocs.io">devdocs.io</a>.
<li>Run <code>thor docs:list</code> to see all available documentations. <li>Run <code>thor docs:list</code> to see all available documentations.
<li>Run <code>thor docs:download &lt;name&gt;</code> to download documentations. <li>Run <code>thor docs:download &lt;name&gt;</code> to download documentations.
<li>Run <code>thor docs:download --installed</code> to update all downloaded documentations. <li>Run <code>thor docs:download --installed</code> to update all downloaded documentations.
@ -39,7 +39,7 @@ app.templates.intro = """
<li>DevDocs works <a href="/offline">offline</a>, on mobile, and can be installed on <a href="https://chrome.google.com/webstore/detail/devdocs/mnfehgbmkapmjnhcnbodoamcioleeooe">Chrome</a>. <li>DevDocs works <a href="/offline">offline</a>, on mobile, and can be installed on <a href="https://chrome.google.com/webstore/detail/devdocs/mnfehgbmkapmjnhcnbodoamcioleeooe">Chrome</a>.
<li>For the latest news, follow <a href="https://twitter.com/DevDocs">@DevDocs</a>. <li>For the latest news, follow <a href="https://twitter.com/DevDocs">@DevDocs</a>.
<li>DevDocs is free and <a href="https://github.com/freeCodeCamp/devdocs">open source</a>. <li>DevDocs is free and <a href="https://github.com/freeCodeCamp/devdocs">open source</a>.
<iframe class="_github-btn" src="//ghbtns.com/github-btn.html?user=freeCodeCamp&repo=devdocs&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe> <object data="https://img.shields.io/github/stars/freeCodeCamp/devdocs.svg?style=social" type="image/svg+xml" aria-hidden="true"></object>
<li>And if you're new to coding, check out <a href="https://www.freecodecamp.org/">freeCodeCamp's open source curriculum</a>. <li>And if you're new to coding, check out <a href="https://www.freecodecamp.org/">freeCodeCamp's open source curriculum</a>.
</ol> </ol>
<p>Happy coding! <p>Happy coding!

@ -15,6 +15,14 @@ app.templates.settingsPage = (settings) -> """
<input type="checkbox" form="settings" name="layout" value="_sidebar-hidden"#{if settings['_sidebar-hidden'] then ' checked' else ''}>Automatically hide and show the sidebar <input type="checkbox" form="settings" name="layout" value="_sidebar-hidden"#{if settings['_sidebar-hidden'] then ' checked' else ''}>Automatically hide and show the sidebar
<small>Tip: drag the edge of the sidebar to resize it.</small> <small>Tip: drag the edge of the sidebar to resize it.</small>
</label> </label>
<label class="_settings-label">
<input type="checkbox" form="settings" name="autoInstall" value="_auto-install"#{if settings.autoInstall then ' checked' else ''}>Automatically download documentation for offline use
<small>Only enable this when bandwidth isn't a concern to you.</small>
</label>
<label class="_settings-label">
<input type="checkbox" form="settings" name="analyticsConsent"#{if settings.analyticsConsent then ' checked' else ''}>Enable tracking cookies
<small>With this checked, we enable Google Analytics and Gauges to collect anonymous traffic information.</small>
</label>
</div> </div>
</div> </div>

@ -1,28 +1,32 @@
try { try {
if (app.config.env == 'production') { if (app.config.env === 'production') {
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ if (Cookies.get('analyticsConsent') === '1') {
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
ga('create', 'UA-5544833-12', 'devdocs.io'); })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
page.track(function() { ga('create', 'UA-5544833-12', 'devdocs.io');
ga('send', 'pageview', { page.track(function() {
page: location.pathname + location.search + location.hash, ga('send', 'pageview', {
dimension1: app.router.context && app.router.context.doc && app.router.context.doc.slug_without_version page: location.pathname + location.search + location.hash,
dimension1: app.router.context && app.router.context.doc && app.router.context.doc.slug_without_version
});
}); });
});
page.track(function() { page.track(function() {
if (window._gauges) if (window._gauges)
_gauges.push(['track']); _gauges.push(['track']);
else else
(function() { (function() {
var _gauges=_gauges||[];!function(){var a=document.createElement("script"); var _gauges=_gauges||[];!function(){var a=document.createElement("script");
a.type="text/javascript",a.async=!0,a.id="gauges-tracker", a.type="text/javascript",a.async=!0,a.id="gauges-tracker",
a.setAttribute("data-site-id","51c15f82613f5d7819000067"), a.setAttribute("data-site-id","51c15f82613f5d7819000067"),
a.src="https://secure.gaug.es/track.js";var b=document.getElementsByTagName("script")[0]; a.src="https://secure.gaug.es/track.js";var b=document.getElementsByTagName("script")[0];
b.parentNode.insertBefore(a,b)}(); b.parentNode.insertBefore(a,b)}();
})(); })();
}); });
} else {
resetAnalytics();
}
} }
} catch(e) { } } catch(e) { }

@ -123,7 +123,7 @@ class app.views.EntryPage extends app.View
@render @tmpl('pageLoadError') @render @tmpl('pageLoadError')
@resetClass() @resetClass()
@addClass @constructor.errorClass @addClass @constructor.errorClass
app.appCache?.update() app.serviceWorker?.update()
return return
cache: -> cache: ->

@ -1,7 +1,4 @@
class app.views.SettingsPage extends app.View class app.views.SettingsPage extends app.View
LAYOUTS = ['_max-width', '_sidebar-hidden', '_native-scrollbars']
SIDEBAR_HIDDEN_LAYOUT = '_sidebar-hidden'
@className: '_static' @className: '_static'
@events: @events:
@ -17,31 +14,31 @@ class app.views.SettingsPage extends app.View
settings.dark = app.settings.get('dark') settings.dark = app.settings.get('dark')
settings.smoothScroll = !app.settings.get('fastScroll') settings.smoothScroll = !app.settings.get('fastScroll')
settings.arrowScroll = app.settings.get('arrowScroll') settings.arrowScroll = app.settings.get('arrowScroll')
settings[layout] = app.settings.hasLayout(layout) for layout in LAYOUTS settings.autoInstall = app.settings.get('autoInstall')
settings.analyticsConsent = app.settings.get('analyticsConsent')
settings[layout] = app.settings.hasLayout(layout) for layout in app.settings.LAYOUTS
settings settings
getTitle: -> getTitle: ->
'Preferences' 'Preferences'
toggleDark: (enable) -> toggleDark: (enable) ->
html = document.documentElement
html.classList.toggle('_theme-default')
html.classList.toggle('_theme-dark')
app.settings.set('dark', !!enable) app.settings.set('dark', !!enable)
app.appCache?.updateInBackground()
return return
toggleLayout: (layout, enable) -> toggleLayout: (layout, enable) ->
document.body.classList[if enable then 'add' else 'remove'](layout) unless layout is SIDEBAR_HIDDEN_LAYOUT
document.body.classList[if $.overlayScrollbarsEnabled() then 'add' else 'remove']('_overlay-scrollbars')
app.settings.setLayout(layout, enable) app.settings.setLayout(layout, enable)
app.appCache?.updateInBackground()
return return
toggleSmoothScroll: (enable) -> toggleSmoothScroll: (enable) ->
app.settings.set('fastScroll', !enable) app.settings.set('fastScroll', !enable)
return return
toggleAnalyticsConsent: (enable) ->
app.settings.set('analyticsConsent', if enable then '1' else '0')
resetAnalytics() unless enable
return
toggle: (name, enable) -> toggle: (name, enable) ->
app.settings.set(name, enable) app.settings.set(name, enable)
return return
@ -85,6 +82,8 @@ class app.views.SettingsPage extends app.View
@toggleSmoothScroll input.checked @toggleSmoothScroll input.checked
when 'import' when 'import'
@import input.files[0], input @import input.files[0], input
when 'analyticsConsent'
@toggleAnalyticsConsent input.checked
else else
@toggle input.name, input.checked @toggle input.name, input.checked
return return

@ -75,9 +75,11 @@ class app.views.Document extends app.View
return unless target.hasAttribute('data-behavior') return unless target.hasAttribute('data-behavior')
$.stopEvent(event) $.stopEvent(event)
switch target.getAttribute('data-behavior') switch target.getAttribute('data-behavior')
when 'back' then history.back() when 'back' then history.back()
when 'reload' then window.location.reload() when 'reload' then window.location.reload()
when 'reboot' then app.reboot() when 'reboot' then app.reboot()
when 'hard-reload' then app.reload() when 'hard-reload' then app.reload()
when 'reset' then app.reset() if confirm('Are you sure you want to reset DevDocs?') when 'reset' then app.reset() if confirm('Are you sure you want to reset DevDocs?')
when 'accept-analytics' then Cookies.set('analyticsConsent', '1') && app.reboot()
when 'decline-analytics' then Cookies.set('analyticsConsent', '0') && app.reboot()
return return

@ -11,9 +11,6 @@ class app.views.Resizer extends app.View
init: -> init: ->
@el.setAttribute('draggable', 'true') @el.setAttribute('draggable', 'true')
@appendTo $('._app') @appendTo $('._app')
@style = $('style[data-resizer]')
@size = @style.getAttribute('data-size')
return return
MIN = 260 MIN = 260
@ -24,15 +21,11 @@ class app.views.Resizer extends app.View
return unless value > 0 return unless value > 0
value = Math.min(Math.max(Math.round(value), MIN), MAX) value = Math.min(Math.max(Math.round(value), MIN), MAX)
newSize = "#{value}px" newSize = "#{value}px"
@style.innerHTML = @style.innerHTML.replace(new RegExp(@size, 'g'), newSize) document.documentElement.style.setProperty('--sidebarWidth', newSize)
@size = newSize app.settings.setSize(value) if save
if save
app.settings.setSize(value)
app.appCache?.updateInBackground()
return return
onDragStart: (event) => onDragStart: (event) =>
@style.removeAttribute('disabled')
event.dataTransfer.effectAllowed = 'link' event.dataTransfer.effectAllowed = 'link'
event.dataTransfer.setData('Text', '') event.dataTransfer.setData('Text', '')
$.on(window, 'dragover', @onDrag) $.on(window, 'dragover', @onDrag)

@ -25,7 +25,6 @@ class app.views.Settings extends app.View
if super if super
@render() @render()
document.body.classList.remove(SIDEBAR_HIDDEN_LAYOUT) document.body.classList.remove(SIDEBAR_HIDDEN_LAYOUT)
app.appCache?.on 'progress', @onAppCacheProgress
return return
deactivate: -> deactivate: ->
@ -33,7 +32,6 @@ class app.views.Settings extends app.View
@resetClass() @resetClass()
@docPicker.detach() @docPicker.detach()
document.body.classList.add(SIDEBAR_HIDDEN_LAYOUT) if app.settings.hasLayout(SIDEBAR_HIDDEN_LAYOUT) document.body.classList.add(SIDEBAR_HIDDEN_LAYOUT) if app.settings.hasLayout(SIDEBAR_HIDDEN_LAYOUT)
app.appCache?.off 'progress', @onAppCacheProgress
return return
render: -> render: ->
@ -52,7 +50,7 @@ class app.views.Settings extends app.View
docs = @docPicker.getSelectedDocs() docs = @docPicker.getSelectedDocs()
app.settings.setDocs(docs) app.settings.setDocs(docs)
@saveBtn.textContent = if app.appCache then 'Downloading\u2026' else 'Saving\u2026' @saveBtn.textContent = 'Saving\u2026'
disabledDocs = new app.collections.Docs(doc for doc in app.docs.all() when docs.indexOf(doc.slug) is -1) disabledDocs = new app.collections.Docs(doc for doc in app.docs.all() when docs.indexOf(doc.slug) is -1)
disabledDocs.uninstall -> disabledDocs.uninstall ->
app.db.migrate() app.db.migrate()
@ -83,9 +81,3 @@ class app.views.Settings extends app.View
$.stopEvent(event) $.stopEvent(event)
app.router.show '/' app.router.show '/'
return return
onAppCacheProgress: (event) =>
if event.lengthComputable
percentage = Math.round event.loaded * 100 / event.total
@saveBtn.textContent = "Downloading\u2026 (#{percentage}%)"
return

@ -30,6 +30,9 @@ class app.views.Search extends app.View
.on 'results', @onResults .on 'results', @onResults
.on 'end', @onEnd .on 'end', @onEnd
@scope
.on 'change', @onScopeChange
app.on 'ready', @onReady app.on 'ready', @onReady
$.on window, 'hashchange', @searchUrl $.on window, 'hashchange', @searchUrl
$.on window, 'focus', @onWindowFocus $.on window, 'focus', @onWindowFocus
@ -138,6 +141,11 @@ class app.views.Search extends app.View
$.stopEvent(event) $.stopEvent(event)
return return
onScopeChange: =>
@value = ''
@onInput()
return
afterRoute: (name, context) => afterRoute: (name, context) =>
return if app.shortcuts.eventInProgress?.name is 'escape' return if app.shortcuts.eventInProgress?.name is 'escape'
@reset(true) if not context.init and app.router.isIndex() @reset(true) if not context.init and app.router.isIndex()

@ -6,7 +6,9 @@ class app.views.SearchScope extends app.View
tag: '._search-tag' tag: '._search-tag'
@events: @events:
click: 'onClick'
keydown: 'onKeydown' keydown: 'onKeydown'
textInput: 'onTextInput'
@routes: @routes:
after: 'afterRoute' after: 'afterRoute'
@ -87,17 +89,33 @@ class app.views.SearchScope extends app.View
@trigger 'change', null, previousDoc @trigger 'change', null, previousDoc
return return
doScopeSearch: (event) =>
@search @input.value[0...@input.selectionStart]
$.stopEvent(event) if @doc
return
onClick: (event) =>
if event.target is @tag
@reset()
$.stopEvent(event)
return
onKeydown: (event) => onKeydown: (event) =>
if event.which is 8 # backspace if event.which is 8 # backspace
if @doc and not @input.value if @doc and @input.selectionEnd is 0
$.stopEvent(event)
@reset() @reset()
else if not @doc and @input.value $.stopEvent(event)
else if not @doc and @input.value and not $.isChromeForAndroid()
return if event.ctrlKey or event.metaKey or event.altKey or event.shiftKey return if event.ctrlKey or event.metaKey or event.altKey or event.shiftKey
if event.which is 9 or # tab if event.which is 9 or # tab
(event.which is 32 and app.isMobile()) # space (event.which is 32 and app.isMobile()) # space
@search @input.value[0...@input.selectionStart] @doScopeSearch(event)
$.stopEvent(event) if @doc return
onTextInput: (event) =>
return unless $.isChromeForAndroid()
if not @doc and @input.value and event.data == ' '
@doScopeSearch(event)
return return
extractHashValue: -> extractHashValue: ->

@ -28,7 +28,7 @@ class app.views.Sidebar extends app.View
app.on 'ready', @onReady app.on 'ready', @onReady
$.on document.documentElement, 'mouseleave', (event) => @display() if event.clientX < 10 $.on document.documentElement, 'mouseleave', (event) => @display() unless event.clientX <= 0
$.on document.documentElement, 'mouseenter', => @resetDisplay(forceNoHover: false) $.on document.documentElement, 'mouseenter', => @resetDisplay(forceNoHover: false)
return return

@ -1,7 +1,6 @@
//= depend_on docs-1.png //= depend_on sprites/docs.png
//= depend_on docs-1@2x.png //= depend_on sprites/docs@2x.png
//= depend_on docs-2.png //= depend_on sprites/docs.json
//= depend_on docs-2@2x.png
/*! /*!
* Copyright 2013-2019 Thibaut Courouble and other contributors * Copyright 2013-2019 Thibaut Courouble and other contributors

@ -215,5 +215,6 @@
color: var(--textColorLight); color: var(--textColorLight);
background: var(--searchTagBackground); background: var(--searchTagBackground);
border-radius: 2px; border-radius: 2px;
cursor: pointer;
@extend %truncate-text; @extend %truncate-text;
} }

@ -134,3 +134,7 @@
._notif-info { color: var(--textColorLight); } ._notif-info { color: var(--textColorLight); }
} }
._notif-right {
float: right;
}

@ -1,182 +0,0 @@
%svg-icon {
display: inline-block;
vertical-align: top;
width: 1rem;
height: 1rem;
pointer-events: none;
fill: currentColor;
}
%doc-icon {
content: '';
display: block;
width: 1rem;
height: 1rem;
background-image: image-url('docs-1.png');
background-size: 10rem 10rem;
}
%doc-icon-2 { background-image: image-url('docs-2.png') !important; }
@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
%doc-icon { background-image: image-url('docs-1@2x.png'); }
%doc-icon-2 { background-image: image-url('docs-2@2x.png') !important; }
}
html._theme-dark {
%darkIconFix {
filter: invert(100%) grayscale(100%);
-webkit-filter: invert(100%) grayscale(100%);
}
}
._icon-jest:before { background-position: 0 0; }
._icon-liquid:before { background-position: -1rem 0; }
._icon-openjdk:before { background-position: -2rem 0; }
._icon-codeceptjs:before { background-position: -3rem 0; }
._icon-codeception:before { background-position: -4rem 0; }
._icon-sqlite:before { background-position: -5rem 0; @extend %darkIconFix !optional; }
._icon-async:before { background-position: -6rem 0; @extend %darkIconFix !optional; }
._icon-http:before { background-position: -7rem 0; @extend %darkIconFix !optional; }
._icon-jquery:before { background-position: -8rem 0; @extend %darkIconFix !optional; }
._icon-underscore:before { background-position: -9rem 0; @extend %darkIconFix !optional; }
._icon-html:before { background-position: 0 -1rem; }
._icon-css:before { background-position: -1rem -1rem; }
._icon-dom:before { background-position: -2rem -1rem; }
._icon-dom_events:before { background-position: -3rem -1rem; }
._icon-javascript:before { background-position: -4rem -1rem; }
._icon-backbone:before { background-position: -5rem -1rem; @extend %darkIconFix !optional; }
._icon-node:before,
._icon-node_lts:before { background-position: -6rem -1rem; }
._icon-sass:before { background-position: -7rem -1rem; }
._icon-less:before { background-position: -8rem -1rem; }
._icon-angularjs:before { background-position: -9rem -1rem; }
._icon-coffeescript:before { background-position: 0 -2rem; @extend %darkIconFix !optional; }
._icon-ember:before { background-position: -1rem -2rem; }
._icon-yarn:before { background-position: -2rem -2rem; }
._icon-immutable:before { background-position: -3rem -2rem; @extend %darkIconFix !optional; }
._icon-jqueryui:before { background-position: -4rem -2rem; }
._icon-jquerymobile:before { background-position: -5rem -2rem; }
._icon-lodash:before { background-position: -6rem -2rem; }
._icon-php:before { background-position: -7rem -2rem; }
._icon-ruby:before,
._icon-minitest:before { background-position: -8rem -2rem; }
._icon-rails:before { background-position: -9rem -2rem; }
._icon-python:before,
._icon-python2:before { background-position: 0 -3rem; }
._icon-git:before { background-position: -1rem -3rem; }
._icon-redis:before { background-position: -2rem -3rem; }
._icon-postgresql:before { background-position: -3rem -3rem; }
._icon-d3:before { background-position: -4rem -3rem; }
._icon-knockout:before { background-position: -5rem -3rem; }
._icon-moment:before { background-position: -6rem -3rem; @extend %darkIconFix !optional; }
._icon-c:before { background-position: -7rem -3rem; }
._icon-statsmodels:before { background-position: -8rem -3rem; }
._icon-yii:before,
._icon-yii1:before { background-position: -9rem -3rem; }
._icon-cpp:before { background-position: 0 -4rem; }
._icon-go:before { background-position: -1rem -4rem; }
._icon-express:before { background-position: -2rem -4rem; }
._icon-grunt:before { background-position: -3rem -4rem; }
._icon-rust:before { background-position: -4rem -4rem; @extend %darkIconFix !optional; }
._icon-laravel:before { background-position: -5rem -4rem; }
._icon-haskell:before { background-position: -6rem -4rem; }
._icon-requirejs:before { background-position: -7rem -4rem; }
._icon-chai:before { background-position: -8rem -4rem; }
._icon-sinon:before { background-position: -9rem -4rem; }
._icon-cordova:before { background-position: 0 -5rem; }
._icon-markdown:before { background-position: -1rem -5rem; @extend %darkIconFix !optional; }
._icon-django:before { background-position: -2rem -5rem; }
._icon-xslt_xpath:before { background-position: -3rem -5rem; }
._icon-nginx:before,
._icon-nginx_lua_module:before { background-position: -4rem -5rem; }
._icon-svg:before { background-position: -5rem -5rem; }
._icon-marionette:before { background-position: -6rem -5rem; }
._icon-jsdoc:before,
._icon-koa:before,
._icon-graphite:before,
._icon-mongoose:before { background-position: -7rem -5rem; }
._icon-phpunit:before { background-position: -8rem -5rem; }
._icon-nokogiri:before { background-position: -9rem -5rem; @extend %darkIconFix !optional; }
._icon-rethinkdb:before { background-position: 0 -6rem; }
._icon-react:before { background-position: -1rem -6rem; }
._icon-socketio:before { background-position: -2rem -6rem; }
._icon-modernizr:before { background-position: -3rem -6rem; }
._icon-bower:before { background-position: -4rem -6rem; }
._icon-fish:before { background-position: -5rem -6rem; @extend %darkIconFix !optional; }
._icon-scikit_image:before { background-position: -6rem -6rem; }
._icon-twig:before { background-position: -7rem -6rem; }
._icon-pandas:before { background-position: -8rem -6rem; }
._icon-scikit_learn:before { background-position: -9rem -6rem; }
._icon-bottle:before { background-position: 0 -7rem; }
._icon-docker:before { background-position: -1rem -7rem; }
._icon-cakephp:before { background-position: -2rem -7rem; }
._icon-lua:before { background-position: -3rem -7rem; @extend %darkIconFix !optional; }
._icon-clojure:before { background-position: -4rem -7rem; }
._icon-symfony:before { background-position: -5rem -7rem; }
._icon-mocha:before { background-position: -6rem -7rem; }
._icon-meteor:before { background-position: -7rem -7rem; @extend %darkIconFix !optional; }
._icon-npm:before { background-position: -8rem -7rem; }
._icon-apache_http_server:before { background-position: -9rem -7rem; }
._icon-drupal:before { background-position: 0 -8rem; }
._icon-webpack:before { background-position: -1rem -8rem; }
._icon-phaser:before { background-position: -2rem -8rem; }
._icon-vue:before { background-position: -3rem -8rem; }
._icon-opentsdb:before { background-position: -4rem -8rem; }
._icon-q:before { background-position: -5rem -8rem; }
._icon-crystal:before { background-position: -6rem -8rem; @extend %darkIconFix !optional; }
._icon-julia:before { background-position: -7rem -8rem; @extend %darkIconFix !optional; }
._icon-redux:before { background-position: -8rem -8rem; @extend %darkIconFix !optional; }
._icon-bootstrap:before { background-position: -9rem -8rem; }
._icon-react_native:before { background-position: 0 -9rem; }
._icon-phalcon:before { background-position: -1rem -9rem; }
._icon-matplotlib:before { background-position: -2rem -9rem; }
._icon-cmake:before { background-position: -3rem -9rem; }
._icon-elixir:before { background-position: -4rem -9rem; @extend %darkIconFix !optional; }
._icon-vagrant:before { background-position: -5rem -9rem; }
._icon-dojo:before { background-position: -6rem -9rem; }
._icon-flow:before { background-position: -7rem -9rem; }
._icon-relay:before { background-position: -8rem -9rem; }
._icon-phoenix:before { background-position: -9rem -9rem; }
._icon-tcl_tk:before { background-position: 0 0; @extend %doc-icon-2; }
._icon-erlang:before { background-position: -1rem 0; @extend %doc-icon-2; }
._icon-chef:before { background-position: -2rem 0; @extend %doc-icon-2; }
._icon-ramda:before { background-position: -3rem 0; @extend %doc-icon-2; @extend %darkIconFix !optional; }
._icon-codeigniter:before { background-position: -4rem 0; @extend %doc-icon-2; @extend %darkIconFix !optional; }
._icon-influxdata:before { background-position: -5rem 0; @extend %doc-icon-2; @extend %darkIconFix !optional; }
._icon-tensorflow:before { background-position: -6rem 0; @extend %doc-icon-2; }
._icon-haxe:before { background-position: -7rem 0; @extend %doc-icon-2; }
._icon-ansible:before { background-position: -8rem 0; @extend %doc-icon-2; @extend %darkIconFix !optional; }
._icon-typescript:before { background-position: -9rem 0; @extend %doc-icon-2; }
._icon-browser_support_tables:before { background-position: 0rem -1rem; @extend %doc-icon-2; }
._icon-gnu_fortran:before { background-position: -1rem -1rem; @extend %doc-icon-2; }
._icon-gcc:before { background-position: -2rem -1rem; @extend %doc-icon-2; }
._icon-perl:before { background-position: -3rem -1rem; @extend %doc-icon-2; }
._icon-apache_pig:before { background-position: -4rem -1rem; @extend %doc-icon-2; }
._icon-numpy:before { background-position: -5rem -1rem; @extend %doc-icon-2; }
._icon-kotlin:before { background-position: -6rem -1rem; @extend %doc-icon-2; }
._icon-padrino:before { background-position: -7rem -1rem; @extend %doc-icon-2; }
._icon-angular:before { background-position: -8rem -1rem; @extend %doc-icon-2; }
._icon-love:before { background-position: -9rem -1rem; @extend %doc-icon-2; }
._icon-jasmine:before { background-position: 0 -2rem; @extend %doc-icon-2; }
._icon-pug:before { background-position: -1rem -2rem; @extend %doc-icon-2; }
._icon-electron:before { background-position: -2rem -2rem; @extend %doc-icon-2; }
._icon-falcon:before { background-position: -3rem -2rem; @extend %doc-icon-2; }
._icon-godot:before { background-position: -4rem -2rem; @extend %doc-icon-2; }
._icon-nim:before { background-position: -5rem -2rem; @extend %doc-icon-2; @extend %darkIconFix !optional; }
._icon-vulkan:before { background-position: -6rem -2rem; @extend %doc-icon-2; @extend %darkIconFix !optional; }
._icon-d:before { background-position: -7rem -2rem; @extend %doc-icon-2; }
._icon-bluebird:before { background-position: -8rem -2rem; @extend %doc-icon-2; }
._icon-eslint:before { background-position: -9rem -2rem; @extend %doc-icon-2; }
._icon-homebrew:before { background-position: 0 -3rem; @extend %doc-icon-2; }
._icon-jekyll:before { background-position: -1rem -3rem; @extend %doc-icon-2; }
._icon-babel:before { background-position: -2rem -3rem; @extend %doc-icon-2; }
._icon-leaflet:before { background-position: -3rem -3rem; @extend %doc-icon-2; }
._icon-terraform:before { background-position: -4rem -3rem; @extend %doc-icon-2; }
._icon-pygame:before { background-position: -5rem -3rem; @extend %doc-icon-2; }
._icon-bash:before { background-position: -6rem -3rem; @extend %doc-icon-2; }
._icon-dart:before { background-position: -7rem -3rem; @extend %doc-icon-2; }
._icon-qt:before { background-position: -8rem -3rem; @extend %doc-icon-2; }
._icon-puppeteer:before { background-position: -9rem -3rem; @extend %doc-icon-2; }
._icon-handlebars:before { background-position: 0 -4rem; @extend %doc-icon-2; @extend %darkIconFix !optional; }

@ -0,0 +1,43 @@
<% manifest = JSON.parse(File.read('assets/images/sprites/docs.json')) %>
%svg-icon {
display: inline-block;
vertical-align: top;
width: 1rem;
height: 1rem;
pointer-events: none;
fill: currentColor;
}
%doc-icon {
content: '';
display: block;
width: 1rem;
height: 1rem;
background-image: image-url('sprites/docs.png');
background-size: <%= manifest['icons_per_row'] %>rem <%= manifest['icons_per_row'] %>rem;
}
@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
%doc-icon { background-image: image-url('sprites/docs@2x.png'); }
}
html._theme-dark {
%darkIconFix {
filter: invert(100%) grayscale(100%);
-webkit-filter: invert(100%) grayscale(100%);
}
}
<%=
items = []
manifest['items'].each do |item|
rules = []
rules << "background-position: -#{item['col']}rem -#{item['row']}rem;"
rules << "@extend %darkIconFix !optional;" if item['dark_icon_fix']
items << "._icon-#{item['type']}:before { #{rules.join(' ')} }"
end
items.join('')
%>

@ -21,8 +21,7 @@ The process for updating docs is as follow:
- Commit the changes (protip: use the `thor docs:commit` command documented below). - Commit the changes (protip: use the `thor docs:commit` command documented below).
- Optional: do more updates. - Optional: do more updates.
- Run `thor docs:upload` (documented below). - Run `thor docs:upload` (documented below).
- [Deploy the app](#deploying-devdocs) and verify that everything works in production. - Push to GitHub to [deploy the app](#deploying-devdocs) and verify that everything works in production.
- Push to GitHub.
- Run `thor docs:clean` (documented below). - Run `thor docs:clean` (documented below).
Note: changes to `public/docs/docs.json` should never be committed. This file reflects which documentations have been downloaded or generated locally, which is always none on a fresh `git clone`. Note: changes to `public/docs/docs.json` should never be committed. This file reflects which documentations have been downloaded or generated locally, which is always none on a fresh `git clone`.
@ -82,13 +81,13 @@ In addition to the [publicly-documented commands](https://github.com/freeCodeCam
## Deploying DevDocs ## Deploying DevDocs
Once docs have been uploaded via `thor docs:upload` (if applicable), deploying DevDocs is as simple as running `git push heroku master`. See [Heroku's documentation](https://devcenter.heroku.com/articles/git) for more information. Once docs have been uploaded via `thor docs:upload` (if applicable), you can push to the DevDocs master branch (or merge the PR containing the updates). If the Travis build succeeds, the Heroku application will be deployed automatically.
- If you're deploying documentation updates, verify that the documentations work properly once the deploy is done (you will need to reload [devdocs.io](https://devdocs.io/) a couple times for the application cache to update and the new version to load). - If you're deploying documentation updates, verify that the documentations work properly once the deploy is done. Keep in mind that you'll need to wait a few seconds for the service worker to finish caching the new assets. You should see a "DevDocs has been updated" notification appear when the caching is done, after which you need to refresh the page to see the changes.
- If you're deploying frontend changes, monitor [Sentry](https://sentry.io/devdocs/devdocs-js/) for new JS errors once the deploy is done. - If you're deploying frontend changes, monitor [Sentry](https://sentry.io/devdocs/devdocs-js/) for new JS errors once the deploy is done.
- If you're deploying server changes, monitor New Relic (accessible through [the Heroku dashboard](https://dashboard.heroku.com/apps/devdocs)) for Ruby exceptions and throughput or response time changes once the deploy is done. - If you're deploying server changes, monitor New Relic (accessible through [the Heroku dashboard](https://dashboard.heroku.com/apps/devdocs)) for Ruby exceptions and throughput or response time changes once the deploy is done.
If any issue arises, run `heroku rollback` to rollback to the previous of the app (this can also be done via Heroku's UI). Note that this will not revert changes made to documentation files that were uploaded via `thor docs:upload`. Try and fix the issue as quickly as possible, then re-deploy the app. Reach out to other maintainers if you need help. If any issue arises, run `heroku rollback` to rollback to the previous version of the app (this can also be done via Heroku's UI). Note that this will not revert changes made to documentation files that were uploaded via `thor docs:upload`. Try and fix the issue as quickly as possible, then re-deploy the app. Reach out to other maintainers if you need help.
If this is your first deploy, make sure another maintainer is around to assist. If this is your first deploy, make sure another maintainer is around to assist.

@ -37,6 +37,9 @@ class App < Sinatra::Application
set :csp, false set :csp, false
require 'docs'
Docs.generate_manifest
Dir[docs_path, root.join(assets_prefix, '*/')].each do |path| Dir[docs_path, root.join(assets_prefix, '*/')].each do |path|
sprockets.append_path(path) sprockets.append_path(path)
end end
@ -50,6 +53,11 @@ class App < Sinatra::Application
end end
configure :test, :development do configure :test, :development do
require 'thor'
load 'tasks/sprites.thor'
SpritesCLI.new.invoke(:generate)
require 'active_support/per_thread_registry' require 'active_support/per_thread_registry'
require 'active_support/cache' require 'active_support/cache'
sprockets.cache = ActiveSupport::Cache.lookup_store :file_store, root.join('tmp', 'cache', 'assets', environment.to_s) sprockets.cache = ActiveSupport::Cache.lookup_store :file_store, root.join('tmp', 'cache', 'assets', environment.to_s)
@ -192,35 +200,45 @@ class App < Sinatra::Application
request.query_string.empty? ? nil : "?#{request.query_string}" request.query_string.empty? ? nil : "?#{request.query_string}"
end end
def manifest_asset_urls def service_worker_asset_urls
@@manifest_asset_urls ||= [ @@service_worker_asset_urls ||= [
javascript_path('application', asset_host: false), javascript_path('application', asset_host: false),
stylesheet_path('application'), stylesheet_path('application'),
image_path('docs-1.png'), image_path('sprites/docs.png'),
image_path('docs-1@2x.png'), image_path('sprites/docs@2x.png'),
image_path('docs-2.png'), asset_path('docs.js'),
image_path('docs-2@2x.png'), App.production? ? nil : javascript_path('debug'),
asset_path('docs.js') ].compact
]
end end
def app_size # Returns a cache name for the service worker to use which changes if any of the assets changes
@app_size ||= memoized_cookies['size'].nil? ? '20rem' : "#{memoized_cookies['size']}px" # When a manifest exist, this name is only created once based on the asset manifest because it never changes without a server restart
end # If a manifest does not exist, it is created every time this method is called because the assets can change while the server is running
def service_worker_cache_name
if File.exist?(App.assets_manifest_path)
if defined?(@@service_worker_cache_name)
return @@service_worker_cache_name
end
def app_layout digest = Sprockets::Manifest
memoized_cookies['layout'] .new(nil, App.assets_manifest_path)
end .files
.values
.map {|file| file["digest"]}
.join
def app_theme return @@service_worker_cache_name ||= Digest::MD5.hexdigest(digest)
@app_theme ||= memoized_cookies['dark'].nil? ? 'default' : 'dark' else
end paths = App.sprockets
.each_file
.to_a
.reject {|file| file.start_with?(App.docs_path)}
def dark_theme? return App.sprockets.pack_hexdigest(App.sprockets.files_digest(paths))
app_theme == 'dark' end
end end
def redirect_via_js(path) # courtesy of HTML5 App Cache def redirect_via_js(path)
response.set_cookie :initial_path, value: path, expires: Time.now + 15, path: '/' response.set_cookie :initial_path, value: path, expires: Time.now + 15, path: '/'
redirect '/', 302 redirect '/', 302
end end
@ -243,15 +261,15 @@ class App < Sinatra::Application
end end
end end
get '/manifest.appcache' do get '/service-worker.js' do
content_type 'text/cache-manifest' content_type 'application/javascript'
expires 0, :'no-cache' expires 0, :'no-cache'
erb :manifest erb :'service-worker.js'
end end
get '/' do get '/' do
return redirect "/#q=#{params[:q]}" if params[:q] return redirect "/#q=#{params[:q]}" if params[:q]
return redirect '/' unless request.query_string.empty? # courtesy of HTML5 App Cache return redirect '/' unless request.query_string.empty?
response.headers['Content-Security-Policy'] = settings.csp if settings.csp response.headers['Content-Security-Policy'] = settings.csp if settings.csp
erb :index erb :index
end end

@ -29,7 +29,7 @@ module Docs
def request_one(url) def request_one(url)
assert_source_directory_exists assert_source_directory_exists
Response.new read_file(url_to_path(url)), URL.parse(url) Response.new read_file(File.join(source_directory, url_to_path(url))), URL.parse(url)
end end
def request_all(urls) def request_all(urls)
@ -50,7 +50,7 @@ module Docs
end end
def read_file(path) def read_file(path)
File.read(File.join(source_directory, path)) File.read(path)
rescue rescue
instrument 'warn.doc', msg: "Failed to open file: #{path}" instrument 'warn.doc', msg: "Failed to open file: #{path}"
nil nil

@ -14,6 +14,9 @@ class AssetsCLI < Thor
option :keep, type: :numeric, default: 0, desc: 'Number of old assets to keep' option :keep, type: :numeric, default: 0, desc: 'Number of old assets to keep'
option :verbose, type: :boolean option :verbose, type: :boolean
def compile def compile
load 'tasks/sprites.thor'
invoke 'sprites:generate', [], :remove_public_icons => true, :verbose => options[:verbose]
manifest.compile App.assets_compile manifest.compile App.assets_compile
manifest.clean(options[:keep]) if options[:clean] manifest.clean(options[:keep]) if options[:clean]
end end

@ -0,0 +1,211 @@
class SpritesCLI < Thor
def self.to_s
'Sprites'
end
def initialize(*args)
require 'docs'
require 'chunky_png'
require 'fileutils'
super
end
desc 'generate [--remove-public-icons] [--verbose]', 'Generate the documentation icon spritesheets'
option :remove_public_icons, type: :boolean, desc: 'Remove public/icons after generating the spritesheets'
option :verbose, type: :boolean
def generate
items = get_items
items_with_icons = items.select {|item| item[:has_icons]}
items_without_icons = items.select {|item| !item[:has_icons]}
icons_per_row = Math.sqrt(items_with_icons.length).ceil
bg_color = get_sidebar_background
items_with_icons.each_with_index do |item, index|
item[:row] = (index / icons_per_row).floor
item[:col] = index - item[:row] * icons_per_row
item[:icon_16] = get_icon(item[:path_16], 16)
item[:icon_32] = get_icon(item[:path_32], 32)
item[:dark_icon_fix] = needs_dark_icon_fix(item[:icon_32], bg_color)
end
log_details(items_with_icons, icons_per_row)
generate_spritesheet(16, items_with_icons, 'assets/images/sprites/docs.png') {|item| item[:icon_16]}
generate_spritesheet(32, items_with_icons, 'assets/images/sprites/docs@2x.png') {|item| item[:icon_32]}
# Add Mongoose's icon details to docs without custom icons
default_item = items_with_icons.find {|item| item[:type] == 'mongoose'}
items_without_icons.each do |item|
item[:row] = default_item[:row]
item[:col] = default_item[:col]
item[:dark_icon_fix] = default_item[:dark_icon_fix]
end
save_manifest(items, icons_per_row, 'assets/images/sprites/docs.json')
if options[:remove_public_icons]
logger.info('Removing public/icons')
FileUtils.rm_rf('public/icons')
end
end
private
def get_items
items = Docs.all.map do |doc|
base_path = "public/icons/docs/#{doc.slug}"
{
:type => doc.slug,
:path_16 => "#{base_path}/16.png",
:path_32 => "#{base_path}/16@2x.png"
}
end
# Checking paths against an array of possible paths is faster than 200+ File.exist? calls
files = Dir.glob('public/icons/docs/**/*.png')
items.each do |item|
item[:has_icons] = files.include?(item[:path_16]) && files.include?(item[:path_32])
end
end
def get_icon(path, max_size)
icon = ChunkyPNG::Image.from_file(path)
# Check if the icon is too big
# If it is, resize the image without changing the aspect ratio
if icon.width > max_size || icon.height > max_size
ratio = icon.width.to_f / icon.height
new_width = (icon.width >= icon.height ? max_size : max_size * ratio).floor
new_height = (icon.width >= icon.height ? max_size / ratio : max_size).floor
logger.warn("Icon #{path} is too big: max size is #{max_size} x #{max_size}, icon is #{icon.width} x #{icon.height}, resizing to #{new_width} x #{new_height}")
icon.resample_nearest_neighbor!(new_width, new_height)
end
icon
end
def get_sidebar_background
# This is a hacky way to get the background color of the sidebar
# Unfortunately, it's not possible to get the value of a SCSS variable from a Thor task
# Because hard-coding the value is even worse, we extract it using some regex
path = 'assets/stylesheets/global/_variables-dark.scss'
regex = /--sidebarBackground:\s+([^;]+);/
ChunkyPNG::Color.parse(File.read(path)[regex, 1])
end
def needs_dark_icon_fix(icon, bg_color)
# Determine whether the icon needs to be grayscaled if the user has enabled the dark theme
# The logic is roughly based on https://www.w3.org/TR/2008/REC-WCAG20-20081211/#visual-audio-contrast
contrast = icon.pixels.select {|pixel| ChunkyPNG::Color.a(pixel) > 0}.map do |pixel|
get_contrast(bg_color, pixel)
end
avg = contrast.reduce(:+) / contrast.size.to_f
avg < 3.5
end
def get_contrast(base, other)
# Calculating the contrast ratio as described in the WCAG 2.0:
# https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
l1 = get_luminance(base) + 0.05
l2 = get_luminance(other) + 0.05
ratio = l1 / l2
l2 > l1 ? 1 / ratio : ratio
end
def get_luminance(color)
rgb = [
ChunkyPNG::Color.r(color).to_f,
ChunkyPNG::Color.g(color).to_f,
ChunkyPNG::Color.b(color).to_f
]
# Calculating the relative luminance as described in the WCAG 2.0:
# https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
rgb.map! do |value|
value /= 255
value < 0.03928 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4
end
0.2126 * rgb[0] + 0.7152 * rgb[1] + 0.0722 * rgb[2]
end
def generate_spritesheet(size, items_with_icons, output_path, &item_to_icon)
logger.info("Generating spritesheet #{output_path} with icons of size #{size} x #{size}")
icons_per_row = Math.sqrt(items_with_icons.length).ceil
spritesheet = ChunkyPNG::Image.new(size * icons_per_row, size * icons_per_row)
items_with_icons.each do |item|
icon = item_to_icon.call(item)
# Calculate the base coordinates
base_x = item[:col] * size
base_y = item[:row] * size
# Center the icon if it's not a perfect rectangle
x = base_x + ((size - icon.width) / 2).floor
y = base_y + ((size - icon.height) / 2).floor
spritesheet.compose!(icon, x, y)
end
FileUtils.mkdir_p(File.dirname(output_path))
spritesheet.save(output_path)
end
def save_manifest(items, icons_per_row, path)
logger.info("Saving spritesheet details to #{path}")
FileUtils.mkdir_p(File.dirname(path))
# Only save the details that the scss file needs
manifest_items = items.map do |item|
{
:type => item[:type],
:row => item[:row],
:col => item[:col],
:dark_icon_fix => item[:dark_icon_fix]
}
end
manifest = {:icons_per_row => icons_per_row, :items => manifest_items}
File.open(path, 'w') do |f|
f.write(JSON.generate(manifest))
end
end
def log_details(items_with_icons, icons_per_row)
logger.debug("Amount of icons: #{items_with_icons.length}")
logger.debug("Amount of icons needing the dark icon fix: #{items_with_icons.count {|item| item[:dark_icon_fix]}}")
logger.debug("Amount of icons per row: #{icons_per_row}")
max_type_length = items_with_icons.map {|item| item[:type].length}.max
border = "+#{'-' * (max_type_length + 2)}+#{'-' * 5}+#{'-' * 8}+#{'-' * 15}+"
logger.debug(border)
logger.debug("| #{'Type'.ljust(max_type_length)} | Row | Column | Dark icon fix |")
logger.debug(border)
items_with_icons.each do |item|
logger.debug("| #{item[:type].ljust(max_type_length)} | #{item[:row].to_s.ljust(3)} | #{item[:col].to_s.ljust(6)} | #{(item[:dark_icon_fix] ? 'Yes' : 'No').ljust(13)} |")
end
logger.debug(border)
end
def logger
@logger ||= Logger.new($stdout).tap do |logger|
logger.level = options[:verbose] ? Logger::DEBUG : Logger::INFO
logger.formatter = proc {|severity, datetime, progname, msg| "#{msg}\n"}
end
end
end

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1018 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

@ -4,6 +4,7 @@
"description": "API Documentation Browser", "description": "API Documentation Browser",
"start_url": "/", "start_url": "/",
"display": "standalone", "display": "standalone",
"background_color": "#EEEEEE",
"icons": [ "icons": [
{ {
"src": "/images/webapp-icon-32.png", "src": "/images/webapp-icon-32.png",
@ -25,6 +26,11 @@
"sizes": "128x128", "sizes": "128x128",
"type": "image/png" "type": "image/png"
}, },
{
"src": "/images/webapp-icon-192.png",
"sizes": "192x192",
"type": "image/png"
},
{ {
"src": "/images/webapp-icon-256.png", "src": "/images/webapp-icon-256.png",
"sizes": "256x256", "sizes": "256x256",

@ -43,35 +43,6 @@ class AppTest < MiniTest::Spec
assert last_response.redirect? assert last_response.redirect?
assert_equal 'https://example.org/', last_response['Location'] assert_equal 'https://example.org/', last_response['Location']
end end
it "sets default size" do
get '/'
assert_includes last_response.body, 'data-size="20rem"'
end
it "sets size from cookie" do
set_cookie('size=42')
get '/'
assert_includes last_response.body, 'data-size="42px"'
end
it "sets layout from cookie" do
set_cookie('layout=foo')
get '/'
assert_includes last_response.body, '<body class="foo">'
end
it "sets the <html> theme from cookie" do
get '/'
assert_match %r{<html [^>]*class="[^\"]*_theme-default}, last_response.body
refute_includes last_response.body, '_theme-dark'
set_cookie('dark=1')
get '/'
assert_match %r{<html [^>]*class="[^\"]*_theme-dark}, last_response.body
refute_includes last_response.body, '_theme-default'
end
end end
describe "/[static-page]" do describe "/[static-page]" do
@ -106,58 +77,6 @@ class AppTest < MiniTest::Spec
end end
end end
describe "/manifest.appcache" do
it "works" do
get '/manifest.appcache'
assert last_response.ok?
end
it "works with cookie" do
set_cookie('docs=css/html~5')
get '/manifest.appcache'
assert last_response.ok?
assert_includes last_response.body, '/css/index.json?1420139788'
assert_includes last_response.body, '/html~5/index.json?1420139791'
end
it "ignores invalid docs in the cookie" do
set_cookie('docs=foo')
get '/manifest.appcache'
assert last_response.ok?
refute_includes last_response.body, 'foo'
end
it "has the word 'default' when no 'dark' cookie is set" do
get '/manifest.appcache'
assert_includes last_response.body, '# default'
refute_includes last_response.body, '# dark'
end
it "has the word 'dark' when the cookie is set" do
set_cookie('dark=1')
get '/manifest.appcache'
assert_includes last_response.body, '# dark'
refute_includes last_response.body, '# default'
end
it "sets default size" do
get '/manifest.appcache'
assert_includes last_response.body, '20rem'
end
it "sets size from cookie" do
set_cookie('size=42')
get '/manifest.appcache'
assert_includes last_response.body, '42px'
end
it "sets layout from cookie" do
set_cookie('layout=foo_layout')
get '/manifest.appcache'
assert_includes last_response.body, 'foo_layout'
end
end
describe "/[doc]" do describe "/[doc]" do
it "renders when the doc exists and isn't enabled" do it "renders when the doc exists and isn't enabled" do
set_cookie('docs=html~5') set_cookie('docs=html~5')

@ -63,7 +63,7 @@ class FileScraperTest < MiniTest::Spec
end end
it "reads a file" do it "reads a file" do
mock(scraper).read_file(path) mock(scraper).read_file(File.join(ROOT_PATH, 'docs/scraper', path))
result result
end end
@ -165,7 +165,7 @@ class FileScraperTest < MiniTest::Spec
describe "#read_file" do describe "#read_file" do
let :result do let :result do
scraper.send :read_file, 'file' scraper.send :read_file, File.join(ROOT_PATH, 'docs', 'scraper', 'file')
end end
it "returns the file's content when the file exists in the source directory" do it "returns the file's content when the file exists in the source directory" do

@ -28,13 +28,7 @@
</nav> </nav>
</header> </header>
<section class="_sidebar" tabindex="-1"> <section class="_sidebar" tabindex="-1">
<div class="_list" role="navigation"> <div class="_list" role="navigation"></div>
<% unless @doc %>
<% App.docs.each do |slug, doc| %>
<a href="/<%= slug %>/" class="_list-item"><%= doc['full_name'] %></a>
<% end %>
<% end %>
</div>
</section> </section>
<div class="_container" role="document"> <div class="_container" role="document">
<main class="_content _content-loading" role="main"></main> <main class="_content _content-loading" role="main"></main>
@ -63,9 +57,3 @@
<symbol id="icon-external-link" viewBox="0 0 24 24"><path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/></symbol> <symbol id="icon-external-link" viewBox="0 0 24 24"><path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/></symbol>
</defs> </defs>
</svg> </svg>
<style data-size="<%= app_size %>" data-resizer>
._container { margin-left: <%= app_size %>; }
._header, ._list { width: <%= app_size %>; }
._list-hover.clone { min-width: <%= app_size %>; }
._notice, ._path, ._resizer { left: <%= app_size %>; }
</style>

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html<%= ' manifest="/manifest.appcache"' if App.production? %> prefix="og: http://ogp.me/ns#" lang="en" class="_booting _theme-<%= app_theme %>"> <html prefix="og: http://ogp.me/ns#" lang="en" class="_booting">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,shrink-to-fit=no"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,shrink-to-fit=no">
@ -14,6 +14,7 @@
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<meta name="theme-color" content="#eee">
<meta name="robots" content="noodp"> <meta name="robots" content="noodp">
<title>DevDocs API Documentation</title> <title>DevDocs API Documentation</title>
<link rel="canonical" href="<%= canonical_origin %>"> <link rel="canonical" href="<%= canonical_origin %>">
@ -32,7 +33,7 @@
<link rel="mask-icon" href="<%= App.cdn_origin %>/images/webkit-mask-icon.svg" color="#398df0"> <link rel="mask-icon" href="<%= App.cdn_origin %>/images/webkit-mask-icon.svg" color="#398df0">
<%= stylesheet_tag 'application' %> <%= stylesheet_tag 'application' %>
</head> </head>
<body<%= %( class="#{app_layout}") if app_layout %>> <body>
<noscript class="_fail">DevDocs requires JavaScript to run.</noscript> <noscript class="_fail">DevDocs requires JavaScript to run.</noscript>
<%= erb :app -%> <%= erb :app -%>
<%= javascript_tag 'application', asset_host: false %> <%= javascript_tag 'application', asset_host: false %>

@ -1,14 +0,0 @@
CACHE MANIFEST
# <%= app_theme %> <%= app_size %> <%= app_layout %>
CACHE:
/
<%= manifest_asset_urls.join "\n" %>
<%= doc_index_urls.join "\n" %>
NETWORK:
/s/
*
FALLBACK:
/ /

@ -1,10 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" class="_booting _theme-<%= app_theme %>"> <html lang="en" class="_booting">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
<% if doc_index_page? %><meta name="description" content="<%= @doc['name'] %> <%= @doc['release'] %> API documentation with instant search, offline support, keyboard shortcuts, mobile version, and more."><% else %><meta name="robots" content="noindex"><% end %> <% if doc_index_page? %><meta name="description" content="<%= @doc['name'] %> <%= @doc['release'] %> API documentation with instant search, offline support, keyboard shortcuts, mobile version, and more."><% else %><meta name="robots" content="noindex"><% end %>
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<meta name="theme-color" content="#eee">
<meta property="og:image" content="<%= App.cdn_origin %>/images/icon-320.png"> <meta property="og:image" content="<%= App.cdn_origin %>/images/icon-320.png">
<title>DevDocs<%= " &mdash; #{@doc['full_name']} documentation" if doc_index_page? %></title> <title>DevDocs<%= " &mdash; #{@doc['full_name']} documentation" if doc_index_page? %></title>
<link rel="canonical" href="<%= canonical_origin %><%= request.path %>"> <link rel="canonical" href="<%= canonical_origin %><%= request.path %>">
@ -13,7 +14,7 @@
<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Search DevDocs"> <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Search DevDocs">
<%= stylesheet_tag 'application' %> <%= stylesheet_tag 'application' %>
</head> </head>
<body<%= %( class="#{app_layout}") if app_layout %> data-doc="<%= CGI::escape_html @doc.to_json %>"> <body data-doc="<%= CGI::escape_html @doc.to_json %>">
<noscript class="_fail">DevDocs requires JavaScript to run.</noscript> <noscript class="_fail">DevDocs requires JavaScript to run.</noscript>
<%= erb :app -%> <%= erb :app -%>
<%= javascript_tag 'application', asset_host: false %><% unless App.production? %> <%= javascript_tag 'application', asset_host: false %><% unless App.production? %>

@ -0,0 +1,49 @@
<%# The name of the cache to store responses in %>
<%# If the cache name changes DevDocs is assumed to be updated %>
const cacheName = '<%= service_worker_cache_name %>';
<%# Url's to cache when the service worker is installed %>
const urlsToCache = [
'/',
'/favicon.ico',
'/manifest.json',
'<%= service_worker_asset_urls.join "',\n '" %>',
'<%= doc_index_urls.join "',\n '" %>',
];
<%# Set-up the cache %>
self.addEventListener('install', event => {
self.skipWaiting();
event.waitUntil(
caches.open(cacheName).then(cache => cache.addAll(urlsToCache)),
);
});
<%# Remove old caches %>
self.addEventListener('activate', event => {
event.waitUntil((async () => {
const keys = await caches.keys();
const jobs = keys.map(key => key !== cacheName ? caches.delete(key) : Promise.resolve());
return Promise.all(jobs);
})());
});
<%# Handle HTTP requests %>
self.addEventListener('fetch', event => {
event.respondWith((async () => {
const cachedResponse = await caches.match(event.request);
if (cachedResponse) return cachedResponse;
const url = new URL(event.request.url);
<%# Attempt to return the index page from the cache if the user is visiting a url like devdocs.io/offline or devdocs.io/javascript/global_objects/array/find %>
<%# The index page will handle the routing %>
if (url.origin === location.origin && !url.pathname.includes('.')) {
const cachedIndex = await caches.match('/');
if (cachedIndex) return cachedIndex;
}
return fetch(event.request);
})());
});

@ -11,9 +11,9 @@
<p class="_fail-text">DevDocs is an API documentation browser which supports the following browsers:</p> <p class="_fail-text">DevDocs is an API documentation browser which supports the following browsers:</p>
<ul class="_fail-list"> <ul class="_fail-list">
<li>Recent versions of Firefox, Chrome, or Opera</li> <li>Recent versions of Firefox, Chrome, or Opera</li>
<li>Safari 9.1+</li> <li>Safari 11.1+</li>
<li>Edge 16+</li> <li>Edge 17+</li>
<li>iOS 10+</li> <li>iOS 11.3+</li>
</ul> </ul>
<p class="_fail-text"> <p class="_fail-text">
If you're unable to upgrade, we apologize. If you're unable to upgrade, we apologize.

Loading…
Cancel
Save