dd` mapping.
+* [Visual Studio Code plugin](https://marketplace.visualstudio.com/items?itemName=akfish.vscode-devdocs ) (1)
+* [Visual Studio Code plugin](https://marketplace.visualstudio.com/items?itemName=deibit.devdocs) (2)
+* [Desktop application](https://github.com/egoist/devdocs-desktop)
+* [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
+* [macOS Application](https://github.com/dteoh/devdocs-macos)
+* [Android Application](https://github.com/Merith-TK/devdocs_webapp_kotlin) is a fully working, advanced WebView
## Copyright / License
-Copyright 2013-2018 Thibaut Courouble and [other contributors](https://github.com/freeCodeCamp/devdocs/graphs/contributors)
+Copyright 2013-2019 Thibaut Courouble and [other contributors](https://github.com/freeCodeCamp/devdocs/graphs/contributors)
-This software is licensed under the terms of the Mozilla Public License v2.0. See the [COPYRIGHT](https://github.com/freeCodeCamp/devdocs/blob/master/COPYRIGHT) and [LICENSE](https://github.com/freeCodeCamp/devdocs/blob/master/LICENSE) files.
+This software is licensed under the terms of the Mozilla Public License v2.0. See the [COPYRIGHT](./COPYRIGHT) and [LICENSE](./LICENSE) files.
-Please do not use the name DevDocs to endorse or promote products derived from this software without my permission, except as may be necessary to comply with the notice/attribution requirements.
+Please do not use the name DevDocs to endorse or promote products derived from this software without the maintainers' permission, except as may be necessary to comply with the notice/attribution requirements.
-I also wish that any documentation file generated using this software be attributed to DevDocs. Let's be fair to all contributors by giving credit where credit's due. Thanks!
+We also wish that any documentation file generated using this software be attributed to DevDocs. Let's be fair to all contributors by giving credit where credit's due. Thanks!
## Questions?
-If you have any questions, please feel free to ask them on the [mailing list](https://groups.google.com/d/forum/devdocs).
+If you have any questions, please feel free to ask them on the contributor chat room on [Gitter](https://gitter.im/FreeCodeCamp/DevDocs).
diff --git a/Rakefile b/Rakefile
index 3904cbd7..705c6ec1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,6 +3,7 @@
require 'bundler/setup'
require 'thor'
+Bundler.require :default
$LOAD_PATH.unshift 'lib'
task :default do
@@ -13,6 +14,9 @@ end
namespace :assets do
desc 'Compile all assets'
task :precompile do
+ load 'tasks/docs.thor'
+ DocsCLI.new.prepare_deploy
+
load 'tasks/assets.thor'
AssetsCLI.new.compile
end
diff --git a/assets/images/.gitignore b/assets/images/.gitignore
new file mode 100644
index 00000000..4a72ec74
--- /dev/null
+++ b/assets/images/.gitignore
@@ -0,0 +1 @@
+sprites/**/*
diff --git a/assets/images/docs-1.png b/assets/images/docs-1.png
deleted file mode 100644
index c5bfb6b8..00000000
Binary files a/assets/images/docs-1.png and /dev/null differ
diff --git a/assets/images/docs-1@2x.png b/assets/images/docs-1@2x.png
deleted file mode 100644
index 1f81ecd9..00000000
Binary files a/assets/images/docs-1@2x.png and /dev/null differ
diff --git a/assets/images/docs-2.png b/assets/images/docs-2.png
deleted file mode 100644
index d096eaa2..00000000
Binary files a/assets/images/docs-2.png and /dev/null differ
diff --git a/assets/images/docs-2@2x.png b/assets/images/docs-2@2x.png
deleted file mode 100644
index 961063eb..00000000
Binary files a/assets/images/docs-2@2x.png and /dev/null differ
diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee
index 979ea353..b55e552c 100644
--- a/assets/javascripts/app/app.coffee
+++ b/assets/javascripts/app/app.coffee
@@ -13,10 +13,12 @@
@el = $('._app')
@localStorage = new LocalStorageStore
- @appCache = new app.AppCache if app.AppCache.isEnabled()
+ @serviceWorker = new app.ServiceWorker if app.ServiceWorker.isEnabled()
@settings = new app.Settings
@db = new app.DB()
+ @settings.initLayout()
+
@docs = new app.collections.Docs
@disabledDocs = new app.collections.Docs
@entries = new app.collections.Entries
@@ -76,7 +78,7 @@
.install()
@previousErrorHandler = onerror
window.onerror = @onWindowError.bind(@)
- CookieStore.onBlocked = @onCookieBlocked
+ CookiesStore.onBlocked = @onCookieBlocked
return
bootOne: ->
@@ -138,7 +140,10 @@
@docs.sort()
@initDoc(doc)
@saveDocs()
- _onSuccess()
+ if app.settings.get('autoInstall')
+ doc.install(_onSuccess, onError)
+ else
+ _onSuccess()
return
doc.load onSuccess, onError, writeCache: true
@@ -147,7 +152,7 @@
saveDocs: ->
@settings.setDocs(doc.slug for doc in @docs.all())
@db.migrate()
- @appCache?.updateInBackground()
+ @serviceWorker?.updateInBackground()
welcomeBack: ->
visitCount = @settings.get('count')
@@ -157,17 +162,24 @@
new app.views.Updates()
@updateChecker = new app.UpdateChecker()
+ reboot: ->
+ if location.pathname isnt '/' and location.pathname isnt '/settings'
+ window.location = "/##{location.pathname}"
+ else
+ window.location = '/'
+ return
+
reload: ->
@docs.clearCache()
@disabledDocs.clearCache()
- if @appCache then @appCache.reload() else window.location = '/'
+ if @serviceWorker then @serviceWorker.reload() else @reboot()
return
reset: ->
@localStorage.reset()
@settings.reset()
@db?.reset()
- @appCache?.update()
+ @serviceWorker?.update()
window.location = '/'
return
@@ -186,9 +198,9 @@
return
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.
- @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...) ->
@trigger 'bootError'
@@ -245,7 +257,7 @@
matchMedia: !!window.matchMedia
insertAdjacentHTML: !!document.body.insertAdjacentHTML
defaultPrevented: document.createEvent('CustomEvent').defaultPrevented is false
- cssGradients: supportsCssGradients()
+ cssVariables: !!CSS?.supports?('(--t: 0)')
for key, value of features when not value
Raven.captureMessage "unsupported/#{key}", level: 'info'
@@ -268,9 +280,4 @@
isInvalidLocation: ->
@config.env is 'production' and location.host.indexOf(app.config.production_host) isnt 0
-supportsCssGradients = ->
- el = document.createElement('div')
- el.style.cssText = "background-image: -webkit-linear-gradient(top, #000, #fff); background-image: linear-gradient(to top, #000, #fff);"
- el.style.backgroundImage.indexOf('gradient') >= 0
-
$.extend app, Events
diff --git a/assets/javascripts/app/appcache.coffee b/assets/javascripts/app/appcache.coffee
deleted file mode 100644
index d2606ab1..00000000
--- a/assets/javascripts/app/appcache.coffee
+++ /dev/null
@@ -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', -> window.location = '/'
- @notifyUpdate = false
- @notifyProgress = true
- try @cache.update() catch
- return
-
- onProgress: (event) =>
- @trigger 'progress', event if @notifyProgress
- return
-
- onUpdateReady: =>
- @trigger 'updateready' if @notifyUpdate
- return
diff --git a/assets/javascripts/app/config.coffee.erb b/assets/javascripts/app/config.coffee.erb
index ec26b697..a822f7e2 100644
--- a/assets/javascripts/app/config.coffee.erb
+++ b/assets/javascripts/app/config.coffee.erb
@@ -13,3 +13,6 @@ app.config =
version: <%= Time.now.to_i %>
release: <%= Time.now.utc.httpdate.to_json %>
mathml_stylesheet: '<%= App.cdn_origin %>/mathml.css'
+ favicon_spritesheet: '<%= image_path('sprites/docs.png') %>'
+ service_worker_path: '/service-worker.js'
+ service_worker_enabled: <%= App.environment == :production || ENV['ENABLE_SERVICE_WORKER'] == 'true' %>
diff --git a/assets/javascripts/app/serviceworker.coffee b/assets/javascripts/app/serviceworker.coffee
new file mode 100644
index 00000000..40235566
--- /dev/null
+++ b/assets/javascripts/app/serviceworker.coffee
@@ -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
diff --git a/assets/javascripts/app/settings.coffee b/assets/javascripts/app/settings.coffee
index 8d309c41..350a08c0 100644
--- a/assets/javascripts/app/settings.coffee
+++ b/assets/javascripts/app/settings.coffee
@@ -5,11 +5,13 @@ class app.Settings
'manualUpdate'
'fastScroll'
'arrowScroll'
+ 'analyticsConsent'
'docs'
'dark'
'layout'
'size'
'tips'
+ 'autoInstall'
]
INTERNAL_KEYS = [
@@ -19,6 +21,8 @@ class app.Settings
'news'
]
+ LAYOUTS: ['_max-width', '_sidebar-hidden', '_native-scrollbars']
+
@defaults:
count: 0
hideDisabled: false
@@ -26,9 +30,10 @@ class app.Settings
news: 0
manualUpdate: false
schema: 1
+ analyticsConsent: false
constructor: ->
- @store = new CookieStore
+ @store = new CookiesStore
@cache = {}
get: (key) ->
@@ -38,6 +43,7 @@ class app.Settings
set: (key, value) ->
@store.set(key, value)
delete @cache[key]
+ @toggleDark(value) if key == 'dark'
return
del: (key) ->
@@ -63,6 +69,8 @@ class app.Settings
return
setLayout: (name, enable) ->
+ @toggleLayout(name, enable)
+
layout = (@store.get('layout') || '').split(' ')
$.arrayDelete(layout, '')
@@ -104,3 +112,28 @@ class app.Settings
@store.reset()
@cache = {}
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
diff --git a/assets/javascripts/app/shortcuts.coffee b/assets/javascripts/app/shortcuts.coffee
index 5bc24806..5755a71d 100644
--- a/assets/javascripts/app/shortcuts.coffee
+++ b/assets/javascripts/app/shortcuts.coffee
@@ -149,6 +149,9 @@ class app.Shortcuts
when 40
@trigger 'altDown'
false
+ when 68
+ @trigger 'altD'
+ false
when 70
@trigger 'altF', event
when 71
diff --git a/assets/javascripts/app/update_checker.coffee b/assets/javascripts/app/update_checker.coffee
index 5630b488..3558d6bc 100644
--- a/assets/javascripts/app/update_checker.coffee
+++ b/assets/javascripts/app/update_checker.coffee
@@ -3,13 +3,13 @@ class app.UpdateChecker
@lastCheck = Date.now()
$.on window, 'focus', @onFocus
- app.appCache.on 'updateready', @onUpdateReady if app.appCache
+ app.serviceWorker?.on 'updateready', @onUpdateReady
setTimeout @checkDocs, 0
check: ->
- if app.appCache
- app.appCache.update()
+ if app.serviceWorker
+ app.serviceWorker.update()
else
ajax
url: $('script[src*="application"]').getAttribute('src')
diff --git a/assets/javascripts/lib/cookie_store.coffee b/assets/javascripts/lib/cookies_store.coffee
similarity index 76%
rename from assets/javascripts/lib/cookie_store.coffee
rename to assets/javascripts/lib/cookies_store.coffee
index 3b340571..eaf1bd4f 100644
--- a/assets/javascripts/lib/cookie_store.coffee
+++ b/assets/javascripts/lib/cookies_store.coffee
@@ -1,4 +1,8 @@
-class @CookieStore
+class @CookiesStore
+ # Intentionally called CookiesStore instead of CookieStore
+ # Calling it CookieStore causes issues when the Experimental Web Platform features flag is enabled in Chrome
+ # Related issue: https://github.com/freeCodeCamp/devdocs/issues/932
+
INT = /^\d+$/
@onBlocked: ->
diff --git a/assets/javascripts/lib/favicon.coffee b/assets/javascripts/lib/favicon.coffee
new file mode 100644
index 00000000..2f2d9f93
--- /dev/null
+++ b/assets/javascripts/lib/favicon.coffee
@@ -0,0 +1,64 @@
+defaultUrl = null
+currentSlug = null
+
+imageCache = {}
+urlCache = {}
+
+withImage = (url, action) ->
+ if imageCache[url]
+ action(imageCache[url])
+ else
+ img = new Image()
+ img.crossOrigin = 'anonymous'
+ img.src = url
+ img.onload = () =>
+ imageCache[url] = img
+ action(img)
+
+@setFaviconForDoc = (doc) ->
+ return if currentSlug == doc.slug
+
+ favicon = $('link[rel="icon"]')
+
+ if defaultUrl == null
+ defaultUrl = favicon.href
+
+ if urlCache[doc.slug]
+ favicon.href = urlCache[doc.slug]
+ currentSlug = doc.slug
+ return
+
+ styles = window.getComputedStyle($("._icon-#{doc.slug.split('~')[0]}"), ':before')
+
+ bgUrl = app.config.favicon_spritesheet
+ sourceSize = 16
+ sourceX = Math.abs(parseInt(styles['background-position-x'].slice(0, -2)))
+ sourceY = Math.abs(parseInt(styles['background-position-y'].slice(0, -2)))
+
+ withImage(bgUrl, (docImg) ->
+ withImage(defaultUrl, (defaultImg) ->
+ size = defaultImg.width
+
+ canvas = document.createElement('canvas')
+ ctx = canvas.getContext('2d')
+
+ canvas.width = size
+ canvas.height = size
+ ctx.drawImage(defaultImg, 0, 0)
+
+ docIconPercentage = 65
+ destinationCoords = size / 100 * (100 - docIconPercentage)
+ destinationSize = size / 100 * docIconPercentage
+ ctx.drawImage(docImg, sourceX, sourceY, sourceSize, sourceSize, destinationCoords, destinationCoords, destinationSize, destinationSize)
+
+ urlCache[doc.slug] = canvas.toDataURL()
+ favicon.href = urlCache[doc.slug]
+
+ currentSlug = doc.slug
+ )
+ )
+
+@resetFavicon = () ->
+ if defaultUrl != null and currentSlug != null
+ $('link[rel="icon"]').href = defaultUrl
+ currentSlug = null
diff --git a/assets/javascripts/lib/license.coffee b/assets/javascripts/lib/license.coffee
index 8ff7c6e2..7f7ca938 100644
--- a/assets/javascripts/lib/license.coffee
+++ b/assets/javascripts/lib/license.coffee
@@ -1,5 +1,5 @@
###
- * Copyright 2013-2018 Thibaut Courouble and other contributors
+ * Copyright 2013-2019 Thibaut Courouble and other contributors
*
* This source code is licensed under the terms of the Mozilla
* Public License, v. 2.0, a copy of which may be obtained at:
diff --git a/assets/javascripts/lib/page.coffee b/assets/javascripts/lib/page.coffee
index 8df7422e..91d73432 100644
--- a/assets/javascripts/lib/page.coffee
+++ b/assets/javascripts/lib/page.coffee
@@ -190,7 +190,7 @@ isSameOrigin = (url) ->
updateCanonicalLink = ->
@canonicalLink ||= document.head.querySelector('link[rel="canonical"]')
- @canonicalLink.setAttribute('href', "http://#{location.host}#{location.pathname}")
+ @canonicalLink.setAttribute('href', "https://#{location.host}#{location.pathname}")
trackers = []
@@ -199,5 +199,21 @@ page.track = (fn) ->
return
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] == '_' && name[1] != '_'
+ Cookies.expire(name)
return
diff --git a/assets/javascripts/lib/util.coffee b/assets/javascripts/lib/util.coffee
index 058106fd..001b13de 100644
--- a/assets/javascripts/lib/util.coffee
+++ b/assets/javascripts/lib/util.coffee
@@ -352,6 +352,10 @@ isIE = null
$.isIE = ->
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 = ->
isAndroid ?= navigator.userAgent?.indexOf('Android') >= 0
diff --git a/assets/javascripts/models/doc.coffee b/assets/javascripts/models/doc.coffee
index 2d5f7e4a..c51e13fa 100644
--- a/assets/javascripts/models/doc.coffee
+++ b/assets/javascripts/models/doc.coffee
@@ -142,4 +142,6 @@ class app.models.Doc extends app.Model
return
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
diff --git a/assets/javascripts/news.json b/assets/javascripts/news.json
index 37bba8ec..0266dea3 100644
--- a/assets/javascripts/news.json
+++ b/assets/javascripts/news.json
@@ -1,5 +1,22 @@
[
[
+ "2019-07-21",
+ "Fixed several bugs, added an option to automatically download documentation and more ."
+ ],
+ [
+ "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",
+ "New documentations: Puppeteer and Handlebars.js "
+ ], [
+ "2018-08-12",
+ "New documentations: Dart and Qt "
+ ], [
+ "2018-07-29",
+ "New documentations: Bash , Graphite and Pygame "
+ ], [
"2018-07-08",
"New documentations: Leaflet , Terraform and Koa "
], [
diff --git a/assets/javascripts/templates/error_tmpl.coffee b/assets/javascripts/templates/error_tmpl.coffee
index 9c19c0a6..9cca1f9d 100644
--- a/assets/javascripts/templates/error_tmpl.coffee
+++ b/assets/javascripts/templates/error_tmpl.coffee
@@ -12,8 +12,8 @@ app.templates.notFoundPage = ->
app.templates.pageLoadError = ->
error """ The page failed to load. """,
- """ It may be missing from the server (try reloading the app) or you could be offline.installing the documentation for offline usage when online again).Reload
· Retry """
@@ -56,21 +56,18 @@ app.templates.unsupportedBrowser = """
Your browser is unsupported, sorry.
DevDocs is an API documentation browser which supports the following browsers:
- Recent versions of Chrome and Firefox
- Safari 5.1+
- Opera 12.1+
- Internet Explorer 10+
- iOS 6+
- Android 4.1+
- Windows Phone 8+
+ Recent versions of Firefox, Chrome, or Opera
+ Safari 11.1+
+ Edge 17+
+ iOS 11.3+
- If you're unable to upgrade, I apologize.
- I decided to prioritize speed and new features over support for older browsers.
+ If you're unable to upgrade, we apologize.
+ We decided to prioritize speed and new features over support for older browsers.
Note: if you're already using one of the browsers above, check your settings and add-ons.
The app uses feature detection, not user agent sniffing.
- — Thibaut @DevDocs
+ — @DevDocs
"""
diff --git a/assets/javascripts/templates/notif_tmpl.coffee b/assets/javascripts/templates/notif_tmpl.coffee
index 93611a5c..0821036e 100644
--- a/assets/javascripts/templates/notif_tmpl.coffee
+++ b/assets/javascripts/templates/notif_tmpl.coffee
@@ -68,3 +68,9 @@ app.templates.notifShare = ->
app.templates.notifUpdateDocs = ->
textNotif """ Documentation updates available. """,
""" Install them 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.
+ Accept or Decline
DevDocs: API Documentation Browser
- DevDocs combines multiple API documentations in a clean and organized web UI with instant search, offline support, mobile version, dark theme, keyboard shortcuts, and more.
-
+ DevDocs combines multiple developer documentations in a clean and organized web UI with instant search, offline support, mobile version, dark theme, keyboard shortcuts, and more.
+
DevDocs is free and open source . It was created by Thibaut Courouble and is operated by freeCodeCamp .
To keep up-to-date with the latest news:
Copyright and License
- Copyright 2013–2018 Thibaut Courouble and other contributors Copyright 2013–2019 Thibaut Courouble and other contributors github.com/freeCodeCamp/devdocs .COPYRIGHT
@@ -48,11 +44,10 @@ app.templates.aboutPage = -> """
Where can I suggest new docs and features?
You can suggest and vote for new docs on the Trello board .issue tracker .mailing list .
+ Otherwise, come talk to us in the Gitter chat room.
Where can I report bugs?
In the issue tracker . Thanks!
- For anything else, feel free to email me at thibaut@devdocs.io .
Credits
@@ -76,12 +71,13 @@ app.templates.aboutPage = -> """
Privacy Policy
- devdocs.io ("App") is operated by Thibaut Courouble ("We").
- We do not collect personal information.
- We use Google Analytics, Gauges and Sentry to collect anonymous traffic information and improve the app.
+ devdocs.io ("App") is operated by freeCodeCamp ("We").
+ We do not collect personal information through the app.
+ 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 settings .
+ We use Sentry to collect crash data and improve the app.
The app uses cookies to store user preferences.
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.
- If you have any questions regarding privacy, please email thibaut@devdocs.io .
+ If you have any questions regarding privacy, please email privacy@freecodecamp.org .
"""
@@ -92,7 +88,7 @@ credits = [
'https://creativecommons.org/licenses/by/4.0/'
], [
'Ansible',
- '2012-2018 Michael DeHaan
alt + s
Search on Stack Overflow
+
+ alt + d
+ Search on DuckDuckGo
Tip: If the cursor is no longer in the search field, press / or
diff --git a/assets/javascripts/templates/pages/offline_tmpl.coffee b/assets/javascripts/templates/pages/offline_tmpl.coffee
index a9a3c21c..bb9e06e8 100644
--- a/assets/javascripts/templates/pages/offline_tmpl.coffee
+++ b/assets/javascripts/templates/pages/offline_tmpl.coffee
@@ -25,8 +25,8 @@ app.templates.offlinePage = (docs) -> """
Questions & Answers
How does this work?
- Each page is cached as a key-value pair in IndexedDB (downloaded from a single file).AppCache and localStorage to cache the assets and index files.
+ Each page is cached as a key-value pair in IndexedDB (downloaded from a single file).Service Workers and localStorage to cache the assets and index files.
Can I close the tab/browser?
#{canICloseTheTab()}
What if I don't update a documentation?
@@ -41,10 +41,15 @@ app.templates.offlinePage = (docs) -> """
"""
canICloseTheTab = ->
- if app.AppCache.isEnabled()
+ if app.ServiceWorker.isEnabled()
""" Yes! Even offline, you can open a new tab, go to devdocs.io , and everything will work as if you were online (provided you installed all the documentations you want to use beforehand). """
else
- """ No. AppCache isn't available in your browser (or is disabled), so loading devdocs.io offline won't work.ENABLE_SERVICE_WORKER environment variable to true)"
+
+ """ No. Service Workers #{reason}, so loading devdocs.io offline won't work.Thanks for downloading DevDocs. Here are a few things you should know:
Your local version of DevDocs won't self-update. Unless you're modifying the code,
- I recommend using the hosted version at devdocs.io .
+ we recommend using the hosted version at devdocs.io .
Run thor docs:list to see all available documentations.
Run thor docs:download <name> to download documentations.
Run thor docs:download --installed to update all downloaded documentations.
To be notified about new versions, don't forget to watch the repository on GitHub.
The issue tracker is the preferred channel for bug reports and
- feature requests. For everything else, use the mailing list .
+ feature requests. For everything else, use Gitter .
Contributions are welcome. See the guidelines .
DevDocs is licensed under the terms of the Mozilla Public License v2.0. For more information,
see the COPYRIGHT and
@@ -39,7 +39,7 @@ app.templates.intro = """
DevDocs works offline , on mobile, and can be installed on Chrome .
For the latest news, follow @DevDocs .
DevDocs is free and open source .
-
+ And if you're new to coding, check out freeCodeCamp's open source curriculum .
Happy coding!
@@ -72,14 +72,3 @@ app.templates.androidWarning = """
To install DevDocs on your phone, visit devdocs.io in Chrome and select "Add to home screen" in the menu.
"""
-
-app.templates.httpWarning = """
-
-
Hi there!
-
DevDocs is migrating to HTTPS.
-
Please update your bookmarks to point to https://devdocs.io .
-
When using the HTTPS version, your preferences will carry over automatically, but your offline data will be reset. Simply re-download documentation in the Offline area , and you'll be all set to use DevDocs securely offline.
-
Sorry for the inconvenience. This migration is needed because browsers are removing support for certain DOM APIs that power DevDocs's offline mode over non-secure origins.
-
Thanks for using DevDocs, and happy coding!
-
Tip: drag the edge of the sidebar to resize it.
+
+ Only enable this when bandwidth isn't a concern to you.
+
+
+ With this checked, we enable Google Analytics and Gauges to collect anonymous traffic information.
+
diff --git a/assets/javascripts/tracking.js b/assets/javascripts/tracking.js
index ca05b218..a68ca493 100644
--- a/assets/javascripts/tracking.js
+++ b/assets/javascripts/tracking.js
@@ -1,28 +1,32 @@
try {
- if (app.config.env == 'production') {
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
- ga('create', 'UA-5544833-12', 'devdocs.io');
- page.track(function() {
- ga('send', 'pageview', {
- page: location.pathname + location.search + location.hash,
- dimension1: app.router.context && app.router.context.doc && app.router.context.doc.slug_without_version
+ if (app.config.env === 'production') {
+ if (Cookies.get('analyticsConsent') === '1') {
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+ ga('create', 'UA-5544833-12', 'devdocs.io');
+ page.track(function() {
+ ga('send', 'pageview', {
+ 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() {
- if (window._gauges)
- _gauges.push(['track']);
- else
- (function() {
- var _gauges=_gauges||[];!function(){var a=document.createElement("script");
- a.type="text/javascript",a.async=!0,a.id="gauges-tracker",
- a.setAttribute("data-site-id","51c15f82613f5d7819000067"),
- a.src="https://secure.gaug.es/track.js";var b=document.getElementsByTagName("script")[0];
- b.parentNode.insertBefore(a,b)}();
- })();
- });
+ page.track(function() {
+ if (window._gauges)
+ _gauges.push(['track']);
+ else
+ (function() {
+ var _gauges=_gauges||[];!function(){var a=document.createElement("script");
+ a.type="text/javascript",a.async=!0,a.id="gauges-tracker",
+ a.setAttribute("data-site-id","51c15f82613f5d7819000067"),
+ a.src="https://secure.gaug.es/track.js";var b=document.getElementsByTagName("script")[0];
+ b.parentNode.insertBefore(a,b)}();
+ })();
+ });
+ } else {
+ resetAnalytics();
+ }
}
} catch(e) { }
diff --git a/assets/javascripts/vendor/fastclick.js b/assets/javascripts/vendor/fastclick.js
index 3af4f9d6..b6f7b40c 100755
--- a/assets/javascripts/vendor/fastclick.js
+++ b/assets/javascripts/vendor/fastclick.js
@@ -413,7 +413,7 @@
// when the user next taps anywhere else on the page, new touchstart and touchend events are dispatched
// with the same identifier as the touch event that previously triggered the click that triggered the alert.
// Sadly, there is an issue on iOS 4 that causes some normal touch events to have the same identifier as an
- // immediately preceeding touch event (issue #52), so this fix is unavailable on that platform.
+ // immediately preceding touch event (issue #52), so this fix is unavailable on that platform.
// Issue 120: touch.identifier is 0 when Chrome dev tools 'Emulate touch events' is set with an iOS device UA string,
// which causes all touch events to be ignored. As this block only applies to iOS, and iOS identifiers are always long,
// random integers, it's safe to to continue if the identifier is 0 here.
@@ -805,7 +805,7 @@
}
}
- // IE11: prefixed -ms-touch-action is no longer supported and it's recomended to use non-prefixed version
+ // IE11: prefixed -ms-touch-action is no longer supported and it's recommended to use non-prefixed version
// http://msdn.microsoft.com/en-us/library/windows/apps/Hh767313.aspx
if (layer.style.touchAction === 'none' || layer.style.touchAction === 'manipulation') {
return true;
diff --git a/assets/javascripts/vendor/prism.js b/assets/javascripts/vendor/prism.js
index 3dc04a14..09d6df87 100644
--- a/assets/javascripts/vendor/prism.js
+++ b/assets/javascripts/vendor/prism.js
@@ -1,4 +1,5 @@
-/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+django+elixir+erlang+go+java+json+kotlin+lua+nginx+nim+perl+php+python+jsx+crystal+rust+scss+sql+typescript+yaml */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+dart+django+elixir+markup-templating+erlang+go+java+json+kotlin+lua+crystal+nginx+nim+perl+php+sql+scss+python+jsx+typescript+rust+yaml */
var _self = (typeof window !== 'undefined')
? window // if in browser
: (
@@ -16,11 +17,12 @@ var _self = (typeof window !== 'undefined')
var Prism = (function(){
// Private helper vars
-var lang = /\blang(?:uage)?-(\w+)\b/i;
+var lang = /\blang(?:uage)?-([\w-]+)\b/i;
var uniqueId = 0;
var _ = _self.Prism = {
manual: _self.Prism && _self.Prism.manual,
+ disableWorkerMessageHandler: _self.Prism && _self.Prism.disableWorkerMessageHandler,
util: {
encode: function (tokens) {
if (tokens instanceof Token) {
@@ -44,23 +46,38 @@ var _ = _self.Prism = {
},
// Deep clone a language definition (e.g. to extend it)
- clone: function (o) {
+ clone: function (o, visited) {
var type = _.util.type(o);
+ visited = visited || {};
switch (type) {
case 'Object':
+ if (visited[_.util.objId(o)]) {
+ return visited[_.util.objId(o)];
+ }
var clone = {};
+ visited[_.util.objId(o)] = clone;
for (var key in o) {
if (o.hasOwnProperty(key)) {
- clone[key] = _.util.clone(o[key]);
+ clone[key] = _.util.clone(o[key], visited);
}
}
return clone;
case 'Array':
- return o.map(function(v) { return _.util.clone(v); });
+ if (visited[_.util.objId(o)]) {
+ return visited[_.util.objId(o)];
+ }
+ var clone = [];
+ visited[_.util.objId(o)] = clone;
+
+ o.forEach(function (v, i) {
+ clone[i] = _.util.clone(v, visited);
+ });
+
+ return clone;
}
return o;
@@ -155,6 +172,10 @@ var _ = _self.Prism = {
plugins: {},
highlightAll: function(async, callback) {
+ _.highlightAllUnder(document, async, callback);
+ },
+
+ highlightAllUnder: function(container, async, callback) {
var env = {
callback: callback,
selector: 'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'
@@ -162,7 +183,7 @@ var _ = _self.Prism = {
_.hooks.run("before-highlightall", env);
- var elements = env.elements || document.querySelectorAll(env.selector);
+ var elements = env.elements || container.querySelectorAll(env.selector);
for (var i=0, element; element = elements[i++];) {
_.highlightElement(element, async === true, env.callback);
@@ -185,11 +206,13 @@ var _ = _self.Prism = {
// Set language on the element, if not present
element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
- // Set language on the parent, for styling
- parent = element.parentNode;
+ if (element.parentNode) {
+ // Set language on the parent, for styling
+ parent = element.parentNode;
- if (/pre/i.test(parent.nodeName)) {
- parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
+ if (/pre/i.test(parent.nodeName)) {
+ parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
+ }
}
var code = element.textContent;
@@ -251,8 +274,15 @@ var _ = _self.Prism = {
},
highlight: function (text, grammar, language) {
- var tokens = _.tokenize(text, grammar);
- return Token.stringify(_.util.encode(tokens), language);
+ var env = {
+ code: text,
+ grammar: grammar,
+ language: language
+ };
+ _.hooks.run('before-tokenize', env);
+ env.tokens = _.tokenize(env.code, env.grammar);
+ _.hooks.run('after-tokenize', env);
+ return Token.stringify(_.util.encode(env.tokens), env.language);
},
matchGrammar: function (text, strarr, grammar, index, startPos, oneshot, target) {
@@ -300,15 +330,9 @@ var _ = _self.Prism = {
continue;
}
- pattern.lastIndex = 0;
-
- var match = pattern.exec(str),
- delNum = 1;
-
- // Greedy patterns can override/remove up to two previously matched tokens
- if (!match && greedy && i != strarr.length - 1) {
+ if (greedy && i != strarr.length - 1) {
pattern.lastIndex = pos;
- match = pattern.exec(text);
+ var match = pattern.exec(text);
if (!match) {
break;
}
@@ -327,11 +351,8 @@ var _ = _self.Prism = {
}
}
- /*
- * If strarr[i] is a Token, then the match starts inside another Token, which is invalid
- * If strarr[k - 1] is greedy we are in conflict with another greedy pattern
- */
- if (strarr[i] instanceof Token || strarr[k - 1].greedy) {
+ // If strarr[i] is a Token, then the match starts inside another Token, which is invalid
+ if (strarr[i] instanceof Token) {
continue;
}
@@ -339,6 +360,11 @@ var _ = _self.Prism = {
delNum = k - i;
str = text.slice(pos, p);
match.index -= pos;
+ } else {
+ pattern.lastIndex = 0;
+
+ var match = pattern.exec(str),
+ delNum = 1;
}
if (!match) {
@@ -350,7 +376,7 @@ var _ = _self.Prism = {
}
if(lookbehind) {
- lookbehindLength = match[1].length;
+ lookbehindLength = match[1] ? match[1].length : 0;
}
var from = match.index + lookbehindLength,
@@ -480,18 +506,21 @@ Token.stringify = function(o, language, parent) {
// // in Node.js
// return _self.Prism;
// }
-// // In worker
-// _self.addEventListener('message', function(evt) {
-// var message = JSON.parse(evt.data),
-// lang = message.language,
-// code = message.code,
-// immediateClose = message.immediateClose;
-
-// _self.postMessage(_.highlight(code, _.languages[lang], lang));
-// if (immediateClose) {
-// _self.close();
-// }
-// }, false);
+
+// if (!_.disableWorkerMessageHandler) {
+// // In worker
+// _self.addEventListener('message', function (evt) {
+// var message = JSON.parse(evt.data),
+// lang = message.language,
+// code = message.code,
+// immediateClose = message.immediateClose;
+
+// _self.postMessage(_.highlight(code, _.languages[lang], lang));
+// if (immediateClose) {
+// _self.close();
+// }
+// }, false);
+// }
// return _self.Prism;
// }
@@ -535,7 +564,8 @@ Prism.languages.markup = {
'doctype': //i,
'cdata': //i,
'tag': {
- pattern: /<\/?(?!\d)[^\s>\/=$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+ pattern: /<\/?(?!\d)[^\s>\/=$<%]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+ greedy: true,
inside: {
'tag': {
pattern: /^<\/?[^\s>\/]+/i,
@@ -600,13 +630,13 @@ Prism.languages.css = {
pattern: /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
greedy: true
},
- 'property': /[\w-]+(?=\s*:)/i,
+ 'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i,
'important': /\B!important\b/i,
'function': /[-a-z0-9]+(?=\()/i,
'punctuation': /[(){};:]/
};
-Prism.languages.css['atrule'].inside.rest = Prism.util.clone(Prism.languages.css);
+Prism.languages.css['atrule'].inside.rest = Prism.languages.css;
if (Prism.languages.markup) {
Prism.languages.insertBefore('markup', 'tag', {
@@ -614,10 +644,11 @@ if (Prism.languages.markup) {
pattern: /()[\s\S]*?(?=<\/style>)/i,
lookbehind: true,
inside: Prism.languages.css,
- alias: 'language-css'
+ alias: 'language-css',
+ greedy: true
}
});
-
+
Prism.languages.insertBefore('inside', 'attr-value', {
'style-attr': {
pattern: /\s*style=("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/i,
@@ -644,7 +675,8 @@ Prism.languages.clike = {
},
{
pattern: /(^|[^\\:])\/\/.*/,
- lookbehind: true
+ lookbehind: true,
+ greedy: true
}
],
'string': {
@@ -661,51 +693,53 @@ Prism.languages.clike = {
'keyword': /\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
'boolean': /\b(?:true|false)\b/,
'function': /[a-z0-9_]+(?=\()/i,
- 'number': /\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)\b/i,
+ 'number': /\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i,
'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
'punctuation': /[{}[\];(),.:]/
};
Prism.languages.javascript = Prism.languages.extend('clike', {
'keyword': /\b(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,
- 'number': /\b-?(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+|\d*\.?\d+(?:[Ee][+-]?\d+)?|NaN|Infinity)\b/,
+ 'number': /\b(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+|NaN|Infinity)\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,
// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
- 'function': /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\s*\()/i,
+ 'function': /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\()/i,
'operator': /-[-=]?|\+[+=]?|!=?=?|<>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/
});
Prism.languages.insertBefore('javascript', 'keyword', {
'regex': {
- pattern: /(^|[^/])\/(?!\/)(\[[^\]\r\n]+]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
+ pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s])\s*)\/(\[[^\]\r\n]+]|\\.|[^/\\\[\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})\]]))/,
lookbehind: true,
greedy: true
},
// This must be declared before keyword because we use "function" inside the look-forward
'function-variable': {
- pattern: /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\s*=\s*(?:function\b|(?:\([^()]*\)|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*)\s*=>))/i,
+ pattern: /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*=\s*(?:function\b|(?:\([^()]*\)|[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*)\s*=>))/i,
alias: 'function'
- }
+ },
+ 'constant': /\b[A-Z][A-Z\d_]*\b/
});
Prism.languages.insertBefore('javascript', 'string', {
'template-string': {
- pattern: /`(?:\\[\s\S]|[^\\`])*`/,
+ pattern: /`(?:\\[\s\S]|\${[^}]+}|[^\\`])*`/,
greedy: true,
inside: {
'interpolation': {
- pattern: /\$\{[^}]+\}/,
+ pattern: /\${[^}]+}/,
inside: {
'interpolation-punctuation': {
- pattern: /^\$\{|\}$/,
+ pattern: /^\${|}$/,
alias: 'punctuation'
},
- rest: Prism.languages.javascript
+ rest: null // See below
}
},
'string': /[\s\S]+/
}
}
});
+Prism.languages.javascript['template-string'].inside['interpolation'].inside.rest = Prism.languages.javascript;
if (Prism.languages.markup) {
Prism.languages.insertBefore('markup', 'tag', {
@@ -713,7 +747,8 @@ if (Prism.languages.markup) {
pattern: /()[\s\S]*?(?=<\/script>)/i,
lookbehind: true,
inside: Prism.languages.javascript,
- alias: 'language-javascript'
+ alias: 'language-javascript',
+ greedy: true
}
});
}
@@ -723,7 +758,7 @@ Prism.languages.js = Prism.languages.javascript;
Prism.languages.c = Prism.languages.extend('clike', {
'keyword': /\b(?:_Alignas|_Alignof|_Atomic|_Bool|_Complex|_Generic|_Imaginary|_Noreturn|_Static_assert|_Thread_local|asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,
'operator': /-[>-]?|\+\+?|!=?|<>?=?|==?|&&?|\|\|?|[~^%?*\/]/,
- 'number': /\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)[ful]*\b/i
+ 'number': /(?:\b0x[\da-f]+|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?)[ful]*/i
});
Prism.languages.insertBefore('c', 'string', {
@@ -768,7 +803,7 @@ delete Prism.languages.c['boolean'];
},
/^\$\(\(/
],
- number: /\b-?(?:0x[\dA-Fa-f]+|\d*\.?\d+(?:[Ee]-?\d+)?)\b/,
+ number: /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee]-?\d+)?/,
// Operators according to https://www.gnu.org/software/bash/manual/bashref.html#Shell-Arithmetic
operator: /--?|-=|\+\+?|\+=|!=?|~|\*\*?|\*=|\/=?|%=?|<<=?|>>=?|<=?|>=?|==?|&&?|&=|\^=?|\|\|?|\|=|\?|:/,
// If there is no $ sign at the beginning highlight (( and )) as punctuation
@@ -778,6 +813,7 @@ delete Prism.languages.c['boolean'];
// Command Substitution
{
pattern: /\$\([^)]+\)|`[^`]+`/,
+ greedy: true,
inside: {
variable: /^\$\(|^`|\)$|`$/
}
@@ -804,7 +840,7 @@ delete Prism.languages.c['boolean'];
inside: insideString
},
{
- pattern: /(["'])(?:\\[\s\S]|(?!\1)[^\\])*\1/,
+ pattern: /(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1/,
greedy: true,
inside: insideString
}
@@ -812,7 +848,7 @@ delete Prism.languages.c['boolean'];
'variable': insideString.variable,
// Originally based on http://ss64.com/bash/
'function': {
- pattern: /(^|[\s;|&])(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|cut|date|dc|dd|ddrescue|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|enable|env|ethtool|eval|exec|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|npm|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)(?=$|[\s;|&])/,
+ pattern: /(^|[\s;|&])(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|enable|env|ethtool|eval|exec|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|npm|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)(?=$|[\s;|&])/,
lookbehind: true
},
'keyword': {
@@ -828,15 +864,18 @@ delete Prism.languages.c['boolean'];
};
var inside = insideString.variable[1].inside;
+ inside.string = Prism.languages.bash.string;
inside['function'] = Prism.languages.bash['function'];
inside.keyword = Prism.languages.bash.keyword;
- inside.boolean = Prism.languages.bash.boolean;
+ inside['boolean'] = Prism.languages.bash['boolean'];
inside.operator = Prism.languages.bash.operator;
inside.punctuation = Prism.languages.bash.punctuation;
+
+ Prism.languages.shell = Prism.languages.bash;
})(Prism);
Prism.languages.cpp = Prism.languages.extend('c', {
- 'keyword': /\b(?:alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,
+ 'keyword': /\b(?:alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|long|mutable|namespace|new|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,
'boolean': /\b(?:true|false)\b/,
'operator': /--?|\+\+?|!=?|<{1,2}=?|>{1,2}=?|->|:{1,2}|={1,2}|\^|~|%|&{1,2}|\|\|?|\?|\*|\/|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/
});
@@ -847,6 +886,15 @@ Prism.languages.insertBefore('cpp', 'keyword', {
lookbehind: true
}
});
+
+Prism.languages.insertBefore('cpp', 'string', {
+ 'raw-string': {
+ pattern: /R"([^()\\ ]{0,16})\([\s\S]*?\)\1"/,
+ alias: 'string',
+ greedy: true
+ }
+});
+
(function(Prism) {
// Ignore comments starting with { to privilege string interpolation highlighting
@@ -947,10 +995,13 @@ delete Prism.languages.coffeescript['template-string'];
(function(Prism) {
Prism.languages.ruby = Prism.languages.extend('clike', {
'comment': [
- /#(?!\{[^\r\n]*?\}).*/,
- /^=begin(?:\r?\n|\r)(?:.*(?:\r?\n|\r))*?=end/m
+ /#.*/,
+ {
+ pattern: /^=begin(?:\r?\n|\r)(?:.*(?:\r?\n|\r))*?=end/m,
+ greedy: true
+ }
],
- 'keyword': /\b(?:alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/
+ 'keyword': /\b(?:alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|protected|private|public|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/
});
var interpolation = {
@@ -960,7 +1011,7 @@ delete Prism.languages.coffeescript['template-string'];
pattern: /^#\{|\}$/,
alias: 'tag'
},
- rest: Prism.util.clone(Prism.languages.ruby)
+ rest: Prism.languages.ruby
}
};
@@ -1009,7 +1060,10 @@ delete Prism.languages.coffeescript['template-string'];
}
],
'variable': /[@$]+[a-zA-Z_]\w*(?:[?!]|\b)/,
- 'symbol': /:[a-zA-Z_]\w*(?:[?!]|\b)/
+ 'symbol': {
+ pattern: /(^|[^:]):[a-zA-Z_]\w*(?:[?!]|\b)/,
+ lookbehind: true
+ }
});
Prism.languages.insertBefore('ruby', 'number', {
@@ -1127,6 +1181,30 @@ Prism.languages.insertBefore('d', 'function', {
alias: 'variable'
}
});
+Prism.languages.dart = Prism.languages.extend('clike', {
+ 'string': [
+ {
+ pattern: /r?("""|''')[\s\S]*?\1/,
+ greedy: true
+ },
+ {
+ pattern: /r?("|')(?:\\.|(?!\1)[^\\\r\n])*\1/,
+ greedy: true
+ }
+ ],
+ 'keyword': [
+ /\b(?:async|sync|yield)\*/,
+ /\b(?:abstract|assert|async|await|break|case|catch|class|const|continue|default|deferred|do|dynamic|else|enum|export|external|extends|factory|final|finally|for|get|if|implements|import|in|library|new|null|operator|part|rethrow|return|set|static|super|switch|this|throw|try|typedef|var|void|while|with|yield)\b/
+ ],
+ 'operator': /\bis!|\b(?:as|is)\b|\+\+|--|&&|\|\||<<=?|>>=?|~(?:\/=?)?|[+\-*\/%&^|=!<>]=?|\?/
+});
+
+Prism.languages.insertBefore('dart','function',{
+ 'metadata': {
+ pattern: /@\w+/,
+ alias: 'symbol'
+ }
+});
// Django/Jinja2 syntax definition for Prism.js syntax highlighter.
// Mostly it works OK but can paint code incorrectly on complex html/template tag combinations.
@@ -1170,15 +1248,15 @@ if (Prism.languages.css) {
Prism.languages.jinja2 = Prism.languages.django;
Prism.languages.elixir = {
- // Negative look-ahead is needed for string interpolation
- // Negative look-behind is needed to avoid highlighting markdown headers in
- // multi-line doc strings
'comment': {
- pattern: /(^|[^#])#(?![{#]).*/m,
+ pattern: /#.*/m,
lookbehind: true
},
// ~r"""foo""" (multi-line), ~r'''foo''' (multi-line), ~r/foo/, ~r|foo|, ~r"foo", ~r'foo', ~r(foo), ~r[foo], ~r{foo}, ~r
- 'regex': /~[rR](?:("""|''')(?:\\[\s\S]|(?!\1)[^\\])+\1|([\/|"'])(?:\\.|(?!\2)[^\\\r\n])+\2|\((?:\\.|[^\\)\r\n])+\)|\[(?:\\.|[^\\\]\r\n])+\]|\{(?:\\.|[^\\}\r\n])+\}|<(?:\\.|[^\\>\r\n])+>)[uismxfr]*/,
+ 'regex': {
+ pattern: /~[rR](?:("""|''')(?:\\[\s\S]|(?!\1)[^\\])+\1|([\/|"'])(?:\\.|(?!\2)[^\\\r\n])+\2|\((?:\\.|[^\\)\r\n])+\)|\[(?:\\.|[^\\\]\r\n])+\]|\{(?:\\.|[^\\}\r\n])+\}|<(?:\\.|[^\\>\r\n])+>)[uismxfr]*/,
+ greedy: true
+ },
'string': [
{
// ~s"""foo""" (multi-line), ~s'''foo''' (multi-line), ~s/foo/, ~s|foo|, ~s"foo", ~s'foo', ~s(foo), ~s[foo], ~s{foo} (with interpolation care), ~s
@@ -1225,7 +1303,7 @@ Prism.languages.elixir = {
alias: 'variable'
},
'attribute': {
- pattern: /@[\S]+/,
+ pattern: /@\w+/,
alias: 'variable'
},
'number': /\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,
@@ -1256,13 +1334,102 @@ Prism.languages.elixir.string.forEach(function(o) {
pattern: /^#\{|\}$/,
alias: 'punctuation'
},
- rest: Prism.util.clone(Prism.languages.elixir)
+ rest: Prism.languages.elixir
}
}
};
});
+Prism.languages['markup-templating'] = {};
+
+Object.defineProperties(Prism.languages['markup-templating'], {
+ buildPlaceholders: {
+ // Tokenize all inline templating expressions matching placeholderPattern
+ // If the replaceFilter function is provided, it will be called with every match.
+ // If it returns false, the match will not be replaced.
+ value: function (env, language, placeholderPattern, replaceFilter) {
+ if (env.language !== language) {
+ return;
+ }
+
+ env.tokenStack = [];
+
+ env.code = env.code.replace(placeholderPattern, function(match) {
+ if (typeof replaceFilter === 'function' && !replaceFilter(match)) {
+ return match;
+ }
+ var i = env.tokenStack.length;
+ // Check for existing strings
+ while (env.code.indexOf('___' + language.toUpperCase() + i + '___') !== -1)
+ ++i;
+
+ // Create a sparse array
+ env.tokenStack[i] = match;
+
+ return '___' + language.toUpperCase() + i + '___';
+ });
+
+ // Switch the grammar to markup
+ env.grammar = Prism.languages.markup;
+ }
+ },
+ tokenizePlaceholders: {
+ // Replace placeholders with proper tokens after tokenizing
+ value: function (env, language) {
+ if (env.language !== language || !env.tokenStack) {
+ return;
+ }
+
+ // Switch the grammar back
+ env.grammar = Prism.languages[language];
+
+ var j = 0;
+ var keys = Object.keys(env.tokenStack);
+ var walkTokens = function (tokens) {
+ if (j >= keys.length) {
+ return;
+ }
+ for (var i = 0; i < tokens.length; i++) {
+ var token = tokens[i];
+ if (typeof token === 'string' || (token.content && typeof token.content === 'string')) {
+ var k = keys[j];
+ var t = env.tokenStack[k];
+ var s = typeof token === 'string' ? token : token.content;
+
+ var index = s.indexOf('___' + language.toUpperCase() + k + '___');
+ if (index > -1) {
+ ++j;
+ var before = s.substring(0, index);
+ var middle = new Prism.Token(language, Prism.tokenize(t, env.grammar, language), 'language-' + language, t);
+ var after = s.substring(index + ('___' + language.toUpperCase() + k + '___').length);
+ var replacement;
+ if (before || after) {
+ replacement = [before, middle, after].filter(function (v) { return !!v; });
+ walkTokens(replacement);
+ } else {
+ replacement = middle;
+ }
+ if (typeof token === 'string') {
+ Array.prototype.splice.apply(tokens, [i, 1].concat(replacement));
+ } else {
+ token.content = replacement;
+ }
+
+ if (j >= keys.length) {
+ break;
+ }
+ }
+ } else if (token.content && typeof token.content !== 'string') {
+ walkTokens(token.content);
+ }
+ }
+ };
+
+ walkTokens(env.tokens);
+ }
+ }
+});
Prism.languages.erlang = {
'comment': /%.+/,
'string': {
@@ -1282,7 +1449,7 @@ Prism.languages.erlang = {
'number': [
/\$\\?./,
/\d+#[a-z0-9]+/i,
- /(?:\b|-)\d*\.?\d+([Ee][+-]?\d+)?\b/
+ /(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i
],
'function': /\b[a-z][\w@]*(?=\()/,
'variable': {
@@ -1312,7 +1479,7 @@ Prism.languages.go = Prism.languages.extend('clike', {
'builtin': /\b(?:bool|byte|complex(?:64|128)|error|float(?:32|64)|rune|string|u?int(?:8|16|32|64)?|uintptr|append|cap|close|complex|copy|delete|imag|len|make|new|panic|print(?:ln)?|real|recover)\b/,
'boolean': /\b(?:_|iota|nil|true|false)\b/,
'operator': /[*\/%^!=]=?|\+[=+]?|-[=-]?|\|[=|]?|&(?:=|&|\^=?)?|>(?:>=?|=)?|<(?:<=?|=|-)?|:=|\.\.\./,
- 'number': /\b(-?(0x[a-f\d]+|(\d+\.?\d*|\.\d+)(e[-+]?\d+)?)i?)\b/i,
+ 'number': /(?:\b0x[a-f\d]+|(?:\b\d+\.?\d*|\B\.\d+)(?:e[-+]?\d+)?)i?/i,
'string': {
pattern: /(["'`])(\\[\s\S]|(?!\1)[^\\])*\1/,
greedy: true
@@ -1322,7 +1489,7 @@ delete Prism.languages.go['class-name'];
Prism.languages.java = Prism.languages.extend('clike', {
'keyword': /\b(?:abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while)\b/,
- 'number': /\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp\-]+\b|\b\d*\.?\d+(?:e[+-]?\d+)?[df]?\b/i,
+ 'number': /\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp-]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?[df]?/i,
'operator': {
pattern: /(^|[^.])(?:\+[+=]?|-[-=]?|!=?|<>?>?=?|==?|&[&=]?|\|[|=]?|\*=?|\/=?|%=?|\^=?|[?:~])/m,
lookbehind: true
@@ -1337,14 +1504,25 @@ Prism.languages.insertBefore('java','function', {
}
});
+Prism.languages.insertBefore('java', 'class-name', {
+ 'generics': {
+ pattern: /<\s*\w+(?:\.\w+)?(?:\s*,\s*\w+(?:\.\w+)?)*>/i,
+ alias: 'function',
+ inside: {
+ keyword: Prism.languages.java.keyword,
+ punctuation: /[<>(),.:]/
+ }
+ }
+});
+
Prism.languages.json = {
'property': /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/i,
'string': {
pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
greedy: true
},
- 'number': /\b-?(?:0x[\dA-Fa-f]+|\d*\.?\d+(?:[Ee][+-]?\d+)?)\b/,
- 'punctuation': /[{}[\]);,]/,
+ 'number': /-?\d+\.?\d*([Ee][+-]?\d+)?/,
+ 'punctuation': /[{}[\],]/,
'operator': /:/g,
'boolean': /\b(?:true|false)\b/i,
'null': /\bnull\b/i
@@ -1356,7 +1534,7 @@ Prism.languages.jsonp = Prism.languages.json;
Prism.languages.kotlin = Prism.languages.extend('clike', {
'keyword': {
// The lookbehind prevents wrong highlighting of e.g. kotlin.properties.get
- pattern: /(^|[^.])\b(?:abstract|annotation|as|break|by|catch|class|companion|const|constructor|continue|crossinline|data|do|else|enum|final|finally|for|fun|get|if|import|in|init|inline|inner|interface|internal|is|lateinit|noinline|null|object|open|out|override|package|private|protected|public|reified|return|sealed|set|super|tailrec|this|throw|to|try|val|var|when|where|while)\b/,
+ pattern: /(^|[^.])\b(?:abstract|actual|annotation|as|break|by|catch|class|companion|const|constructor|continue|crossinline|data|do|dynamic|else|enum|expect|external|final|finally|for|fun|get|if|import|in|infix|init|inline|inner|interface|internal|is|lateinit|noinline|null|object|open|operator|out|override|package|private|protected|public|reified|return|sealed|set|super|suspend|tailrec|this|throw|to|try|typealias|val|var|vararg|when|where|while)\b/,
lookbehind: true
},
'function': [
@@ -1366,7 +1544,7 @@ Prism.languages.jsonp = Prism.languages.json;
lookbehind: true
}
],
- 'number': /\b(?:0[bx][\da-fA-F]+|\d+(?:\.\d+)?(?:e[+-]?\d+)?[fFL]?)\b/,
+ 'number': /\b(?:0[xX][\da-fA-F]+(?:_[\da-fA-F]+)*|0[bB][01]+(?:_[01]+)*|\d+(?:_\d+)*(?:\.\d+(?:_\d+)*)?(?:[eE][+-]?\d+(?:_\d+)*)?[fFL]?)\b/,
'operator': /\+[+=]?|-[-=>]?|==?=?|!(?:!|==?)?|[\/*%<>]=?|[?:]:?|\.\.|&&|\|\||\b(?:and|inv|or|shl|shr|ushr|xor)\b/
});
@@ -1400,7 +1578,7 @@ Prism.languages.jsonp = Prism.languages.json;
pattern: /^\$\{|\}$/,
alias: 'variable'
},
- rest: Prism.util.clone(Prism.languages.kotlin)
+ rest: Prism.languages.kotlin
}
},
{
@@ -1414,6 +1592,7 @@ Prism.languages.jsonp = Prism.languages.json;
};
}(Prism));
+
Prism.languages.lua = {
'comment': /^#!.+|--(?:\[(=*)\[[\s\S]*?\]\1\]|.*)/m,
// \z may be used to skip the following space
@@ -1434,16 +1613,68 @@ Prism.languages.lua = {
],
'punctuation': /[\[\](){},;]|\.+|:+/
};
+(function(Prism) {
+ Prism.languages.crystal = Prism.languages.extend('ruby', {
+ keyword: [
+ /\b(?:abstract|alias|as|asm|begin|break|case|class|def|do|else|elsif|end|ensure|enum|extend|for|fun|if|include|instance_sizeof|lib|macro|module|next|of|out|pointerof|private|protected|rescue|return|require|select|self|sizeof|struct|super|then|type|typeof|uninitialized|union|unless|until|when|while|with|yield|__DIR__|__END_LINE__|__FILE__|__LINE__)\b/,
+ {
+ pattern: /(\.\s*)(?:is_a|responds_to)\?/,
+ lookbehind: true
+ }
+ ],
+
+ number: /\b(?:0b[01_]*[01]|0o[0-7_]*[0-7]|0x[\da-fA-F_]*[\da-fA-F]|(?:\d(?:[\d_]*\d)?)(?:\.[\d_]*\d)?(?:[eE][+-]?[\d_]*\d)?)(?:_(?:[uif](?:8|16|32|64))?)?\b/
+ });
+
+ Prism.languages.insertBefore('crystal', 'string', {
+ attribute: {
+ pattern: /@\[.+?\]/,
+ alias: 'attr-name',
+ inside: {
+ delimiter: {
+ pattern: /^@\[|\]$/,
+ alias: 'tag'
+ },
+ rest: Prism.languages.crystal
+ }
+ },
+
+ expansion: [
+ {
+ pattern: /\{\{.+?\}\}/,
+ inside: {
+ delimiter: {
+ pattern: /^\{\{|\}\}$/,
+ alias: 'tag'
+ },
+ rest: Prism.languages.crystal
+ }
+ },
+ {
+ pattern: /\{%.+?%\}/,
+ inside: {
+ delimiter: {
+ pattern: /^\{%|%\}$/,
+ alias: 'tag'
+ },
+ rest: Prism.languages.crystal
+ }
+ }
+ ]
+ });
+
+}(Prism));
+
Prism.languages.nginx = Prism.languages.extend('clike', {
- 'comment': {
- pattern: /(^|[^"{\\])#.*/,
- lookbehind: true
- },
- 'keyword': /\b(?:CONTENT_|DOCUMENT_|GATEWAY_|HTTP_|HTTPS|if_not_empty|PATH_|QUERY_|REDIRECT_|REMOTE_|REQUEST_|SCGI|SCRIPT_|SERVER_|http|events|accept_mutex|accept_mutex_delay|access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth|auth_basic|auth_basic_user_file|auth_http|auth_http_header|auth_http_timeout|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|debug_connection|debug_points|default_type|deny|devpoll_changes|devpoll_events|directio|directio_alignment|disable_symlinks|empty_gif|env|epoll_events|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_methods|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_purge|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_redirect_errors|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|google_perftools_profiles|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|imap_capabilities|imap_client_buffer|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|kqueue_changes|kqueue_events|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|lock_file|log_format|log_format_combined|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|multi_accept|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|pop3_auth|pop3_capabilities|port_in_redirect|post_action|postpone_output|protocol|proxy|proxy_buffer|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_methods|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_headers_hash_bucket_size|proxy_headers_hash_max_size|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_method|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_error_message|proxy_pass_header|proxy_pass_request_body|proxy_pass_request_headers|proxy_read_timeout|proxy_redirect|proxy_redirect_errors|proxy_send_lowat|proxy_send_timeout|proxy_set_body|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|proxy_timeout|proxy_upstream_fail_timeout|proxy_upstream_max_fails|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|rtsig_overflow_events|rtsig_overflow_test|rtsig_overflow_threshold|rtsig_signo|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|smtp_auth|smtp_capabilities|so_keepalive|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssi_value_length|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|starttls|stub_status|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timeout|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|use|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_connections|worker_cpu_affinity|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|worker_rlimit_sigpending|working_directory|xclient|xml_entities|xslt_entities|xslt_stylesheet|xslt_types)\b/i
+ 'comment': {
+ pattern: /(^|[^"{\\])#.*/,
+ lookbehind: true
+ },
+ 'keyword': /\b(?:CONTENT_|DOCUMENT_|GATEWAY_|HTTP_|HTTPS|if_not_empty|PATH_|QUERY_|REDIRECT_|REMOTE_|REQUEST_|SCGI|SCRIPT_|SERVER_|http|events|accept_mutex|accept_mutex_delay|access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth|auth_basic|auth_basic_user_file|auth_http|auth_http_header|auth_http_timeout|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|debug_connection|debug_points|default_type|deny|devpoll_changes|devpoll_events|directio|directio_alignment|disable_symlinks|empty_gif|env|epoll_events|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_methods|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_purge|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_redirect_errors|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|google_perftools_profiles|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|imap_capabilities|imap_client_buffer|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|kqueue_changes|kqueue_events|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|lock_file|log_format|log_format_combined|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|multi_accept|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|pop3_auth|pop3_capabilities|port_in_redirect|post_action|postpone_output|protocol|proxy|proxy_buffer|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_methods|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_headers_hash_bucket_size|proxy_headers_hash_max_size|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_method|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_error_message|proxy_pass_header|proxy_pass_request_body|proxy_pass_request_headers|proxy_read_timeout|proxy_redirect|proxy_redirect_errors|proxy_send_lowat|proxy_send_timeout|proxy_set_body|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|proxy_timeout|proxy_upstream_fail_timeout|proxy_upstream_max_fails|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|rtsig_overflow_events|rtsig_overflow_test|rtsig_overflow_threshold|rtsig_signo|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|smtp_auth|smtp_capabilities|so_keepalive|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssi_value_length|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|starttls|stub_status|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timeout|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|use|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_connections|worker_cpu_affinity|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|worker_rlimit_sigpending|working_directory|xclient|xml_entities|xslt_entities|xslt_stylesheet|xslt_types)\b/i
});
Prism.languages.insertBefore('nginx', 'keyword', {
- 'variable': /\$[a-z_]+/i
+ 'variable': /\$[a-z_]+/i
});
Prism.languages.nim = {
'comment': /#.*/,
@@ -1497,31 +1728,31 @@ Prism.languages.perl = {
pattern: /\b(?:q|qq|qx|qw)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1/,
greedy: true
},
-
+
// q a...a
{
pattern: /\b(?:q|qq|qx|qw)\s+([a-zA-Z0-9])(?:(?!\1)[^\\]|\\[\s\S])*\1/,
greedy: true
},
-
+
// q(...)
{
pattern: /\b(?:q|qq|qx|qw)\s*\((?:[^()\\]|\\[\s\S])*\)/,
greedy: true
},
-
+
// q{...}
{
pattern: /\b(?:q|qq|qx|qw)\s*\{(?:[^{}\\]|\\[\s\S])*\}/,
greedy: true
},
-
+
// q[...]
{
pattern: /\b(?:q|qq|qx|qw)\s*\[(?:[^[\]\\]|\\[\s\S])*\]/,
greedy: true
},
-
+
// q<...>
{
pattern: /\b(?:q|qq|qx|qw)\s*<(?:[^<>\\]|\\[\s\S])*>/,
@@ -1547,31 +1778,31 @@ Prism.languages.perl = {
pattern: /\b(?:m|qr)\s*([^a-zA-Z0-9\s{(\[<])(?:(?!\1)[^\\]|\\[\s\S])*\1[msixpodualngc]*/,
greedy: true
},
-
+
// m a...a
{
pattern: /\b(?:m|qr)\s+([a-zA-Z0-9])(?:(?!\1)[^\\]|\\[\s\S])*\1[msixpodualngc]*/,
greedy: true
},
-
+
// m(...)
{
pattern: /\b(?:m|qr)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngc]*/,
greedy: true
},
-
+
// m{...}
{
pattern: /\b(?:m|qr)\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngc]*/,
greedy: true
},
-
+
// m[...]
{
pattern: /\b(?:m|qr)\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngc]*/,
greedy: true
},
-
+
// m<...>
{
pattern: /\b(?:m|qr)\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngc]*/,
@@ -1586,42 +1817,42 @@ Prism.languages.perl = {
lookbehind: true,
greedy: true
},
-
+
// s a...a...a
{
pattern: /(^|[^-]\b)(?:s|tr|y)\s+([a-zA-Z0-9])(?:(?!\2)[^\\]|\\[\s\S])*\2(?:(?!\2)[^\\]|\\[\s\S])*\2[msixpodualngcer]*/,
lookbehind: true,
greedy: true
},
-
+
// s(...)(...)
{
pattern: /(^|[^-]\b)(?:s|tr|y)\s*\((?:[^()\\]|\\[\s\S])*\)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngcer]*/,
lookbehind: true,
greedy: true
},
-
+
// s{...}{...}
{
pattern: /(^|[^-]\b)(?:s|tr|y)\s*\{(?:[^{}\\]|\\[\s\S])*\}\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngcer]*/,
lookbehind: true,
greedy: true
},
-
+
// s[...][...]
{
pattern: /(^|[^-]\b)(?:s|tr|y)\s*\[(?:[^[\]\\]|\\[\s\S])*\]\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngcer]*/,
lookbehind: true,
greedy: true
},
-
+
// s<...><...>
{
pattern: /(^|[^-]\b)(?:s|tr|y)\s*<(?:[^<>\\]|\\[\s\S])*>\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngcer]*/,
lookbehind: true,
greedy: true
},
-
+
// /.../
// The look-ahead tries to prevent two divisions on
// the same line from being highlighted as regex.
@@ -1665,7 +1896,7 @@ Prism.languages.perl = {
}
},
'keyword': /\b(?:any|break|continue|default|delete|die|do|else|elsif|eval|for|foreach|given|goto|if|last|local|my|next|our|package|print|redo|require|say|state|sub|switch|undef|unless|until|use|when|while)\b/,
- 'number': /\b-?(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0b[01](?:_?[01])*|(?:\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)\b/,
+ 'number': /\b(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0b[01](?:_?[01])*|(?:\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)\b/,
'operator': /-[rwxoRWXOezsfdlpSbctugkTBMAC]\b|\+[+=]?|-[-=>]?|\*\*?=?|\/\/?=?|=[=~>]?|~[~=]?|\|\|?=?|&&?=?|<(?:=>?|<=?)?|>>?=?|![~=]?|[%^]=?|\.(?:=|\.\.?)?|[\\?]|\bx(?:=|\b)|\b(?:lt|gt|le|ge|eq|ne|cmp|not|and|or|xor)\b/,
'punctuation': /[{}[\];(),:]/
};
@@ -1682,110 +1913,211 @@ Prism.languages.perl = {
* Adds the following new token classes:
* constant, delimiter, variable, function, package
*/
+(function (Prism) {
+ Prism.languages.php = Prism.languages.extend('clike', {
+ 'keyword': /\b(?:and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|private|protected|parent|throw|null|echo|print|trait|namespace|final|yield|goto|instanceof|finally|try|catch)\b/i,
+ 'constant': /\b[A-Z0-9_]{2,}\b/,
+ 'comment': {
+ pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
+ lookbehind: true
+ }
+ });
-Prism.languages.php = Prism.languages.extend('clike', {
- 'keyword': /\b(?:and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|private|protected|parent|throw|null|echo|print|trait|namespace|final|yield|goto|instanceof|finally|try|catch)\b/i,
- 'constant': /\b[A-Z0-9_]{2,}\b/,
- 'comment': {
- pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
- lookbehind: true
- }
-});
+ Prism.languages.insertBefore('php', 'string', {
+ 'shell-comment': {
+ pattern: /(^|[^\\])#.*/,
+ lookbehind: true,
+ alias: 'comment'
+ }
+ });
-// Shell-like comments are matched after strings, because they are less
-// common than strings containing hashes...
-Prism.languages.insertBefore('php', 'class-name', {
- 'shell-comment': {
- pattern: /(^|[^\\])#.*/,
- lookbehind: true,
- alias: 'comment'
- }
-});
+ Prism.languages.insertBefore('php', 'keyword', {
+ 'delimiter': {
+ pattern: /\?>|<\?(?:php|=)?/i,
+ alias: 'important'
+ },
+ 'variable': /\$+(?:\w+\b|(?={))/i,
+ 'package': {
+ pattern: /(\\|namespace\s+|use\s+)[\w\\]+/,
+ lookbehind: true,
+ inside: {
+ punctuation: /\\/
+ }
+ }
+ });
-Prism.languages.insertBefore('php', 'keyword', {
- 'delimiter': {
- pattern: /\?>|<\?(?:php|=)?/i,
- alias: 'important'
- },
- 'variable': /\$\w+\b/i,
- 'package': {
- pattern: /(\\|namespace\s+|use\s+)[\w\\]+/,
- lookbehind: true,
- inside: {
- punctuation: /\\/
+ // Must be defined after the function pattern
+ Prism.languages.insertBefore('php', 'operator', {
+ 'property': {
+ pattern: /(->)[\w]+/,
+ lookbehind: true
}
- }
-});
+ });
-// Must be defined after the function pattern
-Prism.languages.insertBefore('php', 'operator', {
- 'property': {
- pattern: /(->)[\w]+/,
- lookbehind: true
- }
-});
+ Prism.languages.insertBefore('php', 'string', {
+ 'nowdoc-string': {
+ pattern: /<<<'([^']+)'(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;/,
+ greedy: true,
+ alias: 'string',
+ inside: {
+ 'delimiter': {
+ pattern: /^<<<'[^']+'|[a-z_]\w*;$/i,
+ alias: 'symbol',
+ inside: {
+ 'punctuation': /^<<<'?|[';]$/
+ }
+ }
+ }
+ },
+ 'heredoc-string': {
+ pattern: /<<<(?:"([^"]+)"(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\1;|([a-z_]\w*)(?:\r\n?|\n)(?:.*(?:\r\n?|\n))*?\2;)/i,
+ greedy: true,
+ alias: 'string',
+ inside: {
+ 'delimiter': {
+ pattern: /^<<<(?:"[^"]+"|[a-z_]\w*)|[a-z_]\w*;$/i,
+ alias: 'symbol',
+ inside: {
+ 'punctuation': /^<<<"?|[";]$/
+ }
+ },
+ 'interpolation': null // See below
+ }
+ },
+ 'single-quoted-string': {
+ pattern: /'(?:\\[\s\S]|[^\\'])*'/,
+ greedy: true,
+ alias: 'string'
+ },
+ 'double-quoted-string': {
+ pattern: /"(?:\\[\s\S]|[^\\"])*"/,
+ greedy: true,
+ alias: 'string',
+ inside: {
+ 'interpolation': null // See below
+ }
+ }
+ });
+ // The different types of PHP strings "replace" the C-like standard string
+ delete Prism.languages.php['string'];
-// Add HTML support if the markup language exists
-if (Prism.languages.markup) {
+ var string_interpolation = {
+ pattern: /{\$(?:{(?:{[^{}]+}|[^{}]+)}|[^{}])+}|(^|[^\\{])\$+(?:\w+(?:\[.+?]|->\w+)*)/,
+ lookbehind: true,
+ inside: {
+ rest: Prism.languages.php
+ }
+ };
+ Prism.languages.php['heredoc-string'].inside['interpolation'] = string_interpolation;
+ Prism.languages.php['double-quoted-string'].inside['interpolation'] = string_interpolation;
- // Tokenize all inline PHP blocks that are wrapped in
- // This allows for easy PHP + markup highlighting
- Prism.hooks.add('before-highlight', function(env) {
- if (env.language !== 'php' || !/(?:<\?php|<\?)/ig.test(env.code)) {
+ Prism.hooks.add('before-tokenize', function(env) {
+ if (!/(?:<\?php|<\?)/ig.test(env.code)) {
return;
}
- env.tokenStack = [];
-
- env.backupCode = env.code;
- env.code = env.code.replace(/(?:<\?php|<\?)[\s\S]*?(?:\?>|$)/ig, function(match) {
- var i = env.tokenStack.length;
- // Check for existing strings
- while (env.backupCode.indexOf('___PHP' + i + '___') !== -1)
- ++i;
-
- // Create a sparse array
- env.tokenStack[i] = match;
-
- return '___PHP' + i + '___';
- });
+ var phpPattern = /(?:<\?php|<\?)[\s\S]*?(?:\?>|$)/ig;
+ Prism.languages['markup-templating'].buildPlaceholders(env, 'php', phpPattern);
+ });
- // Switch the grammar to markup
- env.grammar = Prism.languages.markup;
+ Prism.hooks.add('after-tokenize', function(env) {
+ Prism.languages['markup-templating'].tokenizePlaceholders(env, 'php');
});
- // Restore env.code for other plugins (e.g. line-numbers)
- Prism.hooks.add('before-insert', function(env) {
- if (env.language === 'php' && env.backupCode) {
- env.code = env.backupCode;
- delete env.backupCode;
+}(Prism));
+Prism.languages.sql= {
+ 'comment': {
+ pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|(?:--|\/\/|#).*)/,
+ lookbehind: true
+ },
+ 'string' : {
+ pattern: /(^|[^@\\])("|')(?:\\[\s\S]|(?!\2)[^\\])*\2/,
+ greedy: true,
+ lookbehind: true
+ },
+ 'variable': /@[\w.$]+|@(["'`])(?:\\[\s\S]|(?!\1)[^\\])+\1/,
+ 'function': /\b(?:AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE)(?=\s*\()/i, // Should we highlight user defined functions too?
+ 'keyword': /\b(?:ACTION|ADD|AFTER|ALGORITHM|ALL|ALTER|ANALYZE|ANY|APPLY|AS|ASC|AUTHORIZATION|AUTO_INCREMENT|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADED?|CASE|CHAIN|CHAR(?:ACTER|SET)?|CHECK(?:POINT)?|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMNS?|COMMENT|COMMIT(?:TED)?|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS(?:TABLE)?|CONTINUE|CONVERT|CREATE|CROSS|CURRENT(?:_DATE|_TIME|_TIMESTAMP|_USER)?|CURSOR|CYCLE|DATA(?:BASES?)?|DATE(?:TIME)?|DAY|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DELIMITERS?|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE|DROP|DUMMY|DUMP(?:FILE)?|DUPLICATE|ELSE(?:IF)?|ENABLE|ENCLOSED|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPED?|EXCEPT|EXEC(?:UTE)?|EXISTS|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR(?: EACH ROW)?|FORCE|FOREIGN|FREETEXT(?:TABLE)?|FROM|FULL|FUNCTION|GEOMETRY(?:COLLECTION)?|GLOBAL|GOTO|GRANT|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|HOUR|IDENTITY(?:_INSERT|COL)?|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTERVAL|INTO|INVOKER|ISOLATION|ITERATE|JOIN|KEYS?|KILL|LANGUAGE|LAST|LEAVE|LEFT|LEVEL|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONG(?:BLOB|TEXT)|LOOP|MATCH(?:ED)?|MEDIUM(?:BLOB|INT|TEXT)|MERGE|MIDDLEINT|MINUTE|MODE|MODIFIES|MODIFY|MONTH|MULTI(?:LINESTRING|POINT|POLYGON)|NATIONAL|NATURAL|NCHAR|NEXT|NO|NONCLUSTERED|NULLIF|NUMERIC|OFF?|OFFSETS?|ON|OPEN(?:DATASOURCE|QUERY|ROWSET)?|OPTIMIZE|OPTION(?:ALLY)?|ORDER|OUT(?:ER|FILE)?|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREPARE|PREV|PRIMARY|PRINT|PRIVILEGES|PROC(?:EDURE)?|PUBLIC|PURGE|QUICK|RAISERROR|READS?|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEAT(?:ABLE)?|REPLACE|REPLICATION|REQUIRE|RESIGNAL|RESTORE|RESTRICT|RETURNS?|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROW(?:COUNT|GUIDCOL|S)?|RTREE|RULE|SAVE(?:POINT)?|SCHEMA|SECOND|SELECT|SERIAL(?:IZABLE)?|SESSION(?:_USER)?|SET(?:USER)?|SHARE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|SQL|START(?:ING)?|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLES?|TABLESPACE|TEMP(?:ORARY|TABLE)?|TERMINATED|TEXT(?:SIZE)?|THEN|TIME(?:STAMP)?|TINY(?:BLOB|INT|TEXT)|TOP?|TRAN(?:SACTIONS?)?|TRIGGER|TRUNCATE|TSEQUAL|TYPES?|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNIQUE|UNLOCK|UNPIVOT|UNSIGNED|UPDATE(?:TEXT)?|USAGE|USE|USER|USING|VALUES?|VAR(?:BINARY|CHAR|CHARACTER|YING)|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH(?: ROLLUP|IN)?|WORK|WRITE(?:TEXT)?|YEAR)\b/i,
+ 'boolean': /\b(?:TRUE|FALSE|NULL)\b/i,
+ 'number': /\b0x[\da-f]+\b|\b\d+\.?\d*|\B\.\d+\b/i,
+ 'operator': /[-+*\/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?|\b(?:AND|BETWEEN|IN|LIKE|NOT|OR|IS|DIV|REGEXP|RLIKE|SOUNDS LIKE|XOR)\b/i,
+ 'punctuation': /[;[\]()`,.]/
+};
+Prism.languages.scss = Prism.languages.extend('css', {
+ 'comment': {
+ pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
+ lookbehind: true
+ },
+ 'atrule': {
+ pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+[{;])/,
+ inside: {
+ 'rule': /@[\w-]+/
+ // See rest below
}
- });
+ },
+ // url, compassified
+ 'url': /(?:[-a-z]+-)*url(?=\()/i,
+ // CSS selector regex is not appropriate for Sass
+ // since there can be lot more things (var, @ directive, nesting..)
+ // a selector must start at the end of a property or after a brace (end of other rules or nesting)
+ // it can contain some characters that aren't used for defining rules or end of selector, & (parent selector), or interpolated variable
+ // the end of a selector is found when there is no rules in it ( {} or {\s}) or if there is a property (because an interpolated var
+ // can "pass" as a selector- e.g: proper#{$erty})
+ // this one was hard to do, so please be careful if you edit this one :)
+ 'selector': {
+ // Initial look-ahead is used to prevent matching of blank selectors
+ pattern: /(?=\S)[^@;{}()]?(?:[^@;{}()]|&|#\{\$[-\w]+\})+(?=\s*\{(?:\}|\s|[^}]+[:{][^}]+))/m,
+ inside: {
+ 'parent': {
+ pattern: /&/,
+ alias: 'important'
+ },
+ 'placeholder': /%[-\w]+/,
+ 'variable': /\$[-\w]+|#\{\$[-\w]+\}/
+ }
+ }
+});
- // Re-insert the tokens after highlighting
- Prism.hooks.add('after-highlight', function(env) {
- if (env.language !== 'php' || !env.tokenStack) {
- return;
+Prism.languages.insertBefore('scss', 'atrule', {
+ 'keyword': [
+ /@(?:if|else(?: if)?|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)/i,
+ {
+ pattern: /( +)(?:from|through)(?= )/,
+ lookbehind: true
}
+ ]
+});
- // Switch the grammar back
- env.grammar = Prism.languages.php;
+Prism.languages.scss.property = {
+ pattern: /(?:[\w-]|\$[-\w]+|#\{\$[-\w]+\})+(?=\s*:)/i,
+ inside: {
+ 'variable': /\$[-\w]+|#\{\$[-\w]+\}/
+ }
+};
- for (var i = 0, keys = Object.keys(env.tokenStack); i < keys.length; ++i) {
- var k = keys[i];
- var t = env.tokenStack[k];
+Prism.languages.insertBefore('scss', 'important', {
+ // var and interpolated vars
+ 'variable': /\$[-\w]+|#\{\$[-\w]+\}/
+});
- // The replace prevents $$, $&, $`, $', $n, $nn from being interpreted as special patterns
- env.highlightedCode = env.highlightedCode.replace('___PHP' + k + '___',
- "" +
- Prism.highlight(t, env.grammar, 'php').replace(/\$/g, '$$$$') +
- " ");
- }
+Prism.languages.insertBefore('scss', 'function', {
+ 'placeholder': {
+ pattern: /%[-\w]+/,
+ alias: 'selector'
+ },
+ 'statement': {
+ pattern: /\B!(?:default|optional)\b/i,
+ alias: 'keyword'
+ },
+ 'boolean': /\b(?:true|false)\b/,
+ 'null': /\bnull\b/,
+ 'operator': {
+ pattern: /(\s)(?:[-+*\/%]|[=!]=|<=?|>=?|and|or|not)(?=\s)/,
+ lookbehind: true
+ }
+});
- env.element.innerHTML = env.highlightedCode;
- });
-}
-;
+Prism.languages.scss['atrule'].inside.rest = Prism.languages.scss;
Prism.languages.python = {
'comment': {
pattern: /(^|[^\\])#.*/,
@@ -1811,7 +2143,7 @@ Prism.languages.python = {
'keyword': /\b(?:as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|pass|print|raise|return|try|while|with|yield)\b/,
'builtin':/\b(?:__import__|abs|all|any|apply|ascii|basestring|bin|bool|buffer|bytearray|bytes|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|memoryview|min|next|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|unichr|unicode|vars|xrange|zip)\b/,
'boolean': /\b(?:True|False|None)\b/,
- 'number': /\b-?(?:0[bo])?(?:(?:\d|0x[\da-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
+ 'number': /(?:\b(?=\d)|\B(?=\.))(?:0[bo])?(?:(?:\d|0x[\da-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
'operator': /[-+%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]|\b(?:or|and|not)\b/,
'punctuation': /[{}[\];(),.:]/
};
@@ -1821,93 +2153,134 @@ Prism.languages.python = {
var javascript = Prism.util.clone(Prism.languages.javascript);
Prism.languages.jsx = Prism.languages.extend('markup', javascript);
-Prism.languages.jsx.tag.pattern= /<\/?[\w.:-]+\s*(?:\s+(?:[\w\.:-]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">=]+|(?:\{[^}]*\})))?|\{\.{3}\w+\}))*\s*\/?>/i;
+Prism.languages.jsx.tag.pattern= /<\/?(?:[\w.:-]+\s*(?:\s+(?:[\w.:-]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s{'">=]+|\{(?:\{(?:\{[^}]*\}|[^{}])*\}|[^{}])+\}))?|\{\.{3}[a-z_$][\w$]*(?:\.[a-z_$][\w$]*)*\}))*\s*\/?)?>/i;
+Prism.languages.jsx.tag.inside['tag'].pattern = /^<\/?[^\s>\/]*/i;
Prism.languages.jsx.tag.inside['attr-value'].pattern = /=(?!\{)(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^\s'">]+)/i;
Prism.languages.insertBefore('inside', 'attr-name', {
'spread': {
- pattern: /\{\.{3}\w+\}/,
+ pattern: /\{\.{3}[a-z_$][\w$]*(?:\.[a-z_$][\w$]*)*\}/,
inside: {
- 'punctuation': /[{}]|\.{3}/,
+ 'punctuation': /\.{3}|[{}.]/,
'attr-value': /\w+/
}
}
}, Prism.languages.jsx.tag);
-var jsxExpression = Prism.util.clone(Prism.languages.jsx);
-
-delete jsxExpression.punctuation;
-
-jsxExpression = Prism.languages.insertBefore('jsx', 'operator', {
- 'punctuation': /=(?={)|[{}[\];(),.:]/
-}, { jsx: jsxExpression });
-
Prism.languages.insertBefore('inside', 'attr-value',{
'script': {
- // Allow for one level of nesting
- pattern: /=(\{(?:\{[^}]*\}|[^}])+\})/i,
- inside: jsxExpression,
+ // Allow for two levels of nesting
+ pattern: /=(\{(?:\{(?:\{[^}]*\}|[^}])*\}|[^}])+\})/i,
+ inside: {
+ 'script-punctuation': {
+ pattern: /^=(?={)/,
+ alias: 'punctuation'
+ },
+ rest: Prism.languages.jsx
+ },
'alias': 'language-javascript'
}
}, Prism.languages.jsx.tag);
-}(Prism));
+// The following will handle plain text inside tags
+var stringifyToken = function (token) {
+ if (!token) {
+ return '';
+ }
+ if (typeof token === 'string') {
+ return token;
+ }
+ if (typeof token.content === 'string') {
+ return token.content;
+ }
+ return token.content.map(stringifyToken).join('');
+};
-(function(Prism) {
- Prism.languages.crystal = Prism.languages.extend('ruby', {
- keyword: [
- /\b(?:abstract|alias|as|asm|begin|break|case|class|def|do|else|elsif|end|ensure|enum|extend|for|fun|if|include|instance_sizeof|lib|macro|module|next|of|out|pointerof|private|protected|rescue|return|require|select|self|sizeof|struct|super|then|type|typeof|uninitialized|union|unless|until|when|while|with|yield|__DIR__|__END_LINE__|__FILE__|__LINE__)\b/,
- {
- pattern: /(\.\s*)(?:is_a|responds_to)\?/,
- lookbehind: true
- }
- ],
+var walkTokens = function (tokens) {
+ var openedTags = [];
+ for (var i = 0; i < tokens.length; i++) {
+ var token = tokens[i];
+ var notTagNorBrace = false;
+
+ if (typeof token !== 'string') {
+ if (token.type === 'tag' && token.content[0] && token.content[0].type === 'tag') {
+ // We found a tag, now find its kind
+
+ if (token.content[0].content[0].content === ' 0 && openedTags[openedTags.length - 1].tagName === stringifyToken(token.content[0].content[1])) {
+ // Pop matching opening tag
+ openedTags.pop();
+ }
+ } else {
+ if (token.content[token.content.length - 1].content === '/>') {
+ // Autoclosed tag, ignore
+ } else {
+ // Opening tag
+ openedTags.push({
+ tagName: stringifyToken(token.content[0].content[1]),
+ openedBraces: 0
+ });
+ }
+ }
+ } else if (openedTags.length > 0 && token.type === 'punctuation' && token.content === '{') {
- number: /\b(?:0b[01_]*[01]|0o[0-7_]*[0-7]|0x[0-9a-fA-F_]*[0-9a-fA-F]|(?:\d(?:[0-9_]*\d)?)(?:\.[0-9_]*\d)?(?:[eE][+-]?[0-9_]*\d)?)(?:_(?:[uif](?:8|16|32|64))?)?\b/
- });
+ // Here we might have entered a JSX context inside a tag
+ openedTags[openedTags.length - 1].openedBraces++;
- var rest = Prism.util.clone(Prism.languages.crystal);
+ } else if (openedTags.length > 0 && openedTags[openedTags.length - 1].openedBraces > 0 && token.type === 'punctuation' && token.content === '}') {
- Prism.languages.insertBefore('crystal', 'string', {
- attribute: {
- pattern: /@\[.+?\]/,
- alias: 'attr-name',
- inside: {
- delimiter: {
- pattern: /^@\[|\]$/,
- alias: 'tag'
- },
- rest: rest
- }
- },
+ // Here we might have left a JSX context inside a tag
+ openedTags[openedTags.length - 1].openedBraces--;
- expansion: [
- {
- pattern: /\{\{.+?\}\}/,
- inside: {
- delimiter: {
- pattern: /^\{\{|\}\}$/,
- alias: 'tag'
- },
- rest: rest
+ } else {
+ notTagNorBrace = true
}
- },
- {
- pattern: /\{%.+?%\}/,
- inside: {
- delimiter: {
- pattern: /^\{%|%\}$/,
- alias: 'tag'
- },
- rest: rest
+ }
+ if (notTagNorBrace || typeof token === 'string') {
+ if (openedTags.length > 0 && openedTags[openedTags.length - 1].openedBraces === 0) {
+ // Here we are inside a tag, and not inside a JSX context.
+ // That's plain text: drop any tokens matched.
+ var plainText = stringifyToken(token);
+
+ // And merge text with adjacent text
+ if (i < tokens.length - 1 && (typeof tokens[i + 1] === 'string' || tokens[i + 1].type === 'plain-text')) {
+ plainText += stringifyToken(tokens[i + 1]);
+ tokens.splice(i + 1, 1);
+ }
+ if (i > 0 && (typeof tokens[i - 1] === 'string' || tokens[i - 1].type === 'plain-text')) {
+ plainText = stringifyToken(tokens[i - 1]) + plainText;
+ tokens.splice(i - 1, 1);
+ i--;
+ }
+
+ tokens[i] = new Prism.Token('plain-text', plainText, null, plainText);
}
}
- ]
- });
+
+ if (token.content && typeof token.content !== 'string') {
+ walkTokens(token.content);
+ }
+ }
+};
+
+Prism.hooks.add('after-tokenize', function (env) {
+ if (env.language !== 'jsx' && env.language !== 'tsx') {
+ return;
+ }
+ walkTokens(env.tokens);
+});
}(Prism));
+Prism.languages.typescript = Prism.languages.extend('javascript', {
+ // From JavaScript Prism keyword list and TypeScript language spec: https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words
+ 'keyword': /\b(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield|module|declare|constructor|namespace|abstract|require|type)\b/,
+ 'builtin': /\b(?:string|Function|any|number|boolean|Array|symbol|console)\b/,
+});
+
+Prism.languages.ts = Prism.languages.typescript;
/* TODO
Add support for Markdown notation inside doc comments
Add support for nested block comments...
@@ -1932,10 +2305,18 @@ Prism.languages.rust = {
greedy: true
},
{
- pattern: /b?("|')(?:\\.|(?!\1)[^\\\r\n])*\1/,
+ pattern: /b?"(?:\\.|[^\\\r\n"])*"/,
greedy: true
}
],
+ 'char': {
+ pattern: /b?'(?:\\(?:x[0-7][\da-fA-F]|u{(?:[\da-fA-F]_*){1,6}|.)|[^\\\r\n\t'])'/,
+ alias: 'string'
+ },
+ 'lifetime-annotation': {
+ pattern: /'[^\s>']+/,
+ alias: 'symbol'
+ },
'keyword': /\b(?:abstract|alignof|as|be|box|break|const|continue|crate|do|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|match|mod|move|mut|offsetof|once|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,
'attribute': {
@@ -1955,7 +2336,7 @@ Prism.languages.rust = {
},
// Hex, oct, bin, dec numbers with visual separators and type suffix
- 'number': /\b-?(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*|(\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)(?:_?(?:[iu](?:8|16|32|64)?|f32|f64))?\b/,
+ 'number': /\b(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*|(\d(?:_?\d)*)?\.?\d(?:_?\d)*(?:[Ee][+-]?\d+)?)(?:_?(?:[iu](?:8|16|32|64)?|f32|f64))?\b/,
// Closure params should not be confused with bitwise OR |
'closure-params': {
@@ -1966,107 +2347,8 @@ Prism.languages.rust = {
}
},
'punctuation': /[{}[\];(),:]|\.+|->/,
- 'operator': /[-+*\/%!^=]=?|@|&[&=]?|\|[|=]?|<>?=?/
+ 'operator': /[-+*\/%!^]=?|=[=>]?|@|&[&=]?|\|[|=]?|<>?=?/
};
-Prism.languages.scss = Prism.languages.extend('css', {
- 'comment': {
- pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|\/\/.*)/,
- lookbehind: true
- },
- 'atrule': {
- pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+[{;])/,
- inside: {
- 'rule': /@[\w-]+/
- // See rest below
- }
- },
- // url, compassified
- 'url': /(?:[-a-z]+-)*url(?=\()/i,
- // CSS selector regex is not appropriate for Sass
- // since there can be lot more things (var, @ directive, nesting..)
- // a selector must start at the end of a property or after a brace (end of other rules or nesting)
- // it can contain some characters that aren't used for defining rules or end of selector, & (parent selector), or interpolated variable
- // the end of a selector is found when there is no rules in it ( {} or {\s}) or if there is a property (because an interpolated var
- // can "pass" as a selector- e.g: proper#{$erty})
- // this one was hard to do, so please be careful if you edit this one :)
- 'selector': {
- // Initial look-ahead is used to prevent matching of blank selectors
- pattern: /(?=\S)[^@;{}()]?(?:[^@;{}()]|&|#\{\$[-\w]+\})+(?=\s*\{(?:\}|\s|[^}]+[:{][^}]+))/m,
- inside: {
- 'parent': {
- pattern: /&/,
- alias: 'important'
- },
- 'placeholder': /%[-\w]+/,
- 'variable': /\$[-\w]+|#\{\$[-\w]+\}/
- }
- }
-});
-
-Prism.languages.insertBefore('scss', 'atrule', {
- 'keyword': [
- /@(?:if|else(?: if)?|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)/i,
- {
- pattern: /( +)(?:from|through)(?= )/,
- lookbehind: true
- }
- ]
-});
-
-Prism.languages.scss.property = {
- pattern: /(?:[\w-]|\$[-\w]+|#\{\$[-\w]+\})+(?=\s*:)/i,
- inside: {
- 'variable': /\$[-\w]+|#\{\$[-\w]+\}/
- }
-};
-
-Prism.languages.insertBefore('scss', 'important', {
- // var and interpolated vars
- 'variable': /\$[-\w]+|#\{\$[-\w]+\}/
-});
-
-Prism.languages.insertBefore('scss', 'function', {
- 'placeholder': {
- pattern: /%[-\w]+/,
- alias: 'selector'
- },
- 'statement': {
- pattern: /\B!(?:default|optional)\b/i,
- alias: 'keyword'
- },
- 'boolean': /\b(?:true|false)\b/,
- 'null': /\bnull\b/,
- 'operator': {
- pattern: /(\s)(?:[-+*\/%]|[=!]=|<=?|>=?|and|or|not)(?=\s)/,
- lookbehind: true
- }
-});
-
-Prism.languages.scss['atrule'].inside.rest = Prism.util.clone(Prism.languages.scss);
-Prism.languages.sql= {
- 'comment': {
- pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|(?:--|\/\/|#).*)/,
- lookbehind: true
- },
- 'string' : {
- pattern: /(^|[^@\\])("|')(?:\\[\s\S]|(?!\2)[^\\])*\2/,
- greedy: true,
- lookbehind: true
- },
- 'variable': /@[\w.$]+|@(["'`])(?:\\[\s\S]|(?!\1)[^\\])+\1/,
- 'function': /\b(?:COUNT|SUM|AVG|MIN|MAX|FIRST|LAST|UCASE|LCASE|MID|LEN|ROUND|NOW|FORMAT)(?=\s*\()/i, // Should we highlight user defined functions too?
- 'keyword': /\b(?:ACTION|ADD|AFTER|ALGORITHM|ALL|ALTER|ANALYZE|ANY|APPLY|AS|ASC|AUTHORIZATION|AUTO_INCREMENT|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADED?|CASE|CHAIN|CHAR VARYING|CHARACTER (?:SET|VARYING)|CHARSET|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMN|COLUMNS|COMMENT|COMMIT|COMMITTED|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT(?:_DATE|_TIME|_TIMESTAMP|_USER)?|CURSOR|DATA(?:BASES?)?|DATE(?:TIME)?|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DELIMITER(?:S)?|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE(?: PRECISION)?|DROP|DUMMY|DUMP(?:FILE)?|DUPLICATE KEY|ELSE|ENABLE|ENCLOSED BY|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPE(?:D BY)?|EXCEPT|EXEC(?:UTE)?|EXISTS|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR(?: EACH ROW)?|FORCE|FOREIGN|FREETEXT(?:TABLE)?|FROM|FULL|FUNCTION|GEOMETRY(?:COLLECTION)?|GLOBAL|GOTO|GRANT|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|IDENTITY(?:_INSERT|COL)?|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTO|INVOKER|ISOLATION LEVEL|JOIN|KEYS?|KILL|LANGUAGE SQL|LAST|LEFT|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONG(?:BLOB|TEXT)|MATCH(?:ED)?|MEDIUM(?:BLOB|INT|TEXT)|MERGE|MIDDLEINT|MODIFIES SQL DATA|MODIFY|MULTI(?:LINESTRING|POINT|POLYGON)|NATIONAL(?: CHAR VARYING| CHARACTER(?: VARYING)?| VARCHAR)?|NATURAL|NCHAR(?: VARCHAR)?|NEXT|NO(?: SQL|CHECK|CYCLE)?|NONCLUSTERED|NULLIF|NUMERIC|OFF?|OFFSETS?|ON|OPEN(?:DATASOURCE|QUERY|ROWSET)?|OPTIMIZE|OPTION(?:ALLY)?|ORDER|OUT(?:ER|FILE)?|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREV|PRIMARY|PRINT|PRIVILEGES|PROC(?:EDURE)?|PUBLIC|PURGE|QUICK|RAISERROR|READ(?:S SQL DATA|TEXT)?|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEATABLE|REPLICATION|REQUIRE|RESTORE|RESTRICT|RETURNS?|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROW(?:COUNT|GUIDCOL|S)?|RTREE|RULE|SAVE(?:POINT)?|SCHEMA|SELECT|SERIAL(?:IZABLE)?|SESSION(?:_USER)?|SET(?:USER)?|SHARE MODE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|START(?:ING BY)?|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLES?|TABLESPACE|TEMP(?:ORARY|TABLE)?|TERMINATED BY|TEXT(?:SIZE)?|THEN|TIMESTAMP|TINY(?:BLOB|INT|TEXT)|TOP?|TRAN(?:SACTIONS?)?|TRIGGER|TRUNCATE|TSEQUAL|TYPES?|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNIQUE|UNPIVOT|UPDATE(?:TEXT)?|USAGE|USE|USER|USING|VALUES?|VAR(?:BINARY|CHAR|CHARACTER|YING)|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH(?: ROLLUP|IN)?|WORK|WRITE(?:TEXT)?)\b/i,
- 'boolean': /\b(?:TRUE|FALSE|NULL)\b/i,
- 'number': /\b-?(?:0x)?\d*\.?[\da-f]+\b/,
- 'operator': /[-+*\/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?|\b(?:AND|BETWEEN|IN|LIKE|NOT|OR|IS|DIV|REGEXP|RLIKE|SOUNDS LIKE|XOR)\b/i,
- 'punctuation': /[;[\]()`,.]/
-};
-Prism.languages.typescript = Prism.languages.extend('javascript', {
- // From JavaScript Prism keyword list and TypeScript language spec: https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words
- 'keyword': /\b(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield|false|true|module|declare|constructor|string|Function|any|number|boolean|Array|symbol|namespace|abstract|require|type)\b/
-});
-
-Prism.languages.ts = Prism.languages.typescript;
Prism.languages.yaml = {
'scalar': {
pattern: /([\-:]\s*(?:![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\2[^\r\n]+)*)/,
@@ -2105,11 +2387,10 @@ Prism.languages.yaml = {
greedy: true
},
'number': {
- pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+\-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,
+ pattern: /([:\-,[{]\s*(?:![^\s]+)?[ \t]*)[+-]?(?:0x[\da-f]+|0o[0-7]+|(?:\d+\.?\d*|\.?\d+)(?:e[+-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,
lookbehind: true
},
'tag': /![^\s]+/,
'important': /[&*][\w]+/,
'punctuation': /---|[:[\]{}\-,|>?]|\.\.\./
};
-
diff --git a/assets/javascripts/vendor/raven.js b/assets/javascripts/vendor/raven.js
index f36c41b2..176ea361 100644
--- a/assets/javascripts/vendor/raven.js
+++ b/assets/javascripts/vendor/raven.js
@@ -856,7 +856,7 @@ Raven.prototype = {
},
_triggerEvent: function(eventType, options) {
- // NOTE: `event` is a native browser thing, so let's avoid conflicting wiht it
+ // NOTE: `event` is a native browser thing, so let's avoid conflicting with it
var evt, key;
if (!this._hasDocument) return;
diff --git a/assets/javascripts/views/content/content.coffee b/assets/javascripts/views/content/content.coffee
index 8c5ba874..4e01733e 100644
--- a/assets/javascripts/views/content/content.coffee
+++ b/assets/javascripts/views/content/content.coffee
@@ -153,6 +153,9 @@ class app.views.Content extends app.View
return
afterRoute: (route, context) =>
+ if route != 'entry' and route != 'type'
+ resetFavicon()
+
switch route
when 'root'
@show @rootPage
diff --git a/assets/javascripts/views/content/entry_page.coffee b/assets/javascripts/views/content/entry_page.coffee
index beae4d77..f6f06511 100644
--- a/assets/javascripts/views/content/entry_page.coffee
+++ b/assets/javascripts/views/content/entry_page.coffee
@@ -40,6 +40,7 @@ class app.views.EntryPage extends app.View
if app.disabledDocs.findBy 'slug', @entry.doc.slug
@hiddenView = new app.views.HiddenPage @el, @entry
+ setFaviconForDoc(@entry.doc)
@delay @polyfillMathML
@trigger 'loaded'
return
@@ -123,7 +124,7 @@ class app.views.EntryPage extends app.View
@render @tmpl('pageLoadError')
@resetClass()
@addClass @constructor.errorClass
- app.appCache?.update()
+ app.serviceWorker?.update()
return
cache: ->
diff --git a/assets/javascripts/views/content/offline_page.coffee b/assets/javascripts/views/content/offline_page.coffee
index f37bbf8f..9f7f4cf2 100644
--- a/assets/javascripts/views/content/offline_page.coffee
+++ b/assets/javascripts/views/content/offline_page.coffee
@@ -57,6 +57,7 @@ class app.views.OfflinePage extends app.View
doc[action](@onInstallSuccess.bind(@, doc), @onInstallError.bind(@, doc), @onInstallProgress.bind(@, doc))
el.parentNode.innerHTML = "#{el.textContent.replace(/e$/, '')}ing…"
else if action = el.getAttribute('data-action-all')
+ return unless action isnt 'uninstall' or window.confirm('Uninstall all docs?')
app.db.migrate()
$.click(el) for el in @findAll("[data-action='#{action}']")
return
diff --git a/assets/javascripts/views/content/root_page.coffee b/assets/javascripts/views/content/root_page.coffee
index e442887a..b48a1df3 100644
--- a/assets/javascripts/views/content/root_page.coffee
+++ b/assets/javascripts/views/content/root_page.coffee
@@ -19,10 +19,6 @@ class app.views.RootPage extends app.View
else
'intro'
- # temporary
- if location.host is 'devdocs.io' and location.protocol is 'http:'
- tmpl = 'httpWarning'
-
@append @tmpl(tmpl)
return
diff --git a/assets/javascripts/views/content/settings_page.coffee b/assets/javascripts/views/content/settings_page.coffee
index d72e3eb3..9ca606c6 100644
--- a/assets/javascripts/views/content/settings_page.coffee
+++ b/assets/javascripts/views/content/settings_page.coffee
@@ -1,7 +1,4 @@
class app.views.SettingsPage extends app.View
- LAYOUTS = ['_max-width', '_sidebar-hidden', '_native-scrollbars']
- SIDEBAR_HIDDEN_LAYOUT = '_sidebar-hidden'
-
@className: '_static'
@events:
@@ -17,32 +14,31 @@ class app.views.SettingsPage extends app.View
settings.dark = app.settings.get('dark')
settings.smoothScroll = !app.settings.get('fastScroll')
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
getTitle: ->
'Preferences'
toggleDark: (enable) ->
- css = $('link[rel="stylesheet"][data-alt]')
- alt = css.getAttribute('data-alt')
- css.setAttribute('data-alt', css.getAttribute('href'))
- css.setAttribute('href', alt)
app.settings.set('dark', !!enable)
- app.appCache?.updateInBackground()
return
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.appCache?.updateInBackground()
return
toggleSmoothScroll: (enable) ->
app.settings.set('fastScroll', !enable)
return
+ toggleAnalyticsConsent: (enable) ->
+ app.settings.set('analyticsConsent', if enable then '1' else '0')
+ resetAnalytics() unless enable
+ return
+
toggle: (name, enable) ->
app.settings.set(name, enable)
return
@@ -86,6 +82,8 @@ class app.views.SettingsPage extends app.View
@toggleSmoothScroll input.checked
when 'import'
@import input.files[0], input
+ when 'analyticsConsent'
+ @toggleAnalyticsConsent input.checked
else
@toggle input.name, input.checked
return
diff --git a/assets/javascripts/views/content/type_page.coffee b/assets/javascripts/views/content/type_page.coffee
index 147fa7ed..ef360c14 100644
--- a/assets/javascripts/views/content/type_page.coffee
+++ b/assets/javascripts/views/content/type_page.coffee
@@ -9,6 +9,7 @@ class app.views.TypePage extends app.View
render: (@type) ->
@html @tmpl('typePage', @type)
+ setFaviconForDoc(@type.doc)
return
getTitle: ->
diff --git a/assets/javascripts/views/layout/document.coffee b/assets/javascripts/views/layout/document.coffee
index 10feefd5..a10d0b3c 100644
--- a/assets/javascripts/views/layout/document.coffee
+++ b/assets/javascripts/views/layout/document.coffee
@@ -75,9 +75,11 @@ class app.views.Document extends app.View
return unless target.hasAttribute('data-behavior')
$.stopEvent(event)
switch target.getAttribute('data-behavior')
- when 'back' then history.back()
- when 'reload' then window.location.reload()
- when 'reboot' then window.location = '/'
- when 'hard-reload' then app.reload()
- when 'reset' then app.reset() if confirm('Are you sure you want to reset DevDocs?')
+ when 'back' then history.back()
+ when 'reload' then window.location.reload()
+ when 'reboot' then app.reboot()
+ when 'hard-reload' then app.reload()
+ when 'reset' then app.reset() if confirm('Are you sure you want to reset DevDocs?')
+ when 'accept-analytics' then Cookies.set('analyticsConsent', '1', expires: 1e8) && app.reboot()
+ when 'decline-analytics' then Cookies.set('analyticsConsent', '0', expires: 1e8) && app.reboot()
return
diff --git a/assets/javascripts/views/layout/resizer.coffee b/assets/javascripts/views/layout/resizer.coffee
index 86bb46f5..5584bfbe 100644
--- a/assets/javascripts/views/layout/resizer.coffee
+++ b/assets/javascripts/views/layout/resizer.coffee
@@ -11,9 +11,6 @@ class app.views.Resizer extends app.View
init: ->
@el.setAttribute('draggable', 'true')
@appendTo $('._app')
-
- @style = $('style[data-resizer]')
- @size = @style.getAttribute('data-size')
return
MIN = 260
@@ -24,15 +21,11 @@ class app.views.Resizer extends app.View
return unless value > 0
value = Math.min(Math.max(Math.round(value), MIN), MAX)
newSize = "#{value}px"
- @style.innerHTML = @style.innerHTML.replace(new RegExp(@size, 'g'), newSize)
- @size = newSize
- if save
- app.settings.setSize(value)
- app.appCache?.updateInBackground()
+ document.documentElement.style.setProperty('--sidebarWidth', newSize)
+ app.settings.setSize(value) if save
return
onDragStart: (event) =>
- @style.removeAttribute('disabled')
event.dataTransfer.effectAllowed = 'link'
event.dataTransfer.setData('Text', '')
$.on(window, 'dragover', @onDrag)
diff --git a/assets/javascripts/views/layout/settings.coffee b/assets/javascripts/views/layout/settings.coffee
index 7888118a..6941b9cd 100644
--- a/assets/javascripts/views/layout/settings.coffee
+++ b/assets/javascripts/views/layout/settings.coffee
@@ -25,7 +25,6 @@ class app.views.Settings extends app.View
if super
@render()
document.body.classList.remove(SIDEBAR_HIDDEN_LAYOUT)
- app.appCache?.on 'progress', @onAppCacheProgress
return
deactivate: ->
@@ -33,7 +32,6 @@ class app.views.Settings extends app.View
@resetClass()
@docPicker.detach()
document.body.classList.add(SIDEBAR_HIDDEN_LAYOUT) if app.settings.hasLayout(SIDEBAR_HIDDEN_LAYOUT)
- app.appCache?.off 'progress', @onAppCacheProgress
return
render: ->
@@ -52,7 +50,7 @@ class app.views.Settings extends app.View
docs = @docPicker.getSelectedDocs()
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.uninstall ->
app.db.migrate()
@@ -83,9 +81,3 @@ class app.views.Settings extends app.View
$.stopEvent(event)
app.router.show '/'
return
-
- onAppCacheProgress: (event) =>
- if event.lengthComputable
- percentage = Math.round event.loaded * 100 / event.total
- @saveBtn.textContent = "Downloading\u2026 (#{percentage}%)"
- return
diff --git a/assets/javascripts/views/search/search.coffee b/assets/javascripts/views/search/search.coffee
index b6c83e1a..7d05f0a0 100644
--- a/assets/javascripts/views/search/search.coffee
+++ b/assets/javascripts/views/search/search.coffee
@@ -17,6 +17,7 @@ class app.views.Search extends app.View
typing: 'focus'
altG: 'google'
altS: 'stackoverflow'
+ altD: 'duckduckgo'
@routes:
after: 'afterRoute'
@@ -29,6 +30,9 @@ class app.views.Search extends app.View
.on 'results', @onResults
.on 'end', @onEnd
+ @scope
+ .on 'change', @onScopeChange
+
app.on 'ready', @onReady
$.on window, 'hashchange', @searchUrl
$.on window, 'focus', @onWindowFocus
@@ -113,6 +117,10 @@ class app.views.Search extends app.View
@externalSearch "https://stackoverflow.com/search?q="
return
+ duckduckgo: =>
+ @externalSearch "https://duckduckgo.com/?t=devdocs&q="
+ return
+
onResults: (results) =>
@hasResults = true if results.length
@trigger 'results', results, @flags
@@ -133,6 +141,11 @@ class app.views.Search extends app.View
$.stopEvent(event)
return
+ onScopeChange: =>
+ @value = ''
+ @onInput()
+ return
+
afterRoute: (name, context) =>
return if app.shortcuts.eventInProgress?.name is 'escape'
@reset(true) if not context.init and app.router.isIndex()
diff --git a/assets/javascripts/views/search/search_scope.coffee b/assets/javascripts/views/search/search_scope.coffee
index 24de57ce..52ff753a 100644
--- a/assets/javascripts/views/search/search_scope.coffee
+++ b/assets/javascripts/views/search/search_scope.coffee
@@ -6,7 +6,9 @@ class app.views.SearchScope extends app.View
tag: '._search-tag'
@events:
+ click: 'onClick'
keydown: 'onKeydown'
+ textInput: 'onTextInput'
@routes:
after: 'afterRoute'
@@ -87,17 +89,33 @@ class app.views.SearchScope extends app.View
@trigger 'change', null, previousDoc
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) =>
if event.which is 8 # backspace
- if @doc and not @input.value
- $.stopEvent(event)
+ if @doc and @input.selectionEnd is 0
@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
if event.which is 9 or # tab
(event.which is 32 and app.isMobile()) # space
- @search @input.value[0...@input.selectionStart]
- $.stopEvent(event) if @doc
+ @doScopeSearch(event)
+ return
+
+ onTextInput: (event) =>
+ return unless $.isChromeForAndroid()
+ if not @doc and @input.value and event.data == ' '
+ @doScopeSearch(event)
return
extractHashValue: ->
diff --git a/assets/javascripts/views/sidebar/sidebar.coffee b/assets/javascripts/views/sidebar/sidebar.coffee
index c8dc52a6..f3ae3bd4 100644
--- a/assets/javascripts/views/sidebar/sidebar.coffee
+++ b/assets/javascripts/views/sidebar/sidebar.coffee
@@ -28,7 +28,7 @@ class app.views.Sidebar extends app.View
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)
return
diff --git a/assets/stylesheets/application-dark.css.scss b/assets/stylesheets/application-dark.css.scss
deleted file mode 100644
index 4500f90f..00000000
--- a/assets/stylesheets/application-dark.css.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-//= depend_on docs-1.png
-//= depend_on docs-1@2x.png
-//= depend_on docs-2.png
-//= depend_on docs-2@2x.png
-
-/*!
- * Copyright 2013-2018 Thibaut Courouble and other contributors
- *
- * This source code is licensed under the terms of the Mozilla
- * Public License, v. 2.0, a copy of which may be obtained at:
- * http://mozilla.org/MPL/2.0/
- */
-
-@import 'global/variables-dark',
- 'global/mixins',
- 'global/icons',
- 'global/classes',
- 'global/base';
-
-@import 'components/app',
- 'components/header',
- 'components/notif',
- 'components/sidebar',
- 'components/settings',
- 'components/content',
- 'components/page',
- 'components/fail',
- 'components/path',
- 'components/notice',
- 'components/prism',
- 'components/mobile';
-
-@import 'pages/simple',
- 'pages/angular',
- 'pages/angularjs',
- 'pages/apache',
- 'pages/async',
- 'pages/bootstrap',
- 'pages/c',
- 'pages/cakephp',
- 'pages/clojure',
- 'pages/codeception',
- 'pages/coffeescript',
- 'pages/cordova',
- 'pages/crystal',
- 'pages/d',
- 'pages/d3',
- 'pages/dojo',
- 'pages/drupal',
- 'pages/elixir',
- 'pages/ember',
- 'pages/erlang',
- 'pages/express',
- 'pages/git',
- 'pages/github',
- 'pages/go',
- 'pages/haskell',
- 'pages/jekyll',
- 'pages/jquery',
- 'pages/julia',
- 'pages/knockout',
- 'pages/kotlin',
- 'pages/laravel',
- 'pages/liquid',
- 'pages/love',
- 'pages/lua',
- 'pages/mdn',
- 'pages/meteor',
- 'pages/modernizr',
- 'pages/moment',
- 'pages/nginx',
- 'pages/node',
- 'pages/npm',
- 'pages/openjdk',
- 'pages/perl',
- 'pages/phalcon',
- 'pages/phaser',
- 'pages/php',
- 'pages/phpunit',
- 'pages/postgres',
- 'pages/pug',
- 'pages/python',
- 'pages/ramda',
- 'pages/rdoc',
- 'pages/react_native',
- 'pages/redis',
- 'pages/rethinkdb',
- 'pages/rfc',
- 'pages/rubydoc',
- 'pages/rust',
- 'pages/sinon',
- 'pages/socketio',
- 'pages/sphinx',
- 'pages/sphinx_simple',
- 'pages/sqlite',
- 'pages/support_tables',
- 'pages/tcl_tk',
- 'pages/tensorflow',
- 'pages/terraform',
- 'pages/underscore',
- 'pages/vue',
- 'pages/webpack',
- 'pages/yard',
- 'pages/yii';
diff --git a/assets/stylesheets/application.css.scss b/assets/stylesheets/application.css.scss
index f7321135..4374e60c 100644
--- a/assets/stylesheets/application.css.scss
+++ b/assets/stylesheets/application.css.scss
@@ -1,17 +1,18 @@
-//= depend_on docs-1.png
-//= depend_on docs-1@2x.png
-//= depend_on docs-2.png
-//= depend_on docs-2@2x.png
+//= depend_on sprites/docs.png
+//= depend_on sprites/docs@2x.png
+//= depend_on sprites/docs.json
/*!
- * Copyright 2013-2018 Thibaut Courouble and other contributors
+ * Copyright 2013-2019 Thibaut Courouble and other contributors
*
* This source code is licensed under the terms of the Mozilla
* Public License, v. 2.0, a copy of which may be obtained at:
* http://mozilla.org/MPL/2.0/
*/
-@import 'global/variables',
+@import 'global/variables-light',
+ 'global/variables-dark',
+ 'global/variables',
'global/mixins',
'global/icons',
'global/classes',
@@ -35,6 +36,7 @@
'pages/angularjs',
'pages/apache',
'pages/async',
+ 'pages/bash',
'pages/bootstrap',
'pages/c',
'pages/cakephp',
@@ -43,8 +45,10 @@
'pages/coffeescript',
'pages/cordova',
'pages/crystal',
+ 'pages/cypress',
'pages/d',
'pages/d3',
+ 'pages/dart',
'pages/dojo',
'pages/drupal',
'pages/elixir',
@@ -54,6 +58,7 @@
'pages/git',
'pages/github',
'pages/go',
+ 'pages/graphite',
'pages/haskell',
'pages/jekyll',
'pages/jquery',
@@ -80,6 +85,7 @@
'pages/postgres',
'pages/pug',
'pages/python',
+ 'pages/qt',
'pages/ramda',
'pages/rdoc',
'pages/react_native',
@@ -88,6 +94,7 @@
'pages/rfc',
'pages/rubydoc',
'pages/rust',
+ 'pages/scala',
'pages/sinon',
'pages/socketio',
'pages/sphinx',
@@ -100,5 +107,6 @@
'pages/underscore',
'pages/vue',
'pages/webpack',
+ 'pages/wordpress',
'pages/yard',
'pages/yii';
diff --git a/assets/stylesheets/components/_app.scss b/assets/stylesheets/components/_app.scss
index ee76fe2f..96e09938 100644
--- a/assets/stylesheets/components/_app.scss
+++ b/assets/stylesheets/components/_app.scss
@@ -1,6 +1,6 @@
-html._booting { background: $contentBackground; }
+html._booting { background: var(--contentBackground); }
body._max-width { background: none; }
-html._booting body._max-width { background: $documentBackground; }
+html._booting body._max-width { background: var(--documentBackground); }
._app {
position: relative;
@@ -15,8 +15,8 @@ html._booting body._max-width { background: $documentBackground; }
._max-width & {
margin: 0 auto;
- max-width: $maxWidth;
- background: $contentBackground;
- box-shadow: 1px 0 $headerBorder, -1px 0 $headerBorder;
+ max-width: var(--maxWidth);
+ background: var(--contentBackground);
+ box-shadow: 1px 0 var(--headerBorder), -1px 0 var(--headerBorder);
}
}
diff --git a/assets/stylesheets/components/_content.scss b/assets/stylesheets/components/_content.scss
index 18f2e51d..c8b1863c 100644
--- a/assets/stylesheets/components/_content.scss
+++ b/assets/stylesheets/components/_content.scss
@@ -4,13 +4,13 @@
._container {
position: relative;
- z-index: $contentZ;
+ z-index: var(--contentZ);
height: 100%;
- margin-left: $sidebarWidth;
+ margin-left: var(--sidebarWidth);
pointer-events: none;
@extend %border-box;
- @media #{$mediumScreen} { margin-left: $sidebarMediumWidth; }
+ @include mobile { margin-left: var(--sidebarMediumWidth); }
._sidebar-hidden & { margin-left: 0; }
body:not(._native-scrollbars) & { -webkit-margin-end: -1px; }
@@ -30,7 +30,7 @@
._sidebar-hidden &:before {
content: '';
display: block;
- margin-top: $headerHeight;
+ margin-top: var(--headerHeight);
}
._overlay-scrollbars & { padding-left: .625rem; }
@@ -54,7 +54,7 @@
font-size: 4rem;
font-weight: 300;
letter-spacing: -.125rem;
- color: $loadingText;
+ color: var(--loadingText);
text-align: center;
cursor: default;
}
@@ -68,7 +68,7 @@
//
._splash-title {
- color: $splashText;
+ color: var(--splashText);
@extend %loading, %user-select-none;
}
@@ -88,7 +88,7 @@
min-height: calc(100vh - 2.375rem);
._sidebar-hidden & {
- min-height: calc(100vh - 2.375rem - #{$headerHeight});
+ min-height: calc(100vh - 2.375rem - var(--headerHeight));
}
}
@@ -140,12 +140,12 @@
._error-text {
margin: 0 0 1rem;
- color: $textColorLight;
+ color: var(--textColorLight);
}
._error-links {
font-size: 1rem;
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
}
._error-link { padding: 0 .5rem; }
@@ -167,7 +167,7 @@
height: 1px;
margin-top: .25rem;
margin-left: 1rem;
- background: $boxBorderLight;
+ background: var(--boxBorderLight);
}
}
@@ -197,7 +197,7 @@
._toc-title {
margin: 0 0 .5rem;
font-size: inherit;
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
}
._toc-list {
@@ -252,7 +252,7 @@
._docs-size {
text-align: right;
- > small { color: $textColorLight; }
+ > small { color: var(--textColorLight); }
}
._docs-tools {
@@ -285,7 +285,7 @@
padding: 0 .75rem;
}
._btn-link:not(._show) { display: none; }
- ._btn-link._show ~ ._btn-link._show { border-left: 1px solid $boxBorder; }
+ ._btn-link._show ~ ._btn-link._show { border-left: 1px solid var(--boxBorder); }
}
//
@@ -297,7 +297,7 @@
position: relative;
padding-left: 10em;
font-size: .8125rem;
- color: $textColorLight;
+ color: var(--textColorLight);
+ ._news-row { margin-top: 1em; }
}
@@ -305,7 +305,7 @@
._news-title {
display: block;
font-size: .875rem;
- color: $textColor;
+ color: var(--textColor);
}
._news-date {
@@ -372,12 +372,12 @@
// Utilities
//
-._bold { font-weight: $boldFontWeight; }
+._bold { font-weight: var(--boldFontWeight); }
._note { @extend %note; }
._note-green { @extend %note-green; }
._label { @extend %label; }
._code { @extend %code; }
-._highlight { background: $highlightBackground !important; }
+._highlight { background: var(--highlightBackground) !important; }
._table { width: 100%; }
._mobile ._table { overflow-x: auto; }
@@ -396,12 +396,9 @@
pre:hover > & { display: block; }
&:hover { opacity: 1; }
- > svg { @extend %svg-icon; }
-
- @if $style == 'dark' {
- > svg { fill: white; }
- } @else {
- > svg { fill: black; }
+ > svg {
+ @extend %svg-icon;
+ fill: var(--absolute);
}
&._pre-clip-success > svg,
@@ -419,15 +416,13 @@
line-height: normal;
white-space: nowrap;
padding: .375rem .675rem;
- background-image: linear-gradient(lighten($boxBackground, 4%), darken($boxBackground, 2%));
- border: 1px solid $boxBorder;
+ background-color: var(--boxBackground);
+ border: 1px solid var(--boxBorder);
border-radius: 3px;
- box-shadow: 0 1px rgba($boxBorder, .08);
cursor: pointer;
&:active {
- background-color: $boxBackground;
- box-shadow: inset 0 1px 1px rgba(black, .05), inset 0 1px 4px $boxBorder;
+ box-shadow: inset 0 1px 1px rgba(black, .05), inset 0 1px 4px var(--boxBorder);
}
}
@@ -447,22 +442,23 @@
._btn-link {
line-height: inherit;
- color: $linkColor;
- text-decoration: $linkTextDecoration;
+ color: var(--linkColor);
+ text-decoration: var(--linkTextDecoration);
&:hover {
- color: $linkColorHover;
+ color: var(--linkColorHover);
text-decoration: underline;
}
}
._reset-btn,
._reset-btn:hover {
- color: $textColorRed;
+ color: var(--textColorRed);
}
._github-btn {
display: inline-block;
vertical-align: text-top;
margin-left: .25rem;
+ background: inherit;
}
diff --git a/assets/stylesheets/components/_fail.scss b/assets/stylesheets/components/_fail.scss
index c1cf4653..c520977e 100644
--- a/assets/stylesheets/components/_fail.scss
+++ b/assets/stylesheets/components/_fail.scss
@@ -1,4 +1,4 @@
-._fail {
+._fail { // Don't use CSS variables, in case the browser doesn't support them.
display: block;
position: relative;
top: 1.5rem;
@@ -23,7 +23,7 @@
._fail-title {
margin: 0 0 1rem;
font-size: 1rem;
- font-weight: $boldFontWeight;
+ font-weight: bold;
}
._fail-text, ._fail-list {
@@ -32,5 +32,3 @@
}
._fail-text:last-child { margin: 0; }
-
-._fail-link { float: right; }
diff --git a/assets/stylesheets/components/_header.scss b/assets/stylesheets/components/_header.scss
index 37f9268d..e74830aa 100644
--- a/assets/stylesheets/components/_header.scss
+++ b/assets/stylesheets/components/_header.scss
@@ -4,20 +4,20 @@
._header {
position: absolute;
- z-index: $headerZ;
+ z-index: var(--headerZ);
top: 0;
left: 0;
display: -ms-flexbox;
display: flex;
- width: $sidebarWidth;
- height: $headerHeight;
- background: $headerBackground;
- border-bottom: 1px solid $headerBorder;
- border-right: 1px solid $headerBorder;
+ width: var(--sidebarWidth);
+ height: var(--headerHeight);
+ background: var(--headerBackground);
+ border-bottom: 1px solid var(--headerBorder);
+ border-right: 1px solid var(--headerBorder);
@extend %border-box;
@extend %user-select-none;
- @media #{$mediumScreen} { width: $sidebarMediumWidth; }
+ @include mobile { width: var(--sidebarMediumWidth); }
}
._header-left {
@@ -35,7 +35,7 @@
flex: 0 0 auto;
width: 2.25rem;
height: 100%;
- color: $textColorLight;
+ color: var(--textColorLight);
text-align: center;
&[hidden] { display: none; }
@@ -67,8 +67,8 @@
word-wrap: normal;
overflow-wrap: normal;
font-size: .875rem;
- background: $contentBackground;
- border: 1px solid $headerBorder;
+ background: var(--contentBackground);
+ border: 1px solid var(--headerBorder);
border-radius: 3px;
box-shadow: -1px 1px 1px rgba(black, .05);
transition: all 0ms cubic-bezier(0.23, 1, 0.32, 1) 1ms;
@@ -98,10 +98,10 @@
margin: 0;
line-height: 1.5rem;
font-size: 1rem;
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
letter-spacing: -.5px;
- background: $sidebarBackground;
- border-bottom: 1px solid $sidebarBorder;
+ background: var(--sidebarBackground);
+ border-bottom: 1px solid var(--sidebarBorder);
border-radius: 2px 2px 0 0;
}
@@ -109,7 +109,7 @@
._menu-title-link:hover {
display: block;
padding: .5rem 1rem;
- color: $focusText;
+ color: var(--focusText);
text-decoration: none;
}
@@ -121,9 +121,9 @@
text-decoration: none;
&:hover {
- color: $focusText;
+ color: var(--focusText);
text-decoration: none;
- background: $sidebarBackground;
+ background: var(--sidebarBackground);
}
&:last-child { border-radius: 0 0 2px 2px; }
@@ -151,11 +151,7 @@
opacity: .42;
@extend %svg-icon;
- @if $style == 'dark' {
- fill: white;
- } @else {
- fill: black;
- }
+ fill: var(--absolute);
}
}
@@ -166,21 +162,19 @@
height: 100%;
padding: 0 .75rem 1px 1.75rem;
font-size: .875rem;
- background: $contentBackground;
+ background: var(--contentBackground);
border: 1px solid;
- border-color: darken($headerBorder, 2%);
+ border-color: var(--searchBorder);
border-radius: 3px;
&:focus {
outline: 0;
- @if $inputFocusBorder {
- border-color: $inputFocusBorder;
- box-shadow: 0 0 1px $inputFocusBorder;
- }
+ border-color: var(--inputFocusBorder);
+ box-shadow: 0 0 1px var(--inputFocusBorder);
}
&[disabled] {
- background: $sidebarBackground;
+ background: var(--sidebarBackground);
cursor: not-allowed;
}
}
@@ -202,13 +196,9 @@
top: .5rem;
left: .375rem;
@extend %svg-icon;
+ fill: var(--absolute);
}
- @if $style == 'dark' {
- > svg { fill: white; }
- } @else {
- > svg { fill: black; }
- }
._search-active > & { display: block; }
}
@@ -222,8 +212,9 @@
line-height: 1.25rem;
max-width: 50%;
font-size: .8125rem;
- color: $textColorLight;
- background: darken($headerBackground, 5%);
+ color: var(--textColorLight);
+ background: var(--searchTagBackground);
border-radius: 2px;
+ cursor: pointer;
@extend %truncate-text;
}
diff --git a/assets/stylesheets/components/_mobile.scss b/assets/stylesheets/components/_mobile.scss
index 34ad7dbe..bdfe01fd 100644
--- a/assets/stylesheets/components/_mobile.scss
+++ b/assets/stylesheets/components/_mobile.scss
@@ -4,7 +4,7 @@
._mobile {
font-size: 100%;
- background: $contentBackground;
+ background: var(--contentBackground);
._hide-on-mobile { display: none; }
@@ -18,7 +18,7 @@
._container {
margin: 0;
- padding-top: $headerHeight;
+ padding-top: var(--headerHeight);
}
._content {
diff --git a/assets/stylesheets/components/_notice.scss b/assets/stylesheets/components/_notice.scss
index 0dba80ae..1e8cd381 100644
--- a/assets/stylesheets/components/_notice.scss
+++ b/assets/stylesheets/components/_notice.scss
@@ -1,15 +1,15 @@
._notice {
position: absolute;
- z-index: $noticeZ;
+ z-index: var(--noticeZ);
bottom: 0;
- left: $sidebarWidth;
+ left: var(--sidebarWidth);
right: 0;
height: 2.5rem;
padding: 0 1.25rem;
- background: $noticeBackground;
- box-shadow: inset 0 1px $noticeBorder;
+ background: var(--noticeBackground);
+ box-shadow: inset 0 1px var(--noticeBorder);
- @media #{$mediumScreen} { left: $sidebarMediumWidth; }
+ @include mobile { left: var(--sidebarMediumWidth); }
._sidebar-hidden & { left: 0; }
diff --git a/assets/stylesheets/components/_notif.scss b/assets/stylesheets/components/_notif.scss
index a47d396d..f0880fdd 100644
--- a/assets/stylesheets/components/_notif.scss
+++ b/assets/stylesheets/components/_notif.scss
@@ -7,9 +7,9 @@
max-width: 90%;
padding: .625rem 1rem;
font-size: .75rem;
- color: $notifColor;
- background: $notifBackground;
- border: $notifBorder;
+ color: var(--notifColor);
+ background: var(--notifBackground);
+ border: var(--notifBorder);
border-radius: .25rem;
transition: opacity .2s;
opacity: 0;
@@ -30,7 +30,7 @@
._notif-info {
float: right;
- color: $notifColorLight;
+ color: var(--notifColorLight);
}
._notif-link,
@@ -69,13 +69,13 @@
&::-webkit-scrollbar { width: 10px !important; }
&::-webkit-scrollbar-track {
- background: $notifBackground !important;
+ background: var(--notifBackground) !important;
border: 0 !important;
border-radius: 5px !important;
}
&::-webkit-scrollbar-thumb {
- border: 3px solid $notifBackground !important;
+ border: 3px solid var(--notifBackground) !important;
&:hover, &:active { border-width: 2px !important; }
}
@@ -90,7 +90,7 @@
> ._news-row {
line-height: 1.125rem;
font-size: .6875rem;
- color: $notifColorLight;
+ color: var(--notifColorLight);
margin-bottom: .25rem;
+ ._news-row { margin-top: .625rem; }
@@ -107,7 +107,7 @@
._news-date {
float: right;
margin-left: 1rem;
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
}
code {
@@ -128,9 +128,13 @@
}
._notif-tip {
- color: $textColor;
- background: $tipBackground;
- border: $tipBorder;
+ color: var(--textColor);
+ background: var(--tipBackground);
+ border: var(--tipBorder);
- ._notif-info { color: $textColorLight; }
+ ._notif-info { color: var(--textColorLight); }
+}
+
+._notif-right {
+ float: right;
}
diff --git a/assets/stylesheets/components/_page.scss b/assets/stylesheets/components/_page.scss
index 99771443..60a970b9 100644
--- a/assets/stylesheets/components/_page.scss
+++ b/assets/stylesheets/components/_page.scss
@@ -23,7 +23,7 @@
max-width: 100%;
margin-bottom: 1em;
padding: 1px;
- border: 1px dotted $boxBorder;
+ border: 1px dotted var(--boxBorder);
border-radius: 3px;
@extend %border-box;
}
@@ -50,7 +50,7 @@
display: inline-block;
vertical-align: top;
padding: 0 .5rem;
- background: $contentBackground;
+ background: var(--contentBackground);
@extend %internal-link;
& + & { margin-left: .75rem; }
@@ -66,7 +66,7 @@
clear: both;
margin: 2rem 0 1.5rem;
font-size: .75rem;
- color: $textColorLight;
+ color: var(--textColorLight);
text-align: center;
-webkit-font-smoothing: subpixel-antialiased;
@@ -78,7 +78,7 @@
display: inline-block;
margin: 0;
padding: .25rem .75rem;
- background: $labelBackground;
+ background: var(--labelBackground);
border-radius: 3px;
}
diff --git a/assets/stylesheets/components/_path.scss b/assets/stylesheets/components/_path.scss
index 1d68936f..5853fa04 100644
--- a/assets/stylesheets/components/_path.scss
+++ b/assets/stylesheets/components/_path.scss
@@ -1,17 +1,17 @@
._path {
position: absolute;
- z-index: $noticeZ - 1;
+ z-index: var(--headerZ);
bottom: 0;
- left: $sidebarWidth;
+ left: var(--sidebarWidth);
right: 0;
height: 2rem;
line-height: 2rem;
padding: 0 .375rem;
font-size: .875rem;
- background: $pathBackground;
- box-shadow: inset 0 1px $pathBorder;
+ background: var(--pathBackground);
+ box-shadow: inset 0 1px var(--pathBorder);
- @media #{$mediumScreen} { left: $sidebarMediumWidth; }
+ @include mobile { left: var(--sidebarMediumWidth); }
._sidebar-hidden & { left: 0; }
@@ -24,7 +24,7 @@
display: inline-block;
vertical-align: top;
padding: 0 .375rem;
- color: $textColor;
+ color: var(--textColor);
text-decoration: none;
&:first-child:before {
diff --git a/assets/stylesheets/components/_prism.scss b/assets/stylesheets/components/_prism.scss
index 405fd436..4d01f8cb 100644
--- a/assets/stylesheets/components/_prism.scss
+++ b/assets/stylesheets/components/_prism.scss
@@ -1,9 +1,26 @@
+html {
+ --prismValue: #905;
+ --prismText: #5e8e01;
+ --prismOperator: #a67f59;
+ --prismKeyword: #0070a3;
+ --prismFunction: #dd4a68;
+ --prismVariable: #e90;
+}
+html._theme-dark {
+ --prismValue: #eb8160;
+ --prismText: #ddcf88;
+ --prismOperator: #b1c676;
+ --prismKeyword: #91b3ed;
+ --prismFunction: #c79e6b;
+ --prismVariable: #e9c062;
+}
+
.token.comment,
.token.prolog,
.token.doctype,
.token.cdata,
.token.punctuation {
- color: $textColorLight;
+ color: var(--textColorLight);
}
.namespace {
@@ -17,11 +34,7 @@
.token.constant,
.token.symbol,
.token.deleted {
- @if $style == 'dark' {
- color: #eb8160;
- } @else {
- color: #905;
- }
+ color: var(--prismValue);
}
.token.selector,
@@ -30,11 +43,7 @@
.token.char,
.token.builtin,
.token.inserted {
- @if $style == 'dark' {
- color: #ddcf88;
- } @else {
- color: #5e8e01;
- }
+ color: var(--prismText);
}
.token.operator,
@@ -42,44 +51,28 @@
.token.url,
.language-css .token.string,
.style .token.string {
- @if $style == 'dark' {
- color: #b1c676;
- } @else {
- color: #a67f59;
- }
+ color: var(--prismOperator);
}
.token.atrule,
.token.attr-value,
.token.keyword {
- @if $style == 'dark' {
- color: #91b3ed;
- } @else {
- color: #0070a3;
- }
+ color: var(--prismKeyword);
}
.token.function {
- @if $style == 'dark' {
- color: #c79e6b;
- } @else {
- color: #dd4a68;
- }
+ color: var(--prismFunction);
}
.token.regex,
.token.important,
.token.variable {
- @if $style == 'dark' {
- color: #e9c062;
- } @else {
- color: #e90;
- }
+ color: var(--prismVariable);
}
.token.important,
.token.bold {
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
}
.token.italic {
diff --git a/assets/stylesheets/components/_settings.scss b/assets/stylesheets/components/_settings.scss
index c1134041..86bbf005 100644
--- a/assets/stylesheets/components/_settings.scss
+++ b/assets/stylesheets/components/_settings.scss
@@ -7,15 +7,15 @@
position: absolute;
top: 0;
bottom: 0;
- z-index: $headerZ;
+ z-index: var(--headerZ);
&._in { display: block; }
> ._header { justify-content: space-between; }
&._dirty > ._header {
- background: $noteGreenBackground;
- border-color: $noteGreenBorder;
+ background: var(--noteGreenBackground);
+ border-color: var(--noteGreenBorder);
}
}
@@ -37,7 +37,7 @@
padding-right: .5rem;
line-height: inherit;
font-size: inherit;
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
text-align: right;
@extend %border-box;
}
@@ -52,7 +52,7 @@
> small {
display: block;
- color: $textColorLight;
+ color: var(--textColorLight);
margin-left: 1.75rem;
}
@@ -62,7 +62,7 @@
}
}
-@media (max-width: $maxWidth) {
+@media (max-width: 80rem) {
._setting-max-width { display: none; }
}
@@ -80,7 +80,7 @@
line-height: 1.5rem;
padding: 0 .75rem;
font-size: .875rem;
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
color: inherit;
text-align: left;
cursor: pointer;
@@ -119,12 +119,12 @@
position: relative;
vertical-align: top;
padding: 0 .75rem;
- line-height: $headerHeight;
- color: $textColorLight;
+ line-height: var(--headerHeight);
+ color: var(--textColorLight);
&.active {
- color: $textColor;
- font-weight: $boldFontWeight;
- box-shadow: inset 0 -2px $linkColor;
+ color: var(--textColor);
+ font-weight: var(--boldFontWeight);
+ box-shadow: inset 0 -2px var(--linkColor);
}
}
diff --git a/assets/stylesheets/components/_sidebar.scss b/assets/stylesheets/components/_sidebar.scss
index e38ed4d2..8813f92d 100644
--- a/assets/stylesheets/components/_sidebar.scss
+++ b/assets/stylesheets/components/_sidebar.scss
@@ -4,14 +4,14 @@
._sidebar {
position: absolute;
- z-index: $sidebarZ;
+ z-index: var(--sidebarZ);
top: 0;
bottom: 0;
left: 0;
overflow-x: hidden;
overflow-y: scroll;
- padding-top: $headerHeight;
- background: $sidebarBackground;
+ padding-top: var(--headerHeight);
+ background: var(--sidebarBackground);
background-clip: content-box;
-webkit-overflow-scrolling: touch;
-ms-overflow-style: none; // IE 10 doesn't support pointer-events
@@ -22,13 +22,13 @@
._overlay-scrollbars & {
padding-top: 0;
- top: $headerHeight;
+ top: var(--headerHeight);
}
body:not(._native-scrollbars) & {
&::-webkit-scrollbar { width: 10px; }
&::-webkit-scrollbar-track {
- background: $contentBackground;
+ background: var(--contentBackground);
border: 0;
}
&::-webkit-scrollbar-thumb {
@@ -52,10 +52,10 @@
._resizer {
position: absolute;
- z-index: $sidebarZ + 1;
- top: $headerHeight;
- bottom: $headerHeight;
- left: $sidebarWidth;
+ z-index: var(--headerZ);
+ top: var(--headerHeight);
+ bottom: var(--headerHeight);
+ left: var(--sidebarWidth);
margin-left: -2px;
width: 3px;
cursor: col-resize;
@@ -72,11 +72,11 @@
margin: 0;
padding: 0;
list-style: none;
- width: $sidebarWidth;
- box-shadow: inset -1px 0 $sidebarBorder;
+ width: var(--sidebarWidth);
+ box-shadow: inset -1px 0 var(--sidebarBorder);
@extend %border-box;
- @media #{$mediumScreen} { width: $sidebarMediumWidth; }
+ @include mobile { width: var(--sidebarMediumWidth); }
._sidebar > & { min-height: 100%; }
@@ -89,7 +89,7 @@
padding: 0 .75rem 0 2.125rem;
line-height: 2rem;
font-size: .75rem;
- color: $textColorLight;
+ color: var(--textColorLight);
text-transform: uppercase;
cursor: default;
}
@@ -110,8 +110,8 @@
line-height: 1.5rem;
font-size: .875rem;
cursor: default;
- background: $sidebarBackground;
- box-shadow: inset -1px 0 $sidebarBorder;
+ background: var(--sidebarBackground);
+ box-shadow: inset -1px 0 var(--sidebarBorder);
@extend %truncate-text;
&, &:hover {
@@ -123,16 +123,16 @@
&.focus:hover,
&.active,
&.active:hover {
- color: $focusText;
- background: $focusBackground;
- box-shadow: inset -1px 0 $focusBorder;
+ color: var(--focusText);
+ background: var(--focusBackground);
+ box-shadow: inset -1px 0 var(--focusBorder);
}
&.active,
&.active:hover {
- color: $selectionText;
- background: $selectionBackground;
- box-shadow: inset -1px 0 $selectionBorder;
+ color: var(--selectionText);
+ background: var(--selectionBackground);
+ box-shadow: inset -1px 0 var(--selectionBorder);
}
&:before {
@@ -160,7 +160,7 @@
}
._list-count {
- color: $textColorLighter;
+ color: var(--textColorLighter);
pointer-events: none;
._list-disabled:hover > & { display: none; }
@@ -168,7 +168,7 @@
._list-enable {
display: none;
- color: $linkColor;
+ color: var(--linkColor);
cursor: pointer;
&:hover { text-decoration: underline; }
@@ -188,7 +188,7 @@
._list-disabled {
@extend %_list-dir;
- &, &:hover { color: $textColorLight; }
+ &, &:hover { color: var(--textColorLight); }
&:before { opacity: .7; }
}
@@ -200,11 +200,9 @@
width: 1rem;
height: 1rem;
cursor: pointer;
- fill: black;
+ fill: var(--absolute);
opacity: .4;
- @if $style == 'dark' { fill: white; }
-
&:hover { opacity: .65; }
._list-rdir > & {
@@ -239,11 +237,11 @@
//
._list-pagelink {
- color: $linkColor;
+ color: var(--linkColor);
cursor: pointer;
&:hover {
- color: $linkColorHover;
+ color: var(--linkColorHover);
text-decoration: underline;
}
}
@@ -275,9 +273,9 @@
left: .75rem;
width: .75rem;
height: 1px;
- background: rgba($selectionText, .9);
- box-shadow: 0 -3px rgba($selectionText, .9), // top line
- 0 3px rgba($selectionText, .9); // bottom line
+ background: var(--transparentSelectionText);
+ box-shadow: 0 -3px var(--transparentSelectionText), // top line
+ 0 3px var(--transparentSelectionText); // bottom line
}
}
@@ -289,7 +287,7 @@
padding: .5rem .75rem;
line-height: 1.25rem;
font-size: .8125rem;
- color: $textColorLight;
+ color: var(--textColorLight);
& + & { padding-top: 0; }
}
@@ -303,9 +301,9 @@
._list-hover.clone {
position: fixed;
overflow: visible;
- z-index: $hoverZ;
+ z-index: var(--hoverZ);
left: 0;
- min-width: $sidebarWidth;
+ min-width: var(--sidebarWidth);
padding: .25rem .75rem;
pointer-events: none;
-webkit-font-smoothing: subpixel-antialiased;
@@ -313,7 +311,7 @@
transform: translate3d(0, 0, 0);
@extend %border-box;
- @media #{$mediumScreen} { min-width: $sidebarMediumWidth; }
+ @include mobile { min-width: var(--sidebarMediumWidth); }
> ._list-text { display: inline; }
@@ -346,10 +344,10 @@
padding: .5rem .75rem .25rem .75rem;
line-height: 1.5rem;
font-size: .75rem;
- font-weight: $bolderFontWeight;
- color: $textColorLight;
+ font-weight: var(--bolderFontWeight);
+ color: var(--textColorLight);
text-transform: uppercase;
- background: linear-gradient(to bottom, $sidebarBackground, $sidebarBackground 75%, rgba($sidebarBackground, 0));
+ background: linear-gradient(to bottom, var(--sidebarBackground), var(--sidebarBackground) 75%, var(--transparentSidebarBackground));
cursor: default;
}
diff --git a/assets/stylesheets/global/_base.scss b/assets/stylesheets/global/_base.scss
index 33c77a5e..b81d5a93 100644
--- a/assets/stylesheets/global/_base.scss
+++ b/assets/stylesheets/global/_base.scss
@@ -1,9 +1,10 @@
html {
height: 100%;
font-size: 100%;
- background: $documentBackground;
+ background: #fff; // fallback to show the error message to browsers that don't support CSS variables.
+ background: var(--documentBackground);
- @media #{$mediumScreen} { font-size: 93.75%; }
+ @include mobile { font-size: 93.75%; }
@include print { background: none; }
@import 'global/print';
@@ -17,10 +18,11 @@ body {
font-weight: normal;
font-family: $baseFont;
line-height: 1.7;
- color: $textColor;
+ color: $textColor; // fallback to show the error message to browsers that don't support CSS variables.
+ color: var(--textColor);
word-wrap: break-word;
overflow-wrap: break-word;
- background: $contentBackground;
+ background: var(--contentBackground);
touch-action: manipulation;
-webkit-tap-highlight-color: rgba(black, 0);
-webkit-touch-callout: none;
@@ -29,11 +31,11 @@ body {
}
a {
- color: $linkColor;
- text-decoration: $linkTextDecoration;
+ color: var(--linkColor);
+ text-decoration: var(--linkTextDecoration);
&:hover {
- color: $linkColorHover;
+ color: var(--linkColorHover);
text-decoration: underline;
}
}
@@ -47,7 +49,7 @@ img {
h1, h2, h3, h4, h5, h6 {
margin: 1.5em 0 1em;
line-height: 1.3;
- font-weight: $bolderFontWeight;
+ font-weight: var(--bolderFontWeight);
}
h1 { font-size: 1.5em; }
@@ -59,7 +61,7 @@ h5, h6 { font-size: 1em; }
p { margin: 0 0 1em; }
p:last-child { margin-bottom: 0; }
-b, strong { font-weight: $boldFontWeight; }
+b, strong { font-weight: var(--boldFontWeight); }
small { font-size: .9em; }
@@ -79,7 +81,7 @@ li > ul, li > ol, dd > ul, dd > ol { margin: .5em 0; }
li > p { margin-bottom: .25em; }
dl { margin: 1.5em 0; }
-dt { font-weight: $boldFontWeight; }
+dt { font-weight: var(--boldFontWeight); }
dd {
margin: .375em;
padding-left: 1em;
@@ -91,15 +93,15 @@ dfn, var { font-style: normal; }
abbr, acronym, dfn {
cursor: help;
- border-bottom: 1px dotted $textColor;
+ border-bottom: 1px dotted var(--textColor);
}
pre, code, samp, %pre, %code {
- font-family: $monoFont;
+ font-family: var(--monoFont);
font-weight: normal;
font-style: normal;
font-size: .9em;
- color: $textColor;
+ color: var(--textColor);
white-space: pre-wrap;
direction: ltr;
-moz-tab-size: 2;
@@ -121,14 +123,14 @@ a > code { color: inherit; }
table {
margin: 1.5em 0;
background: none;
- border: 1px solid $boxBorder;
+ border: 1px solid var(--boxBorder);
border-collapse: separate;
border-spacing: 0;
border-radius: 3px;
}
caption {
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
padding: 0 .7em .3em;
}
@@ -142,15 +144,15 @@ th, td {
}
th {
- font-weight: $boldFontWeight;
+ font-weight: var(--boldFontWeight);
border: 0;
- border-bottom: 1px solid $boxBorder;
+ border-bottom: 1px solid var(--boxBorder);
border-radius: 0;
@extend %heading-box;
&:empty { background: none; }
- + th, + td { border-left: 1px solid $boxBorder; }
+ + th, + td { border-left: 1px solid var(--boxBorder); }
tr:first-child > &:first-child { border-top-left-radius: 3px; }
tr:first-child > &:last-child { border-top-right-radius: 3px; }
@@ -161,10 +163,10 @@ th {
}
td {
- background: $contentBackground;
- border-bottom: 1px solid $boxBorderLight;
+ background: var(--contentBackground);
+ border-bottom: 1px solid var(--boxBorderLight);
- + td { border-left: 1px solid $boxBorderLight; }
+ + td { border-left: 1px solid var(--boxBorderLight); }
tr:last-child > & { border-bottom: 0; }
> pre:only-child, > p:only-child, > ul:only-child, > ol:only-child {
@@ -190,7 +192,7 @@ input, button {
margin: 0;
font-family: inherit;
font-size: 100%;
- color: $textColor;
+ color: var(--textColor);
line-height: normal;
@extend %border-box;
}
@@ -218,6 +220,10 @@ button:focus {
outline: -webkit-focus-ring-color auto 5px;
}
+img, iframe {
+ background: var(--externalsBackground);
+}
+
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
@@ -230,9 +236,9 @@ input[type="search"]::-webkit-search-decoration {
border: 0 !important;
}
-::-webkit-input-placeholder { color: $textColorLighter; }
-::-moz-placeholder { color: $textColorLighter; opacity: 1; }
-:-ms-input-placeholder { color: $textColorLighter; }
+::-webkit-input-placeholder { color: var(--textColorLighter); }
+::-moz-placeholder { color: var(--textColorLighter); opacity: 1; }
+:-ms-input-placeholder { color: var(--textColorLighter); }
body:not(._native-scrollbars) {
*::-webkit-scrollbar { -webkit-appearance: none; }
@@ -243,12 +249,12 @@ body:not(._native-scrollbars) {
*::-webkit-scrollbar-corner { display: none; }
*::-webkit-scrollbar-track {
- background: $contentBackground;
- border: 1px solid $contentBackground;
+ background: var(--contentBackground);
+ border: 1px solid var(--contentBackground);
&:hover {
- background: $sidebarBackground;
- border-color: $sidebarBorder;
+ background: var(--sidebarBackground);
+ border-color: var(--sidebarBorder);
}
&:vertical { border-width: 0 0 0 1px; }
@@ -266,14 +272,14 @@ body:not(._native-scrollbars) {
*::-webkit-scrollbar-thumb {
min-height: 2rem;
- background: $scrollbarColor;
+ background: var(--scrollbarColor);
background-clip: padding-box;
border: 5px solid rgba(black, 0);
border-radius: 10px;
&:hover,
&:active {
- background-color: $scrollbarColorHover;
+ background-color: var(--scrollbarColorHover);
border-width: 4px;
}
}
diff --git a/assets/stylesheets/global/_classes.scss b/assets/stylesheets/global/_classes.scss
index f96f617b..9e6b9332 100644
--- a/assets/stylesheets/global/_classes.scss
+++ b/assets/stylesheets/global/_classes.scss
@@ -36,15 +36,15 @@
//
%box {
- background: $boxBackground;
- border: 1px solid $boxBorder;
+ background: var(--boxBackground);
+ border: 1px solid var(--boxBorder);
border-radius: 3px;
}
%heading-box {
- color: $boxHeaderColor;
- background: $boxHeaderBackground;
- border: 1px solid $boxBorder;
+ color: var(--boxHeaderColor);
+ background: var(--boxHeaderBackground);
+ border: 1px solid var(--boxBorder);
border-radius: 3px;
}
@@ -82,15 +82,15 @@
%note {
margin: 1.5rem 0;
padding: .5rem .875rem;
- background: $noteBackground;
- border: 1px solid $noteBorder;
+ background: var(--noteBackground);
+ border: 1px solid var(--noteBorder);
border-radius: 3px;
}
%label {
margin: 0 1px;
padding: 1px 4px 2px;
- background: $labelBackground;
+ background: var(--labelBackground);
border-radius: 3px;
}
@@ -102,35 +102,35 @@
padding-right: .5em;
overflow: hidden;
font-size: inherit;
- color: $boxHeaderColor;
- border: 1px solid $boxBorder;
+ color: var(--boxHeaderColor);
+ border: 1px solid var(--boxBorder);
border-radius: 2px;
@extend %label;
}
%label-yellow {
- background: $noteBackground;
- border-color: $noteBorder;
+ background: var(--noteBackground);
+ border-color: var(--noteBorder);
}
%note-green, %label-green {
- background: $noteGreenBackground;
- border-color: $noteGreenBorder;
+ background: var(--noteGreenBackground);
+ border-color: var(--noteGreenBorder);
}
%note-blue, %label-blue {
- background: $noteBlueBackground;
- border-color: $noteBlueBorder;
+ background: var(--noteBlueBackground);
+ border-color: var(--noteBlueBorder);
}
%note-orange, %label-orange {
- background: $noteOrangeBackground;
- border-color: $noteOrangeBorder;
+ background: var(--noteOrangeBackground);
+ border-color: var(--noteOrangeBorder);
}
%note-red, %label-red {
- background: $noteRedBackground;
- border-color: $noteRedBorder;
+ background: var(--noteRedBackground);
+ border-color: var(--noteRedBorder);
}
//
@@ -149,12 +149,11 @@
pointer-events: none;
//