diff --git a/.eslintignore b/.eslintignore index d80776538..61d9db52e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,3 @@ /build /material /site -/lib diff --git a/.sass-lint.yml b/.sass-lint.yml index 17980a189..a302a49ab 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -73,7 +73,9 @@ rules: - break-at-device - break-from-device - break-to-device - nesting-depth: 2 + nesting-depth: + - 2 + - max-depth: 3 no-color-keywords: 2 no-color-literals: 2 no-css-comments: 2 @@ -100,7 +102,7 @@ rules: - order: smacss property-units: - 2 - - global: [rem, em, s] + - global: [rem, em, s, vh] pseudo-element: 2 quotes: - 2 diff --git a/lib/providers/jsx.js b/lib/providers/jsx.js index bf2d2a6ed..4f055bb09 100644 --- a/lib/providers/jsx.js +++ b/lib/providers/jsx.js @@ -31,7 +31,7 @@ export default /* JSX */ { * * @param {string} tag - Tag name * @param {object} properties - Properties - * @param {string|number|Array} children - Child nodes + * @param {...(string|number|Array)} children - Child nodes * @return {HTMLElement} Native DOM node */ createElement(tag, properties, ...children) { diff --git a/material/assets/javascripts/application.js b/material/assets/javascripts/application.js index edbd556e1..df727393d 100644 --- a/material/assets/javascripts/application.js +++ b/material/assets/javascripts/application.js @@ -2,41 +2,41 @@ var Application = /******/ (function(modules) { // webpackBootstrap /******/ // The module cache /******/ var installedModules = {}; -/******/ + /******/ // The require function /******/ function __webpack_require__(moduleId) { -/******/ + /******/ // Check if module is in cache /******/ if(installedModules[moduleId]) /******/ return installedModules[moduleId].exports; -/******/ + /******/ // Create a new module (and put it into the cache) /******/ var module = installedModules[moduleId] = { /******/ exports: {}, /******/ id: moduleId, /******/ loaded: false /******/ }; -/******/ + /******/ // Execute the module function /******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ + /******/ // Flag the module as loaded /******/ module.loaded = true; -/******/ + /******/ // Return the exports of the module /******/ return module.exports; /******/ } -/******/ -/******/ + + /******/ // expose the modules object (__webpack_modules__) /******/ __webpack_require__.m = modules; -/******/ + /******/ // expose the module cache /******/ __webpack_require__.c = installedModules; -/******/ + /******/ // __webpack_public_path__ /******/ __webpack_require__.p = ""; -/******/ + /******/ // Load entry module and return exports /******/ return __webpack_require__(0); /******/ }) @@ -46,11 +46,11 @@ var Application = /***/ function(module, exports, __webpack_require__) { "use strict"; - + Object.defineProperty(exports, "__esModule", { value: true }); - + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); /* * Copyright (c) 2016 Martin Donath * @@ -72,41 +72,41 @@ var Application = * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - + /* ---------------------------------------------------------------------------- * Imports * ------------------------------------------------------------------------- */ - + // import Expander from "./components/expander" - + var _fastclick = __webpack_require__(1); - + var _fastclick2 = _interopRequireDefault(_fastclick); - + var _lunr = __webpack_require__(3); - + var _lunr2 = _interopRequireDefault(_lunr); - + var _GithubSourceFacts = __webpack_require__(4); - + var _GithubSourceFacts2 = _interopRequireDefault(_GithubSourceFacts); - + var _Material = __webpack_require__(5); - + var _Material2 = _interopRequireDefault(_Material); - + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - + // import Search from './components/search'; - + /* ---------------------------------------------------------------------------- * Application * ------------------------------------------------------------------------- */ - + var Application = function () { - + /** * Constructor. * @@ -116,117 +116,131 @@ var Application = */ function Application(config) { _classCallCheck(this, Application); - + this.config = config; } - + /** * @return {void} */ - - + + _createClass(Application, [{ key: "initialize", value: function initialize() { var material = new _Material2.default(); material.initialize(); - + if (this.hasGithubRepo()) { var githubSource = new _GithubSourceFacts2.default(this.config.storage, this.config.repo.url); githubSource.initialize(); } } - + /** * Is this application about a Github repository? * * @return {bool} - true if `repo.icon` or `repo.url` contains 'github' */ - + }, { key: "hasGithubRepo", value: function hasGithubRepo() { return this.config.repo.icon === "github" || this.config.repo.url.includes("github"); } }]); - + return Application; }(); - + exports.default = Application; - + // TODO: wrap in function call // application module export - + /* Initialize application upon DOM ready */ - + document.addEventListener("DOMContentLoaded", function () { - + /* Test for iOS */ Modernizr.addTest("ios", function () { return !!navigator.userAgent.match(/(iPad|iPhone|iPod)/g); }); - + /* Test for web application context */ Modernizr.addTest("standalone", function () { return !!navigator.standalone; }); - + /* Attack FastClick to mitigate 300ms delay on touch devices */ _fastclick2.default.attach(document.body); - - var query = document.getElementById("query"); - query.addEventListener("focus", function () { - document.querySelector(".md-search").dataset.mdLocked = ""; - }); - + + // const query = document.getElementById("query") + // query.addEventListener("focus", () => { + // document.querySelector(".md-search").dataset.mdLocked = "" + // }) + /* Intercept click on search mode toggle */ var offset = 0; - var toggle = document.getElementById("search"); - toggle.addEventListener("click", function () { - // TODO: click may be the wrong event... - var list = document.body; // classList md bla - var lock = !matchMedia("only screen and (min-width: 960px)").matches; - - /* Exiting search mode */ - if (list.dataset.mdLocked) { - delete list.dataset.mdLocked; - - /* Scroll to former position, but wait for 100ms to prevent flashes - on iOS. A short timeout seems to do the trick */ - if (lock) setTimeout(function () { - window.scrollTo(0, offset); - }, 100); - - /* Entering search mode */ - } else { - offset = window.scrollY; - - /* First timeout: scroll to top after transition, to omit flickering */ - if (lock) setTimeout(function () { - window.scrollTo(0, 0); - }, 400); - - /* Second timeout: Lock body after finishing transition and scrolling to - top and focus input field. Sadly, the focus event is not dispatched - on iOS Safari and there's nothing we can do about it. */ - setTimeout(function () { - - /* This additional check is necessary to handle fast subsequent clicks - on the toggle and the timeout to lock the body must be cancelled */ - // if (ev.target.checked) { - if (lock) list.dataset.mdLocked = ""; - setTimeout(function () { - document.getElementById("query").focus(); - }, 200); - // } - }, 450); - } - }); - + // const toggle = document.getElementById("search") + // toggle.addEventListener("click", () => { // TODO: click may be the wrong event... + // const list = document.body // classList md bla + // const lock = !matchMedia("only screen and (min-width: 960px)").matches + // + // /* Exiting search mode */ + // if (list.dataset.mdLocked) { + // delete list.dataset.mdLocked + // + // /* Scroll to former position, but wait for 100ms to prevent flashes + // on iOS. A short timeout seems to do the trick */ + // if (lock) + // setTimeout(() => { + // window.scrollTo(0, offset) + // }, 100) + // + // /* Entering search mode */ + // } else { + // offset = window.scrollY + // + // /* First timeout: scroll to top after transition, to omit flickering */ + // if (lock) + // setTimeout(() => { + // window.scrollTo(0, 0) + // }, 400) + // + // /* Second timeout: Lock body after finishing transition and scrolling to + // top and focus input field. Sadly, the focus event is not dispatched + // on iOS Safari and there's nothing we can do about it. */ + // setTimeout(() => { + // + // /* This additional check is necessary to handle fast subsequent clicks + // on the toggle and the timeout to lock the body must be cancelled */ + // // if (ev.target.checked) { + // if (lock) + // list.dataset.mdLocked = "" + // setTimeout(() => { + // document.getElementById("query").focus() + // }, 200) + // // } + // }, 450) + // } + // }) + // TODO: only do this on MOBILE and TABLET - var toggleSearchClose = document.querySelector(".md-search__icon"); - toggleSearchClose.setAttribute("for", "search"); // TODO: override query with search, when on mobile!!! + // const toggleSearchClose = document.querySelector(".md-search__icon") + // toggleSearchClose.setAttribute("for", "search") // TODO: override query with search, when on mobile!!! + document.getElementById("query").addEventListener("focus", function () { + document.getElementById("search").checked = true; + }); + + document.querySelector(".md-container").addEventListener("click", function () { + if (document.getElementById("search").checked) document.getElementById("search").checked = false; + }); + + // stop propagation, if search is active... + document.querySelector(".md-search").addEventListener("click", function (ev) { + ev.stopPropagation(); + }); // toggleSearchClose.addEventListener("click", ev => { // ev.preventDefault() // // ev.target @@ -234,42 +248,42 @@ var Application = // const search = document.getElementById("search") // search.checked = false // }) - + // var toc = new Sidebar('.md-sidebar--secondary'); // toc.listen(); - + var toggles = document.querySelectorAll(".md-nav__item--nested > .md-nav__link"); [].forEach.call(toggles, function (togglex) { var nav = togglex.nextElementSibling; - + // 1. - + nav.style.maxHeight = nav.getBoundingClientRect().height + "px"; - + togglex.addEventListener("click", function () { var first = nav.getBoundingClientRect().height; if (first) { // console.log('closing'); nav.style.maxHeight = first + "px"; // reset! requestAnimationFrame(function () { - + nav.classList.add("md-nav--transitioning"); nav.style.maxHeight = "0px"; }); } else { (function () { // console.log('opening'); - + /* Toggle and read height */ nav.style.maxHeight = ""; - + nav.classList.add("md-nav--toggled"); var last = nav.getBoundingClientRect().height; nav.classList.remove("md-nav--toggled"); - + // Initial state nav.style.maxHeight = "0px"; - + /* Enable animations */ requestAnimationFrame(function () { nav.classList.add("md-nav--transitioning"); @@ -278,7 +292,7 @@ var Application = })(); } }); - + // Capture the end with transitionend nav.addEventListener("transitionend", function (ev) { ev.target.classList.remove("md-nav--transitioning"); @@ -287,14 +301,14 @@ var Application = } }); }); - + // setTimeout(function() { fetch("/mkdocs/search_index.json") // TODO: prepend BASE URL!!! .then(function (response) { return response.json(); }).then(function (data) { // console.log(data) - + /* Create index */ var index = (0, _lunr2.default)(function () { /* eslint-disable no-invalid-this, lines-around-comment */ @@ -303,11 +317,11 @@ var Application = this.ref("location"); /* eslint-enable no-invalid-this, lines-around-comment */ }); - + /* Index articles */ var articles = {}; data.docs.forEach(function (article) { - + // TODO: match for two whitespaces, then replace unnecessary whitespace after string article.text = article.text.replace(/\s(\.,\:)\s/gi, function (string, g1) { return g1 + " "; @@ -317,7 +331,7 @@ var Application = articles[article.location] = article; index.add(article); }); - + /* Register keyhandler to execute search on key up */ var queryx = document.getElementById("query"); queryx.addEventListener("keyup", function () { @@ -334,34 +348,34 @@ var Application = // bar.classList.remove('non-empty'); // return; // } - + /* Show reset button */ // bar.classList.add('non-empty'); - + /* Execute search */ var results = index.search(query.value); results.forEach(function (result) { var article = articles[result.ref]; - + /* Create a link referring to the article */ var link = document.createElement("a"); link.classList.add("md-search-result__link"); link.href = article.location; - + // /* Create article container */ var li = document.createElement("li"); li.classList.add("md-search-result__item"); li.appendChild(link); - + /* Create title element */ var title = document.createElement("div"); title.classList.add("md-search-result__title"); - + // article.title.split(//) - + title.innerHTML = article.title; link.appendChild(title); - + /* Truncate a string after the given number of characters */ var truncate = function truncate(string, n) { var i = n; @@ -371,29 +385,29 @@ var Application = } return string; }; - + /* Create text element */ var text = document.createElement("p"); text.classList.add("md-search-result__description"); text.innerHTML = truncate(article.text); // .truncate(140); text.innerHTML = truncate(article.text, 140); // .truncate(140); link.appendChild(text); - + container.appendChild(li); }); - + /* Show number of search results */ // var number = document.createElement('strong'); - + var meta = document.querySelector(".md-search-result__meta"); meta.innerHTML = results.length + " search result" + (results.length !== 1 ? "s" : ""); - + /* Update number */ // while (meta.firstChild) // meta.removeChild(meta.firstChild); // meta.appendChild(number); }); - + // setTimeout(function() { // li.classList.remove('md-source__fact--hidden'); // }, 100); @@ -401,7 +415,7 @@ var Application = // console.log("parsing failed", ex) }); // }, 1000); - + fetch("https://api.github.com/repos/squidfunk/mkdocs-material/releases/latest").then(function (response) { return response.json(); }); @@ -416,12 +430,12 @@ var Application = /***/ function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_RESULT__;'use strict'; - + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; - + ;(function () { 'use strict'; - + /** * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs. * @@ -429,10 +443,10 @@ var Application = * @copyright The Financial Times Limited [All Rights Reserved] * @license MIT License (see LICENSE.txt) */ - + /*jslint browser:true, node:true*/ /*global define, Event, Node*/ - + /** * Instantiate fast-clicking listeners on the specified layer. * @@ -440,112 +454,112 @@ var Application = * @param {Element} layer The layer to listen on * @param {Object} [options={}] The options to override the defaults */ - + function FastClick(layer, options) { var oldOnClick; - + options = options || {}; - + /** * Whether a click is currently being tracked. * * @type boolean */ this.trackingClick = false; - + /** * Timestamp for when click tracking started. * * @type number */ this.trackingClickStart = 0; - + /** * The element being tracked for a click. * * @type EventTarget */ this.targetElement = null; - + /** * X-coordinate of touch start event. * * @type number */ this.touchStartX = 0; - + /** * Y-coordinate of touch start event. * * @type number */ this.touchStartY = 0; - + /** * ID of the last touch, retrieved from Touch.identifier. * * @type number */ this.lastTouchIdentifier = 0; - + /** * Touchmove boundary, beyond which a click will be cancelled. * * @type number */ this.touchBoundary = options.touchBoundary || 10; - + /** * The FastClick layer. * * @type Element */ this.layer = layer; - + /** * The minimum time between tap(touchstart and touchend) events * * @type number */ this.tapDelay = options.tapDelay || 200; - + /** * The maximum time for a tap * * @type number */ this.tapTimeout = options.tapTimeout || 700; - + if (FastClick.notNeeded(layer)) { return; } - + // Some old versions of Android don't have Function.prototype.bind function bind(method, context) { return function () { return method.apply(context, arguments); }; } - + var methods = ['onMouse', 'onClick', 'onTouchStart', 'onTouchMove', 'onTouchEnd', 'onTouchCancel']; var context = this; for (var i = 0, l = methods.length; i < l; i++) { context[methods[i]] = bind(context[methods[i]], context); } - + // Set up event handlers as required if (deviceIsAndroid) { layer.addEventListener('mouseover', this.onMouse, true); layer.addEventListener('mousedown', this.onMouse, true); layer.addEventListener('mouseup', this.onMouse, true); } - + layer.addEventListener('click', this.onClick, true); layer.addEventListener('touchstart', this.onTouchStart, false); layer.addEventListener('touchmove', this.onTouchMove, false); layer.addEventListener('touchend', this.onTouchEnd, false); layer.addEventListener('touchcancel', this.onTouchCancel, false); - + // Hack is required for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2) // which is how FastClick normally stops click events bubbling to callbacks registered on the FastClick // layer when they are cancelled. @@ -558,7 +572,7 @@ var Application = rmv.call(layer, type, callback, capture); } }; - + layer.addEventListener = function (type, callback, capture) { var adv = Node.prototype.addEventListener; if (type === 'click') { @@ -572,12 +586,12 @@ var Application = } }; } - + // If a handler is already declared in the element's onclick attribute, it will be fired before // FastClick's onClick handler. Fix this by pulling out the user-defined handler function and // adding it as listener. if (typeof layer.onclick === 'function') { - + // Android browser on at least 3.2 requires a new reference to the function in layer.onclick // - the old one won't work if passed to addEventListener directly. oldOnClick = layer.onclick; @@ -587,49 +601,49 @@ var Application = layer.onclick = null; } } - + /** * Windows Phone 8.1 fakes user agent string to look like Android and iPhone. * * @type boolean */ var deviceIsWindowsPhone = navigator.userAgent.indexOf("Windows Phone") >= 0; - + /** * Android requires exceptions. * * @type boolean */ var deviceIsAndroid = navigator.userAgent.indexOf('Android') > 0 && !deviceIsWindowsPhone; - + /** * iOS requires exceptions. * * @type boolean */ var deviceIsIOS = /iP(ad|hone|od)/.test(navigator.userAgent) && !deviceIsWindowsPhone; - + /** * iOS 4 requires an exception for select elements. * * @type boolean */ var deviceIsIOS4 = deviceIsIOS && /OS 4_\d(_\d)?/.test(navigator.userAgent); - + /** * iOS 6.0-7.* requires the target element to be manually derived * * @type boolean */ var deviceIsIOSWithBadTarget = deviceIsIOS && /OS [6-7]_\d/.test(navigator.userAgent); - + /** * BlackBerry requires exceptions. * * @type boolean */ var deviceIsBlackBerry10 = navigator.userAgent.indexOf('BB10') > 0; - + /** * Determine whether a given element requires a native click. * @@ -638,7 +652,7 @@ var Application = */ FastClick.prototype.needsClick = function (target) { switch (target.nodeName.toLowerCase()) { - + // Don't send a synthetic click to disabled inputs (issue #62) case 'button': case 'select': @@ -646,26 +660,26 @@ var Application = if (target.disabled) { return true; } - + break; case 'input': - + // File inputs need real clicks on iOS 6 due to a browser bug (issue #68) if (deviceIsIOS && target.type === 'file' || target.disabled) { return true; } - + break; case 'label': case 'iframe': // iOS8 homescreen apps can prevent events bubbling into frames case 'video': return true; } - + return (/\bneedsclick\b/.test(target.className) ); }; - + /** * Determine whether a given element requires a call to focus to simulate click into element. * @@ -688,7 +702,7 @@ var Application = case 'submit': return false; } - + // No point in attempting to focus disabled inputs return !target.disabled && !target.readOnly; default: @@ -696,7 +710,7 @@ var Application = ); } }; - + /** * Send a click event to the specified element. * @@ -705,37 +719,37 @@ var Application = */ FastClick.prototype.sendClick = function (targetElement, event) { var clickEvent, touch; - + // On some Android devices activeElement needs to be blurred otherwise the synthetic click will have no effect (#24) if (document.activeElement && document.activeElement !== targetElement) { document.activeElement.blur(); } - + touch = event.changedTouches[0]; - + // Synthesise a click event, with an extra attribute so it can be tracked clickEvent = document.createEvent('MouseEvents'); clickEvent.initMouseEvent(this.determineEventType(targetElement), true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null); clickEvent.forwardedTouchEvent = true; targetElement.dispatchEvent(clickEvent); }; - + FastClick.prototype.determineEventType = function (targetElement) { - + //Issue #159: Android Chrome Select Box does not open with a synthetic click event if (deviceIsAndroid && targetElement.tagName.toLowerCase() === 'select') { return 'mousedown'; } - + return 'click'; }; - + /** * @param {EventTarget|Element} targetElement */ FastClick.prototype.focus = function (targetElement) { var length; - + // Issue #160: on iOS 7, some input elements (e.g. date datetime month) throw a vague TypeError on setSelectionRange. These elements don't have an integer value for the selectionStart and selectionEnd properties, but unfortunately that can't be used for detection because accessing the properties also throws a TypeError. Just check the type instead. Filed as Apple bug #15122724. if (deviceIsIOS && targetElement.setSelectionRange && targetElement.type.indexOf('date') !== 0 && targetElement.type !== 'time' && targetElement.type !== 'month') { length = targetElement.value.length; @@ -744,7 +758,7 @@ var Application = targetElement.focus(); } }; - + /** * Check whether the given target element is a child of a scrollable layer and if so, set a flag on it. * @@ -752,9 +766,9 @@ var Application = */ FastClick.prototype.updateScrollParent = function (targetElement) { var scrollParent, parentElement; - + scrollParent = targetElement.fastClickScrollParent; - + // Attempt to discover whether the target element is contained within a scrollable layer. Re-check if the // target element was moved to another parent. if (!scrollParent || !scrollParent.contains(targetElement)) { @@ -765,31 +779,31 @@ var Application = targetElement.fastClickScrollParent = parentElement; break; } - + parentElement = parentElement.parentElement; } while (parentElement); } - + // Always update the scroll top tracker if possible. if (scrollParent) { scrollParent.fastClickLastScrollTop = scrollParent.scrollTop; } }; - + /** * @param {EventTarget} targetElement * @returns {Element|EventTarget} */ FastClick.prototype.getTargetElementFromEventTarget = function (eventTarget) { - + // On some older browsers (notably Safari on iOS 4.1 - see issue #56) the event target may be a text node. if (eventTarget.nodeType === Node.TEXT_NODE) { return eventTarget.parentNode; } - + return eventTarget; }; - + /** * On touch start, record the position and scroll offset. * @@ -798,25 +812,25 @@ var Application = */ FastClick.prototype.onTouchStart = function (event) { var targetElement, touch, selection; - + // Ignore multiple touches, otherwise pinch-to-zoom is prevented if both fingers are on the FastClick element (issue #111). if (event.targetTouches.length > 1) { return true; } - + targetElement = this.getTargetElementFromEventTarget(event.target); touch = event.targetTouches[0]; - + if (deviceIsIOS) { - + // Only trusted events will deselect text on iOS (issue #49) selection = window.getSelection(); if (selection.rangeCount && !selection.isCollapsed) { return true; } - + if (!deviceIsIOS4) { - + // Weird things happen on iOS when an alert or confirm dialog is opened from a click event callback (issue #23): // 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. @@ -829,9 +843,9 @@ var Application = event.preventDefault(); return false; } - + this.lastTouchIdentifier = touch.identifier; - + // If the target element is a child of a scrollable layer (using -webkit-overflow-scrolling: touch) and: // 1) the user does a fling scroll on the scrollable layer // 2) the user stops the fling scroll with another tap @@ -841,22 +855,22 @@ var Application = this.updateScrollParent(targetElement); } } - + this.trackingClick = true; this.trackingClickStart = event.timeStamp; this.targetElement = targetElement; - + this.touchStartX = touch.pageX; this.touchStartY = touch.pageY; - + // Prevent phantom clicks on fast double-tap (issue #36) if (event.timeStamp - this.lastClickTime < this.tapDelay) { event.preventDefault(); } - + return true; }; - + /** * Based on a touchmove event object, check whether the touch has moved past a boundary since it started. * @@ -866,14 +880,14 @@ var Application = FastClick.prototype.touchHasMoved = function (event) { var touch = event.changedTouches[0], boundary = this.touchBoundary; - + if (Math.abs(touch.pageX - this.touchStartX) > boundary || Math.abs(touch.pageY - this.touchStartY) > boundary) { return true; } - + return false; }; - + /** * Update the last position. * @@ -884,16 +898,16 @@ var Application = if (!this.trackingClick) { return true; } - + // If the touch has moved, cancel the click tracking if (this.targetElement !== this.getTargetElementFromEventTarget(event.target) || this.touchHasMoved(event)) { this.trackingClick = false; this.targetElement = null; } - + return true; }; - + /** * Attempt to find the labelled control for the given label element. * @@ -901,22 +915,22 @@ var Application = * @returns {Element|null} */ FastClick.prototype.findControl = function (labelElement) { - + // Fast path for newer browsers supporting the HTML5 control attribute if (labelElement.control !== undefined) { return labelElement.control; } - + // All browsers under test that support touch events also support the HTML5 htmlFor attribute if (labelElement.htmlFor) { return document.getElementById(labelElement.htmlFor); } - + // If no for attribute exists, attempt to retrieve the first labellable descendant element // the list of which is defined here: http://www.w3.org/TR/html5/forms.html#category-label return labelElement.querySelector('button, input:not([type=hidden]), keygen, meter, output, progress, select, textarea'); }; - + /** * On touch end, determine whether to send a click event at once. * @@ -930,42 +944,42 @@ var Application = scrollParent, touch, targetElement = this.targetElement; - + if (!this.trackingClick) { return true; } - + // Prevent phantom clicks on fast double-tap (issue #36) if (event.timeStamp - this.lastClickTime < this.tapDelay) { this.cancelNextClick = true; return true; } - + if (event.timeStamp - this.trackingClickStart > this.tapTimeout) { return true; } - + // Reset to prevent wrong click cancel on input (issue #156). this.cancelNextClick = false; - + this.lastClickTime = event.timeStamp; - + trackingClickStart = this.trackingClickStart; this.trackingClick = false; this.trackingClickStart = 0; - + // On some iOS devices, the targetElement supplied with the event is invalid if the layer // is performing a transition or scroll, and has to be re-detected manually. Note that // for this to function correctly, it must be called *after* the event target is checked! // See issue #57; also filed as rdar://13048589 . if (deviceIsIOSWithBadTarget) { touch = event.changedTouches[0]; - + // In certain cases arguments of elementFromPoint can be negative, so prevent setting targetElement to null targetElement = document.elementFromPoint(touch.pageX - window.pageXOffset, touch.pageY - window.pageYOffset) || targetElement; targetElement.fastClickScrollParent = this.targetElement.fastClickScrollParent; } - + targetTagName = targetElement.tagName.toLowerCase(); if (targetTagName === 'label') { forElement = this.findControl(targetElement); @@ -974,33 +988,33 @@ var Application = if (deviceIsAndroid) { return false; } - + targetElement = forElement; } } else if (this.needsFocus(targetElement)) { - + // Case 1: If the touch started a while ago (best guess is 100ms based on tests for issue #36) then focus will be triggered anyway. Return early and unset the target element reference so that the subsequent click will be allowed through. // Case 2: Without this exception for input elements tapped when the document is contained in an iframe, then any inputted text won't be visible even though the value attribute is updated as the user types (issue #37). if (event.timeStamp - trackingClickStart > 100 || deviceIsIOS && window.top !== window && targetTagName === 'input') { this.targetElement = null; return false; } - + this.focus(targetElement); this.sendClick(targetElement, event); - + // Select elements need the event to go through on iOS 4, otherwise the selector menu won't open. // Also this breaks opening selects when VoiceOver is active on iOS6, iOS7 (and possibly others) if (!deviceIsIOS || targetTagName !== 'select') { this.targetElement = null; event.preventDefault(); } - + return false; } - + if (deviceIsIOS && !deviceIsIOS4) { - + // Don't send a synthetic click event if the target element is contained within a parent layer that was scrolled // and this tap is being used to stop the scrolling (usually initiated by a fling - issue #42). scrollParent = targetElement.fastClickScrollParent; @@ -1008,17 +1022,17 @@ var Application = return true; } } - + // Prevent the actual click from going though - unless the target node is marked as requiring // real clicks or if it is in the whitelist in which case only non-programmatic clicks are permitted. if (!this.needsClick(targetElement)) { event.preventDefault(); this.sendClick(targetElement, event); } - + return false; }; - + /** * On touch cancel, stop tracking the click. * @@ -1028,7 +1042,7 @@ var Application = this.trackingClick = false; this.targetElement = null; }; - + /** * Determine mouse events which should be permitted. * @@ -1036,46 +1050,46 @@ var Application = * @returns {boolean} */ FastClick.prototype.onMouse = function (event) { - + // If a target element was never set (because a touch event was never fired) allow the event if (!this.targetElement) { return true; } - + if (event.forwardedTouchEvent) { return true; } - + // Programmatically generated events targeting a specific element should be permitted if (!event.cancelable) { return true; } - + // Derive and check the target element to see whether the mouse event needs to be permitted; // unless explicitly enabled, prevent non-touch click events from triggering actions, // to prevent ghost/doubleclicks. if (!this.needsClick(this.targetElement) || this.cancelNextClick) { - + // Prevent any user-added listeners declared on FastClick element from being fired. if (event.stopImmediatePropagation) { event.stopImmediatePropagation(); } else { - + // Part of the hack for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2) event.propagationStopped = true; } - + // Cancel the event event.stopPropagation(); event.preventDefault(); - + return false; } - + // If the mouse event is permitted, return true for the action to go through. return true; }; - + /** * On actual clicks, determine whether this is a touch-generated click, a click action occurring * naturally after a delay after a touch (which needs to be cancelled to avoid duplication), or @@ -1086,30 +1100,30 @@ var Application = */ FastClick.prototype.onClick = function (event) { var permitted; - + // It's possible for another FastClick-like library delivered with third-party code to fire a click event before FastClick does (issue #44). In that case, set the click-tracking flag back to false and return early. This will cause onTouchEnd to return early. if (this.trackingClick) { this.targetElement = null; this.trackingClick = false; return true; } - + // Very odd behaviour on iOS (issue #18): if a submit element is present inside a form and the user hits enter in the iOS simulator or clicks the Go button on the pop-up OS keyboard the a kind of 'fake' click event will be triggered with the submit-type input element as the target. if (event.target.type === 'submit' && event.detail === 0) { return true; } - + permitted = this.onMouse(event); - + // Only unset targetElement if the click is not permitted. This will ensure that the check for !targetElement in onMouse fails and the browser's click doesn't go through. if (!permitted) { this.targetElement = null; } - + // If clicks are permitted, return true for the action to go through. return permitted; }; - + /** * Remove all FastClick's event listeners. * @@ -1117,20 +1131,20 @@ var Application = */ FastClick.prototype.destroy = function () { var layer = this.layer; - + if (deviceIsAndroid) { layer.removeEventListener('mouseover', this.onMouse, true); layer.removeEventListener('mousedown', this.onMouse, true); layer.removeEventListener('mouseup', this.onMouse, true); } - + layer.removeEventListener('click', this.onClick, true); layer.removeEventListener('touchstart', this.onTouchStart, false); layer.removeEventListener('touchmove', this.onTouchMove, false); layer.removeEventListener('touchend', this.onTouchEnd, false); layer.removeEventListener('touchcancel', this.onTouchCancel, false); }; - + /** * Check whether FastClick is needed. * @@ -1141,20 +1155,20 @@ var Application = var chromeVersion; var blackberryVersion; var firefoxVersion; - + // Devices that don't support touch don't need FastClick if (typeof window.ontouchstart === 'undefined') { return true; } - + // Chrome version - zero for other browsers chromeVersion = +(/Chrome\/([0-9]+)/.exec(navigator.userAgent) || [, 0])[1]; - + if (chromeVersion) { - + if (deviceIsAndroid) { metaViewport = document.querySelector('meta[name=viewport]'); - + if (metaViewport) { // Chrome on Android with user-scalable="no" doesn't need FastClick (issue #89) if (metaViewport.content.indexOf('user-scalable=no') !== -1) { @@ -1165,21 +1179,21 @@ var Application = return true; } } - + // Chrome desktop doesn't need FastClick (issue #15) } else { return true; } } - + if (deviceIsBlackBerry10) { blackberryVersion = navigator.userAgent.match(/Version\/([0-9]*)\.([0-9]*)/); - + // BlackBerry 10.3+ does not require Fastclick library. // https://github.com/ftlabs/fastclick/issues/251 if (blackberryVersion[1] >= 10 && blackberryVersion[2] >= 3) { metaViewport = document.querySelector('meta[name=viewport]'); - + if (metaViewport) { // user-scalable=no eliminates click delay. if (metaViewport.content.indexOf('user-scalable=no') !== -1) { @@ -1192,33 +1206,33 @@ var Application = } } } - + // IE10 with -ms-touch-action: none or manipulation, which disables double-tap-to-zoom (issue #97) if (layer.style.msTouchAction === 'none' || layer.style.touchAction === 'manipulation') { return true; } - + // Firefox version - zero for other browsers firefoxVersion = +(/Firefox\/([0-9]+)/.exec(navigator.userAgent) || [, 0])[1]; - + if (firefoxVersion >= 27) { // Firefox 27+ does not have tap delay if the content is not zoomable - https://bugzilla.mozilla.org/show_bug.cgi?id=922896 - + metaViewport = document.querySelector('meta[name=viewport]'); if (metaViewport && (metaViewport.content.indexOf('user-scalable=no') !== -1 || document.documentElement.scrollWidth <= window.outerWidth)) { return true; } } - + // IE11: prefixed -ms-touch-action is no longer supported and it's recomended 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; } - + return false; }; - + /** * Factory method for creating a FastClick object * @@ -1228,9 +1242,9 @@ var Application = FastClick.attach = function (layer, options) { return new FastClick(layer, options); }; - + if ("function" === 'function' && _typeof(__webpack_require__(2)) === 'object' && __webpack_require__(2)) { - + // AMD. Register as an anonymous module. !(__WEBPACK_AMD_DEFINE_RESULT__ = function () { return FastClick; @@ -1247,8 +1261,8 @@ var Application = /* 2 */ /***/ function(module, exports) { - /* WEBPACK VAR INJECTION */(function(__webpack_amd_options__) {module.exports = __webpack_amd_options__; - + /* WEBPACK VAR INJECTION */(function(__webpack_amd_options__) {module.exports = __webpack_amd_options__; + /* WEBPACK VAR INJECTION */}.call(exports, {})) /***/ }, @@ -1256,17 +1270,17 @@ var Application = /***/ function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;"use strict"; - + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; - + /** - * lunr - http://lunrjs.com - A bit like Solr, but much smaller and not as bright - 0.7.2 + * lunr - http://lunrjs.com - A bit like Solr, but much smaller and not as bright - 0.7.1 * Copyright (C) 2016 Oliver Nightingale * @license MIT */ - + ;(function () { - + /** * Convenience function for instantiating a new lunr index and configuring it * with the default pipeline functions and the passed config function. @@ -1304,25 +1318,25 @@ var Application = */ var lunr = function lunr(config) { var idx = new lunr.Index(); - + idx.pipeline.add(lunr.trimmer, lunr.stopWordFilter, lunr.stemmer); - + if (config) config.call(idx, idx); - + return idx; }; - - lunr.version = "0.7.2"; + + lunr.version = "0.7.1"; /*! * lunr.utils * Copyright (C) 2016 Oliver Nightingale */ - + /** * A namespace containing utils for the rest of the lunr library */ lunr.utils = {}; - + /** * Print a warning message to the console. * @@ -1336,7 +1350,7 @@ var Application = } }; }(this); - + /** * Convert an object to a string. * @@ -1359,7 +1373,7 @@ var Application = * lunr.EventEmitter * Copyright (C) 2016 Oliver Nightingale */ - + /** * lunr.EventEmitter is an event emitter for lunr. It manages adding and removing event handlers and triggering events and their handlers. * @@ -1368,7 +1382,7 @@ var Application = lunr.EventEmitter = function () { this.events = {}; }; - + /** * Binds a handler function to a specific event(s). * @@ -1382,15 +1396,15 @@ var Application = var args = Array.prototype.slice.call(arguments), fn = args.pop(), names = args; - + if (typeof fn !== "function") throw new TypeError("last argument must be a function"); - + names.forEach(function (name) { if (!this.hasHandler(name)) this.events[name] = []; this.events[name].push(fn); }, this); }; - + /** * Removes a handler function from a specific event. * @@ -1400,13 +1414,13 @@ var Application = */ lunr.EventEmitter.prototype.removeListener = function (name, fn) { if (!this.hasHandler(name)) return; - + var fnIndex = this.events[name].indexOf(fn); this.events[name].splice(fnIndex, 1); - + if (!this.events[name].length) delete this.events[name]; }; - + /** * Calls all functions bound to the given event. * @@ -1418,14 +1432,14 @@ var Application = */ lunr.EventEmitter.prototype.emit = function (name) { if (!this.hasHandler(name)) return; - + var args = Array.prototype.slice.call(arguments, 1); - + this.events[name].forEach(function (fn) { fn.apply(undefined, args); }); }; - + /** * Checks whether a handler has ever been stored against an event. * @@ -1436,20 +1450,20 @@ var Application = lunr.EventEmitter.prototype.hasHandler = function (name) { return name in this.events; }; - + /*! * lunr.tokenizer * Copyright (C) 2016 Oliver Nightingale */ - + /** * A function for splitting a string into tokens ready to be inserted into - * the search index. Uses `lunr.tokenizer.separator` to split strings, change + * the search index. Uses `lunr.tokenizer.seperator` to split strings, change * the value of this property to change how strings are split into tokens. * * @module * @param {String} obj The string to convert into tokens - * @see lunr.tokenizer.separator + * @see lunr.tokenizer.seperator * @returns {Array} */ lunr.tokenizer = function (obj) { @@ -1457,30 +1471,10 @@ var Application = if (Array.isArray(obj)) return obj.map(function (t) { return lunr.utils.asString(t).toLowerCase(); }); - - // TODO: This exists so that the deprecated property lunr.tokenizer.seperator can still be used. By - // default it is set to false and so the correctly spelt lunr.tokenizer.separator is used unless - // the user is using the old property to customise the tokenizer. - // - // This should be removed when version 1.0.0 is released. - var separator = lunr.tokenizer.seperator || lunr.tokenizer.separator; - - return obj.toString().trim().toLowerCase().split(separator); + + return obj.toString().trim().toLowerCase().split(lunr.tokenizer.seperator); }; - - /** - * This property is legacy alias for lunr.tokenizer.separator to maintain backwards compatability. - * When introduced the token was spelt incorrectly. It will remain until 1.0.0 when it will be removed, - * all code should use the correctly spelt lunr.tokenizer.separator property instead. - * - * @static - * @see lunr.tokenizer.separator - * @deprecated since 0.7.2 will be removed in 1.0.0 - * @private - * @see lunr.tokenizer - */ - lunr.tokenizer.seperator = false; - + /** * The sperator used to split a string into tokens. Override this property to change the behaviour of * `lunr.tokenizer` behaviour when tokenizing strings. By default this splits on whitespace and hyphens. @@ -1488,8 +1482,8 @@ var Application = * @static * @see lunr.tokenizer */ - lunr.tokenizer.separator = /[\s\-]+/; - + lunr.tokenizer.seperator = /[\s\-]+/; + /** * Loads a previously serialised tokenizer. * @@ -1502,20 +1496,20 @@ var Application = */ lunr.tokenizer.load = function (label) { var fn = this.registeredFunctions[label]; - + if (!fn) { throw new Error('Cannot load un-registered function: ' + label); } - + return fn; }; - + lunr.tokenizer.label = 'default'; - + lunr.tokenizer.registeredFunctions = { 'default': lunr.tokenizer }; - + /** * Register a tokenizer function. * @@ -1531,7 +1525,7 @@ var Application = if (label in this.registeredFunctions) { lunr.utils.warn('Overwriting existing tokenizer: ' + label); } - + fn.label = label; this.registeredFunctions[label] = fn; }; @@ -1539,7 +1533,7 @@ var Application = * lunr.Pipeline * Copyright (C) 2016 Oliver Nightingale */ - + /** * lunr.Pipelines maintain an ordered list of functions to be applied to all * tokens in documents entering the search index and queries being ran against @@ -1572,9 +1566,9 @@ var Application = lunr.Pipeline = function () { this._stack = []; }; - + lunr.Pipeline.registeredFunctions = {}; - + /** * Register a function with the pipeline. * @@ -1592,11 +1586,11 @@ var Application = if (label in this.registeredFunctions) { lunr.utils.warn('Overwriting existing registered function: ' + label); } - + fn.label = label; lunr.Pipeline.registeredFunctions[fn.label] = fn; }; - + /** * Warns if the function is not registered as a Pipeline function. * @@ -1606,12 +1600,12 @@ var Application = */ lunr.Pipeline.warnIfFunctionNotRegistered = function (fn) { var isRegistered = fn.label && fn.label in this.registeredFunctions; - + if (!isRegistered) { lunr.utils.warn('Function is not registered with pipeline. This may cause problems when serialising the index.\n', fn); } }; - + /** * Loads a previously serialised pipeline. * @@ -1625,20 +1619,20 @@ var Application = */ lunr.Pipeline.load = function (serialised) { var pipeline = new lunr.Pipeline(); - + serialised.forEach(function (fnName) { var fn = lunr.Pipeline.registeredFunctions[fnName]; - + if (fn) { pipeline.add(fn); } else { throw new Error('Cannot load un-registered function: ' + fnName); } }); - + return pipeline; }; - + /** * Adds new functions to the end of the pipeline. * @@ -1649,13 +1643,13 @@ var Application = */ lunr.Pipeline.prototype.add = function () { var fns = Array.prototype.slice.call(arguments); - + fns.forEach(function (fn) { lunr.Pipeline.warnIfFunctionNotRegistered(fn); this._stack.push(fn); }, this); }; - + /** * Adds a single function after a function that already exists in the * pipeline. @@ -1668,16 +1662,16 @@ var Application = */ lunr.Pipeline.prototype.after = function (existingFn, newFn) { lunr.Pipeline.warnIfFunctionNotRegistered(newFn); - + var pos = this._stack.indexOf(existingFn); if (pos == -1) { throw new Error('Cannot find existingFn'); } - + pos = pos + 1; this._stack.splice(pos, 0, newFn); }; - + /** * Adds a single function before a function that already exists in the * pipeline. @@ -1690,15 +1684,15 @@ var Application = */ lunr.Pipeline.prototype.before = function (existingFn, newFn) { lunr.Pipeline.warnIfFunctionNotRegistered(newFn); - + var pos = this._stack.indexOf(existingFn); if (pos == -1) { throw new Error('Cannot find existingFn'); } - + this._stack.splice(pos, 0, newFn); }; - + /** * Removes a function from the pipeline. * @@ -1710,10 +1704,10 @@ var Application = if (pos == -1) { return; } - + this._stack.splice(pos, 1); }; - + /** * Runs the current list of functions that make up the pipeline against the * passed tokens. @@ -1726,21 +1720,21 @@ var Application = var out = [], tokenLength = tokens.length, stackLength = this._stack.length; - + for (var i = 0; i < tokenLength; i++) { var token = tokens[i]; - + for (var j = 0; j < stackLength; j++) { token = this._stack[j](token, i, tokens); if (token === void 0 || token === '') break; }; - + if (token !== void 0 && token !== '') out.push(token); }; - + return out; }; - + /** * Resets the pipeline by removing any existing processors. * @@ -1749,7 +1743,7 @@ var Application = lunr.Pipeline.prototype.reset = function () { this._stack = []; }; - + /** * Returns a representation of the pipeline ready for serialisation. * @@ -1761,7 +1755,7 @@ var Application = lunr.Pipeline.prototype.toJSON = function () { return this._stack.map(function (fn) { lunr.Pipeline.warnIfFunctionNotRegistered(fn); - + return fn.label; }); }; @@ -1769,7 +1763,7 @@ var Application = * lunr.Vector * Copyright (C) 2016 Oliver Nightingale */ - + /** * lunr.Vectors implement vector related operations for * a series of elements. @@ -1781,7 +1775,7 @@ var Application = this.list = undefined; this.length = 0; }; - + /** * lunr.Vector.Node is a simple struct for each node * in a lunr.Vector. @@ -1798,7 +1792,7 @@ var Application = this.val = val; this.next = next; }; - + /** * Inserts a new value at a position in a vector. * @@ -1809,33 +1803,33 @@ var Application = lunr.Vector.prototype.insert = function (idx, val) { this._magnitude = undefined; var list = this.list; - + if (!list) { this.list = new lunr.Vector.Node(idx, val, list); return this.length++; } - + if (idx < list.idx) { this.list = new lunr.Vector.Node(idx, val, list); return this.length++; } - + var prev = list, next = list.next; - + while (next != undefined) { if (idx < next.idx) { prev.next = new lunr.Vector.Node(idx, val, next); return this.length++; } - + prev = next, next = next.next; } - + prev.next = new lunr.Vector.Node(idx, val, next); return this.length++; }; - + /** * Calculates the magnitude of this vector. * @@ -1847,16 +1841,16 @@ var Application = var node = this.list, sumOfSquares = 0, val; - + while (node) { val = node.val; sumOfSquares += val * val; node = node.next; } - + return this._magnitude = Math.sqrt(sumOfSquares); }; - + /** * Calculates the dot product of this vector and another vector. * @@ -1868,7 +1862,7 @@ var Application = var node = this.list, otherNode = otherVector.list, dotProduct = 0; - + while (node && otherNode) { if (node.idx < otherNode.idx) { node = node.next; @@ -1880,10 +1874,10 @@ var Application = otherNode = otherNode.next; } } - + return dotProduct; }; - + /** * Calculates the cosine similarity between this vector and another * vector. @@ -1900,7 +1894,7 @@ var Application = * lunr.SortedSet * Copyright (C) 2016 Oliver Nightingale */ - + /** * lunr.SortedSets are used to maintain an array of uniq values in a sorted * order. @@ -1911,7 +1905,7 @@ var Application = this.length = 0; this.elements = []; }; - + /** * Loads a previously serialised sorted set. * @@ -1921,13 +1915,13 @@ var Application = */ lunr.SortedSet.load = function (serialisedData) { var set = new this(); - + set.elements = serialisedData; set.length = serialisedData.length; - + return set; }; - + /** * Inserts new items into the set in the correct position to maintain the * order. @@ -1937,16 +1931,16 @@ var Application = */ lunr.SortedSet.prototype.add = function () { var i, element; - + for (i = 0; i < arguments.length; i++) { element = arguments[i]; if (~this.indexOf(element)) continue; this.elements.splice(this.locationFor(element), 0, element); } - + this.length = this.elements.length; }; - + /** * Converts this sorted set into an array. * @@ -1956,7 +1950,7 @@ var Application = lunr.SortedSet.prototype.toArray = function () { return this.elements.slice(); }; - + /** * Creates a new array with the results of calling a provided function on every * element in this sorted set. @@ -1973,7 +1967,7 @@ var Application = lunr.SortedSet.prototype.map = function (fn, ctx) { return this.elements.map(fn, ctx); }; - + /** * Executes a provided function once per sorted set element. * @@ -1988,7 +1982,7 @@ var Application = lunr.SortedSet.prototype.forEach = function (fn, ctx) { return this.elements.forEach(fn, ctx); }; - + /** * Returns the index at which a given element can be found in the * sorted set, or -1 if it is not present. @@ -2003,23 +1997,23 @@ var Application = sectionLength = end - start, pivot = start + Math.floor(sectionLength / 2), pivotElem = this.elements[pivot]; - + while (sectionLength > 1) { if (pivotElem === elem) return pivot; - + if (pivotElem < elem) start = pivot; if (pivotElem > elem) end = pivot; - + sectionLength = end - start; pivot = start + Math.floor(sectionLength / 2); pivotElem = this.elements[pivot]; } - + if (pivotElem === elem) return pivot; - + return -1; }; - + /** * Returns the position within the sorted set that an element should be * inserted at to maintain the current order of the set. @@ -2037,20 +2031,20 @@ var Application = sectionLength = end - start, pivot = start + Math.floor(sectionLength / 2), pivotElem = this.elements[pivot]; - + while (sectionLength > 1) { if (pivotElem < elem) start = pivot; if (pivotElem > elem) end = pivot; - + sectionLength = end - start; pivot = start + Math.floor(sectionLength / 2); pivotElem = this.elements[pivot]; } - + if (pivotElem > elem) return pivot; if (pivotElem < elem) return pivot + 1; }; - + /** * Creates a new lunr.SortedSet that contains the elements in the intersection * of this set and the passed set. @@ -2067,30 +2061,30 @@ var Application = b_len = otherSet.length, a = this.elements, b = otherSet.elements; - + while (true) { if (i > a_len - 1 || j > b_len - 1) break; - + if (a[i] === b[j]) { intersectSet.add(a[i]); i++, j++; continue; } - + if (a[i] < b[j]) { i++; continue; } - + if (a[i] > b[j]) { j++; continue; } }; - + return intersectSet; }; - + /** * Makes a copy of this set * @@ -2099,13 +2093,13 @@ var Application = */ lunr.SortedSet.prototype.clone = function () { var clone = new lunr.SortedSet(); - + clone.elements = this.toArray(); clone.length = clone.elements.length; - + return clone; }; - + /** * Creates a new lunr.SortedSet that contains the elements in the union * of this set and the passed set. @@ -2116,22 +2110,22 @@ var Application = */ lunr.SortedSet.prototype.union = function (otherSet) { var longSet, shortSet, unionSet; - + if (this.length >= otherSet.length) { longSet = this, shortSet = otherSet; } else { longSet = otherSet, shortSet = this; } - + unionSet = longSet.clone(); - + for (var i = 0, shortSetElements = shortSet.toArray(); i < shortSetElements.length; i++) { unionSet.add(shortSetElements[i]); } - + return unionSet; }; - + /** * Returns a representation of the sorted set ready for serialisation. * @@ -2145,7 +2139,7 @@ var Application = * lunr.Index * Copyright (C) 2016 Oliver Nightingale */ - + /** * lunr.Index is object that manages a search index. It contains the indexes * and stores all the tokens and document lookups. It also provides the main @@ -2162,14 +2156,14 @@ var Application = this.corpusTokens = new lunr.SortedSet(); this.eventEmitter = new lunr.EventEmitter(); this.tokenizerFn = lunr.tokenizer; - + this._idfCache = {}; - + this.on('add', 'remove', 'update', function () { this._idfCache = {}; }.bind(this)); }; - + /** * Bind a handler to events being emitted by the index. * @@ -2183,7 +2177,7 @@ var Application = var args = Array.prototype.slice.call(arguments); return this.eventEmitter.addListener.apply(this.eventEmitter, args); }; - + /** * Removes a handler from an event being emitted by the index. * @@ -2194,7 +2188,7 @@ var Application = lunr.Index.prototype.off = function (name, fn) { return this.eventEmitter.removeListener(name, fn); }; - + /** * Loads a previously serialised index. * @@ -2209,21 +2203,21 @@ var Application = if (serialisedData.version !== lunr.version) { lunr.utils.warn('version mismatch: current ' + lunr.version + ' importing ' + serialisedData.version); } - + var idx = new this(); - + idx._fields = serialisedData.fields; idx._ref = serialisedData.ref; - - idx.tokenizer(lunr.tokenizer.load(serialisedData.tokenizer)); + + idx.tokenizer = lunr.tokenizer.load(serialisedData.tokenizer); idx.documentStore = lunr.Store.load(serialisedData.documentStore); idx.tokenStore = lunr.TokenStore.load(serialisedData.tokenStore); idx.corpusTokens = lunr.SortedSet.load(serialisedData.corpusTokens); idx.pipeline = lunr.Pipeline.load(serialisedData.pipeline); - + return idx; }; - + /** * Adds a field to the list of fields that will be searchable within documents * in the index. @@ -2245,11 +2239,11 @@ var Application = lunr.Index.prototype.field = function (fieldName, opts) { var opts = opts || {}, field = { name: fieldName, boost: opts.boost || 1 }; - + this._fields.push(field); return this; }; - + /** * Sets the property used to uniquely identify documents added to the index, * by default this property is 'id'. @@ -2270,7 +2264,7 @@ var Application = this._ref = refName; return this; }; - + /** * Sets the tokenizer used for this index. * @@ -2284,15 +2278,15 @@ var Application = */ lunr.Index.prototype.tokenizer = function (fn) { var isRegistered = fn.label && fn.label in lunr.tokenizer.registeredFunctions; - + if (!isRegistered) { lunr.utils.warn('Function is not a registered tokenizer. This may cause problems when serialising the index'); } - + this.tokenizerFn = fn; return this; }; - + /** * Add a document to the index. * @@ -2313,48 +2307,48 @@ var Application = allDocumentTokens = new lunr.SortedSet(), docRef = doc[this._ref], emitEvent = emitEvent === undefined ? true : emitEvent; - + this._fields.forEach(function (field) { var fieldTokens = this.pipeline.run(this.tokenizerFn(doc[field.name])); - + docTokens[field.name] = fieldTokens; - + for (var i = 0; i < fieldTokens.length; i++) { var token = fieldTokens[i]; allDocumentTokens.add(token); this.corpusTokens.add(token); } }, this); - + this.documentStore.set(docRef, allDocumentTokens); - + for (var i = 0; i < allDocumentTokens.length; i++) { var token = allDocumentTokens.elements[i]; var tf = 0; - + for (var j = 0; j < this._fields.length; j++) { var field = this._fields[j]; var fieldTokens = docTokens[field.name]; var fieldLength = fieldTokens.length; - + if (!fieldLength) continue; - + var tokenCount = 0; for (var k = 0; k < fieldLength; k++) { if (fieldTokens[k] === token) { tokenCount++; } } - + tf += tokenCount / fieldLength * field.boost; } - + this.tokenStore.add(token, { ref: docRef, tf: tf }); }; - + if (emitEvent) this.eventEmitter.emit('add', doc, this); }; - + /** * Removes a document from the index. * @@ -2376,20 +2370,20 @@ var Application = lunr.Index.prototype.remove = function (doc, emitEvent) { var docRef = doc[this._ref], emitEvent = emitEvent === undefined ? true : emitEvent; - + if (!this.documentStore.has(docRef)) return; - + var docTokens = this.documentStore.get(docRef); - + this.documentStore.remove(docRef); - + docTokens.forEach(function (token) { this.tokenStore.remove(token, docRef); }, this); - + if (emitEvent) this.eventEmitter.emit('remove', doc, this); }; - + /** * Updates a document in the index. * @@ -2412,13 +2406,13 @@ var Application = */ lunr.Index.prototype.update = function (doc, emitEvent) { var emitEvent = emitEvent === undefined ? true : emitEvent; - + this.remove(doc, false); this.add(doc, false); - + if (emitEvent) this.eventEmitter.emit('update', doc, this); }; - + /** * Calculates the inverse document frequency for a token within the index. * @@ -2430,17 +2424,17 @@ var Application = lunr.Index.prototype.idf = function (term) { var cacheKey = "@" + term; if (Object.prototype.hasOwnProperty.call(this._idfCache, cacheKey)) return this._idfCache[cacheKey]; - + var documentFrequency = this.tokenStore.count(term), idf = 1; - + if (documentFrequency > 0) { idf = 1 + Math.log(this.documentStore.length / documentFrequency); } - + return this._idfCache[cacheKey] = idf; }; - + /** * Searches the index using the passed query. * @@ -2472,23 +2466,23 @@ var Application = fieldBoosts = this._fields.reduce(function (memo, f) { return memo + f.boost; }, 0); - + var hasSomeToken = queryTokens.some(function (token) { return this.tokenStore.has(token); }, this); - + if (!hasSomeToken) return []; - + queryTokens.forEach(function (token, i, tokens) { var tf = 1 / tokens.length * this._fields.length * fieldBoosts, self = this; - + var set = this.tokenStore.expand(token).reduce(function (memo, key) { var pos = self.corpusTokens.indexOf(key), idf = self.idf(key), similarityBoost = 1, set = new lunr.SortedSet(); - + // if the expanded key is not an exact match to the token then // penalise the score for this key by how different the key is // to the token. @@ -2496,39 +2490,39 @@ var Application = var diff = Math.max(3, key.length - token.length); similarityBoost = 1 / Math.log(diff); } - + // calculate the query tf-idf score for this token // applying an similarityBoost to ensure exact matches // these rank higher than expanded terms if (pos > -1) queryVector.insert(pos, tf * idf * similarityBoost); - + // add all the documents that have this key into a set // ensuring that the type of key is preserved var matchingDocuments = self.tokenStore.get(key), refs = Object.keys(matchingDocuments), refsLen = refs.length; - + for (var i = 0; i < refsLen; i++) { set.add(matchingDocuments[refs[i]].ref); } - + return memo.union(set); }, new lunr.SortedSet()); - + documentSets.push(set); }, this); - + var documentSet = documentSets.reduce(function (memo, set) { return memo.intersect(set); }); - + return documentSet.map(function (ref) { return { ref: ref, score: queryVector.similarity(this.documentVector(ref)) }; }, this).sort(function (a, b) { return b.score - a.score; }); }; - + /** * Generates a vector containing all the tokens in the document matching the * passed documentRef. @@ -2547,18 +2541,18 @@ var Application = var documentTokens = this.documentStore.get(documentRef), documentTokensLength = documentTokens.length, documentVector = new lunr.Vector(); - + for (var i = 0; i < documentTokensLength; i++) { var token = documentTokens.elements[i], tf = this.tokenStore.get(token)[documentRef].tf, idf = this.idf(token); - + documentVector.insert(this.corpusTokens.indexOf(token), tf * idf); }; - + return documentVector; }; - + /** * Returns a representation of the index ready for serialisation. * @@ -2577,7 +2571,7 @@ var Application = pipeline: this.pipeline.toJSON() }; }; - + /** * Applies a plugin to the current index. * @@ -2613,7 +2607,7 @@ var Application = * lunr.Store * Copyright (C) 2016 Oliver Nightingale */ - + /** * lunr.Store is a simple key-value store used for storing sets of tokens for * documents stored in index. @@ -2625,7 +2619,7 @@ var Application = this.store = {}; this.length = 0; }; - + /** * Loads a previously serialised store * @@ -2635,16 +2629,16 @@ var Application = */ lunr.Store.load = function (serialisedData) { var store = new this(); - + store.length = serialisedData.length; store.store = Object.keys(serialisedData.store).reduce(function (memo, key) { memo[key] = lunr.SortedSet.load(serialisedData.store[key]); return memo; }, {}); - + return store; }; - + /** * Stores the given tokens in the store against the given id. * @@ -2656,7 +2650,7 @@ var Application = if (!this.has(id)) this.length++; this.store[id] = tokens; }; - + /** * Retrieves the tokens from the store for a given key. * @@ -2667,7 +2661,7 @@ var Application = lunr.Store.prototype.get = function (id) { return this.store[id]; }; - + /** * Checks whether the store contains a key. * @@ -2678,7 +2672,7 @@ var Application = lunr.Store.prototype.has = function (id) { return id in this.store; }; - + /** * Removes the value for a key in the store. * @@ -2687,11 +2681,11 @@ var Application = */ lunr.Store.prototype.remove = function (id) { if (!this.has(id)) return; - + delete this.store[id]; this.length--; }; - + /** * Returns a representation of the store ready for serialisation. * @@ -2704,13 +2698,13 @@ var Application = length: this.length }; }; - + /*! * lunr.stemmer * Copyright (C) 2016 Oliver Nightingale * Includes code from - http://tartarus.org/~martin/PorterStemmer/js.txt */ - + /** * lunr.stemmer is an english language stemmer, this is a JavaScript * implementation of the PorterStemmer taken from http://tartarus.org/~martin @@ -2761,7 +2755,7 @@ var Application = // consonant sequence V = v + "[aeiou]*", // vowel sequence - + mgr0 = "^(" + C + ")?" + V + C, // [C]VC... is m>0 meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$", @@ -2769,12 +2763,12 @@ var Application = mgr1 = "^(" + C + ")?" + V + C + V + C, // [C]VCVC... is m>1 s_v = "^(" + C + ")?" + v; // vowel in stem - + var re_mgr0 = new RegExp(mgr0); var re_mgr1 = new RegExp(mgr1); var re_meq1 = new RegExp(meq1); var re_s_v = new RegExp(s_v); - + var re_1a = /^(.+?)(ss|i)es$/; var re2_1a = /^(.+?)([^s])s$/; var re_1b = /^(.+?)eed$/; @@ -2783,41 +2777,41 @@ var Application = var re2_1b_2 = /(at|bl|iz)$/; var re3_1b_2 = new RegExp("([^aeiouylsz])\\1$"); var re4_1b_2 = new RegExp("^" + C + v + "[^aeiouwxy]$"); - + var re_1c = /^(.+?[^aeiou])y$/; var re_2 = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/; - + var re_3 = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/; - + var re_4 = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/; var re2_4 = /^(.+?)(s|t)(ion)$/; - + var re_5 = /^(.+?)e$/; var re_5_1 = /ll$/; var re3_5 = new RegExp("^" + C + v + "[^aeiouwxy]$"); - + var porterStemmer = function porterStemmer(w) { var stem, suffix, firstch, re, re2, re3, re4; - + if (w.length < 3) { return w; } - + firstch = w.substr(0, 1); if (firstch == "y") { w = firstch.toUpperCase() + w.substr(1); } - + // Step 1a re = re_1a; re2 = re2_1a; - + if (re.test(w)) { w = w.replace(re, "$1$2"); } else if (re2.test(w)) { w = w.replace(re2, "$1$2"); } - + // Step 1b re = re_1b; re2 = re2_1b; @@ -2846,7 +2840,7 @@ var Application = } } } - + // Step 1c - replace suffix y or Y by i if preceded by a non-vowel which is not the first letter of the word (so cry -> cri, by -> by, say -> say) re = re_1c; if (re.test(w)) { @@ -2854,7 +2848,7 @@ var Application = stem = fp[1]; w = stem + "i"; } - + // Step 2 re = re_2; if (re.test(w)) { @@ -2866,7 +2860,7 @@ var Application = w = stem + step2list[suffix]; } } - + // Step 3 re = re_3; if (re.test(w)) { @@ -2878,7 +2872,7 @@ var Application = w = stem + step3list[suffix]; } } - + // Step 4 re = re_4; re2 = re2_4; @@ -2897,7 +2891,7 @@ var Application = w = stem; } } - + // Step 5 re = re_5; if (re.test(w)) { @@ -2910,32 +2904,32 @@ var Application = w = stem; } } - + re = re_5_1; re2 = re_mgr1; if (re.test(w) && re2.test(w)) { re = re_1b_2; w = w.replace(re, ""); } - + // and turn initial Y back to y - + if (firstch == "y") { w = firstch.toLowerCase() + w.substr(1); } - + return w; }; - + return porterStemmer; }(); - + lunr.Pipeline.registerFunction(lunr.stemmer, 'stemmer'); /*! * lunr.stopWordFilter * Copyright (C) 2016 Oliver Nightingale */ - + /** * lunr.generateStopWordFilter builds a stopWordFilter function from the provided * list of stop words. @@ -2954,12 +2948,12 @@ var Application = memo[stopWord] = stopWord; return memo; }, {}); - + return function (token) { if (token && words[token] !== token) return token; }; }; - + /** * lunr.stopWordFilter is an English language stop word list filter, any words * contained in the list will not be passed through the filter. @@ -2973,13 +2967,13 @@ var Application = * @see lunr.Pipeline */ lunr.stopWordFilter = lunr.generateStopWordFilter(['a', 'able', 'about', 'across', 'after', 'all', 'almost', 'also', 'am', 'among', 'an', 'and', 'any', 'are', 'as', 'at', 'be', 'because', 'been', 'but', 'by', 'can', 'cannot', 'could', 'dear', 'did', 'do', 'does', 'either', 'else', 'ever', 'every', 'for', 'from', 'get', 'got', 'had', 'has', 'have', 'he', 'her', 'hers', 'him', 'his', 'how', 'however', 'i', 'if', 'in', 'into', 'is', 'it', 'its', 'just', 'least', 'let', 'like', 'likely', 'may', 'me', 'might', 'most', 'must', 'my', 'neither', 'no', 'nor', 'not', 'of', 'off', 'often', 'on', 'only', 'or', 'other', 'our', 'own', 'rather', 'said', 'say', 'says', 'she', 'should', 'since', 'so', 'some', 'than', 'that', 'the', 'their', 'them', 'then', 'there', 'these', 'they', 'this', 'tis', 'to', 'too', 'twas', 'us', 'wants', 'was', 'we', 'were', 'what', 'when', 'where', 'which', 'while', 'who', 'whom', 'why', 'will', 'with', 'would', 'yet', 'you', 'your']); - + lunr.Pipeline.registerFunction(lunr.stopWordFilter, 'stopWordFilter'); /*! * lunr.trimmer * Copyright (C) 2016 Oliver Nightingale */ - + /** * lunr.trimmer is a pipeline function for trimming non word * characters from the begining and end of tokens before they @@ -2997,14 +2991,14 @@ var Application = lunr.trimmer = function (token) { return token.replace(/^\W+/, '').replace(/\W+$/, ''); }; - + lunr.Pipeline.registerFunction(lunr.trimmer, 'trimmer'); /*! * lunr.stemmer * Copyright (C) 2016 Oliver Nightingale * Includes code from - http://tartarus.org/~martin/PorterStemmer/js.txt */ - + /** * lunr.TokenStore is used for efficient storing and lookup of the reverse * index of token to document ref. @@ -3015,7 +3009,7 @@ var Application = this.root = { docs: {} }; this.length = 0; }; - + /** * Loads a previously serialised token store * @@ -3025,13 +3019,13 @@ var Application = */ lunr.TokenStore.load = function (serialisedData) { var store = new this(); - + store.root = serialisedData.root; store.length = serialisedData.length; - + return store; }; - + /** * Adds a new token doc pair to the store. * @@ -3049,9 +3043,9 @@ var Application = var root = root || this.root, key = token.charAt(0), rest = token.slice(1); - + if (!(key in root)) root[key] = { docs: {} }; - + if (rest.length === 0) { root[key].docs[doc.ref] = doc; this.length += 1; @@ -3060,7 +3054,7 @@ var Application = return this.add(rest, doc, root[key]); } }; - + /** * Checks whether this key is contained within this lunr.TokenStore. * @@ -3073,18 +3067,18 @@ var Application = */ lunr.TokenStore.prototype.has = function (token) { if (!token) return false; - + var node = this.root; - + for (var i = 0; i < token.length; i++) { if (!node[token.charAt(i)]) return false; - + node = node[token.charAt(i)]; } - + return true; }; - + /** * Retrieve a node from the token store for a given token. * @@ -3099,18 +3093,18 @@ var Application = */ lunr.TokenStore.prototype.getNode = function (token) { if (!token) return {}; - + var node = this.root; - + for (var i = 0; i < token.length; i++) { if (!node[token.charAt(i)]) return {}; - + node = node[token.charAt(i)]; } - + return node; }; - + /** * Retrieve the documents for a node for the given token. * @@ -3125,11 +3119,11 @@ var Application = lunr.TokenStore.prototype.get = function (token, root) { return this.getNode(token, root).docs || {}; }; - + lunr.TokenStore.prototype.count = function (token, root) { return Object.keys(this.get(token, root)).length; }; - + /** * Remove the document identified by ref from the token in the store. * @@ -3145,15 +3139,15 @@ var Application = lunr.TokenStore.prototype.remove = function (token, ref) { if (!token) return; var node = this.root; - + for (var i = 0; i < token.length; i++) { if (!(token.charAt(i) in node)) return; node = node[token.charAt(i)]; } - + delete node.docs[ref]; }; - + /** * Find all the possible suffixes of the passed token using tokens * currently in the store. @@ -3166,18 +3160,18 @@ var Application = var root = this.getNode(token), docs = root.docs || {}, memo = memo || []; - + if (Object.keys(docs).length) memo.push(token); - + Object.keys(root).forEach(function (key) { if (key === 'docs') return; - + memo.concat(this.expand(token + key, memo)); }, this); - + return memo; }; - + /** * Returns a representation of the token store ready for serialisation. * @@ -3190,7 +3184,7 @@ var Application = length: this.length }; } - + /** * export the module via AMD, CommonJS or as a browser global * Export code from https://github.com/umdjs/umd/blob/master/returnExports.js @@ -3225,15 +3219,15 @@ var Application = /***/ function(module, exports) { "use strict"; - + Object.defineProperty(exports, "__esModule", { value: true }); - + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - + /* * Copyright (c) 2016 Martin Donath * @@ -3255,13 +3249,13 @@ var Application = * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - + /* ---------------------------------------------------------------------------- * Github Source * ------------------------------------------------------------------------- */ - + var GithubSourceFacts = function () { - + /** * Constructor. * @@ -3271,27 +3265,27 @@ var Application = */ function GithubSourceFacts(storage, repoUrl) { _classCallCheck(this, GithubSourceFacts); - + this.storage = storage; this.storageKey = "github-source-facts"; this.apiRepoUrl = repoUrl.replace("github.com/", "api.github.com/repos/"); } - + /** * Retrieve stars and fork counts for the repository before invoking * `GithubSourceFacts.paint`. * * @return {void} */ - - + + _createClass(GithubSourceFacts, [{ key: "initialize", value: function initialize() { var _this = this; - + var facts = this.storage.getItem(this.storageKey); - + // Retrieve the facts, then invoke paint if (!facts) { fetch(this.apiRepoUrl).then(function (response) { @@ -3301,9 +3295,9 @@ var Application = stars: data.stargazers_count, forks: data.forks_count }; - + _this.storage.setItem(_this.storageKey, JSON.stringify(repoFacts)); - + GithubSourceFacts.paint(repoFacts); }).catch(function () { // console.log("parsing failed", ex) @@ -3313,7 +3307,7 @@ var Application = GithubSourceFacts.paint(JSON.parse(facts)); } } - + /** * Populates `.md-source__facts` with star and fork counts. * @@ -3321,41 +3315,41 @@ var Application = * @param {integer} options.forks - Fork count for the repo * @return {void} */ - + }], [{ key: "paint", value: function paint(_ref) { var stars = _ref.stars; var forks = _ref.forks; - + var lists = document.querySelectorAll(".md-source__facts"); // TODO 2x list in drawer and header - + [].forEach.call(lists, function (list) { - + var li = document.createElement("li"); li.className = "md-source__fact md-source__fact--hidden"; li.innerText = stars + " Stars"; list.appendChild(li); - + setTimeout(function (lix) { lix.classList.remove("md-source__fact--hidden"); }, 100, li); - + li = document.createElement("li"); li.className = "md-source__fact md-source__fact--hidden"; li.innerText = forks + " Forks"; list.appendChild(li); - + setTimeout(function (lix) { lix.classList.remove("md-source__fact--hidden"); }, 500, li); }); } }]); - + return GithubSourceFacts; }(); - + exports.default = GithubSourceFacts; module.exports = exports["default"]; @@ -3364,11 +3358,11 @@ var Application = /***/ function(module, exports, __webpack_require__) { "use strict"; - + Object.defineProperty(exports, "__esModule", { value: true }); - + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); /* * Copyright (c) 2016 Martin Donath * @@ -3390,28 +3384,28 @@ var Application = * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - + var _Sidebar = __webpack_require__(6); - + var _Sidebar2 = _interopRequireDefault(_Sidebar); - + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - + /* ---------------------------------------------------------------------------- * Material application * ------------------------------------------------------------------------- */ - + var Material = function () { function Material() { _classCallCheck(this, Material); } - + _createClass(Material, [{ key: "initialize", - - + + /** * Constructor * @@ -3420,19 +3414,19 @@ var Application = // constructor() { // // } - + /** * @return {void} */ value: function initialize() { - + // class AnchorMarker extends PageYOffsetListener // class SidebarConstrainer extends PageYOffsetListener - + // MatchMedia!? - + var width = window.matchMedia("(min-width: 1200px)"); - + // separate function in application.js --> initSidebar() var sidebar = new _Sidebar2.default.Position("[data-md-sidebar=primary]"); var handler = function handler() { @@ -3443,20 +3437,20 @@ var Application = } }; handler(); // check listen! - + var toc = new _Sidebar2.default.Position("[data-md-sidebar=secondary]"); toc.listen(); - + window.addEventListener("resize", handler); // TODO: orientation change etc... - + var marker = new _Sidebar2.default.Marker("[data-md-sidebar=secondary] .md-nav__link"); marker.listen(); } }]); - + return Material; }(); - + exports.default = Material; module.exports = exports["default"]; @@ -3465,25 +3459,25 @@ var Application = /***/ function(module, exports, __webpack_require__) { "use strict"; - + Object.defineProperty(exports, "__esModule", { value: true }); - + var _Marker = __webpack_require__(7); - + var _Marker2 = _interopRequireDefault(_Marker); - + var _Position = __webpack_require__(9); - + var _Position2 = _interopRequireDefault(_Position); - + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - + /* ---------------------------------------------------------------------------- * Definition * ------------------------------------------------------------------------- */ - + /* * Copyright (c) 2016 Martin Donath * @@ -3505,7 +3499,7 @@ var Application = * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - + exports.default = { Marker: _Marker2.default, Position: _Position2.default @@ -3517,23 +3511,23 @@ var Application = /***/ function(module, exports, __webpack_require__) { "use strict"; - + Object.defineProperty(exports, "__esModule", { value: true }); - + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - + var _Abstract2 = __webpack_require__(8); - + var _Abstract3 = _interopRequireDefault(_Abstract2); - + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - + function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } - + function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /* * Copyright (c) 2016 Martin Donath * @@ -3555,14 +3549,14 @@ var Application = * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - + /* ---------------------------------------------------------------------------- * Definition * ------------------------------------------------------------------------- */ - + var Marker = function (_Abstract) { _inherits(Marker, _Abstract); - + /** * Mark anchors within the table of contents above current page y-offset * @@ -3571,35 +3565,35 @@ var Application = */ function Marker(els) { _classCallCheck(this, Marker); - + /* Resolve elements */ var _this = _possibleConstructorReturn(this, (Marker.__proto__ || Object.getPrototypeOf(Marker)).call(this)); - + _this.els_ = typeof els === "string" ? document.querySelectorAll(els) : els; - + /* Initialize index and page y-offset */ _this.index_ = 0; _this.offset_ = window.pageYOffset; - + /* Index anchor nodes for fast lookup */ _this.anchors_ = [].map.call(_this.els_, function (el) { return document.querySelector(el.hash); }); return _this; } - + /** * Update anchor states * * @param {Event} ev - Event (omitted) */ - - + + _createClass(Marker, [{ key: "update", value: function update() { var offset = window.pageYOffset; - + /* Scroll direction is down */ if (this.offset_ <= offset) { for (var i = this.index_ + 1; i < this.els_.length; i++) { @@ -3610,7 +3604,7 @@ var Application = break; } } - + /* Scroll direction is up */ } else { for (var _i = this.index_; _i >= 0; _i--) { @@ -3622,15 +3616,15 @@ var Application = } } } - + /* Remember current offset for next iteration */ this.offset_ = offset; } - + /** * Reset anchor states */ - + }, { key: "reset", value: function reset() { @@ -3639,10 +3633,10 @@ var Application = }); } }]); - + return Marker; }(_Abstract3.default); - + exports.default = Marker; module.exports = exports["default"]; @@ -3651,15 +3645,15 @@ var Application = /***/ function(module, exports) { "use strict"; - + Object.defineProperty(exports, "__esModule", { value: true }); - + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - + /* * Copyright (c) 2016 Martin Donath * @@ -3681,13 +3675,13 @@ var Application = * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - + /* ---------------------------------------------------------------------------- * Definition * ------------------------------------------------------------------------- */ - + var Abstract = function () { - + /** * Dispatch update on next repaint * @@ -3695,11 +3689,11 @@ var Application = */ function Abstract() { var _this = this; - + _classCallCheck(this, Abstract); - + if (this === Abstract) throw new TypeError("Cannot construct abstract instance"); - + /* Dispatch update on next repaint */ this.handler_ = function (ev) { window.requestAnimationFrame(function () { @@ -3707,70 +3701,70 @@ var Application = }); }; } - + /** * Update state * * @abstract */ - - + + _createClass(Abstract, [{ key: "update", value: function update() { throw new Error("update(): not implemented"); } - + /** * Reset state * * @abstract */ - + }, { key: "reset", value: function reset() { throw new Error("reset(): not implemented"); } - + /** * Register listener for all relevant events */ - + }, { key: "listen", value: function listen() { var _this2 = this; - + ["scroll", "resize", "orientationchange"].forEach(function (name) { window.addEventListener(name, _this2.handler_, false); }); - + /* Initial update */ this.update(); } - + /** * Unregister listener for all relevant events */ - + }, { key: "unlisten", value: function unlisten() { var _this3 = this; - + ["scroll", "resize", "orientationchange"].forEach(function (name) { window.removeEventListener(name, _this3.handler_, false); }); - + /* Final reset */ this.reset(); } }]); - + return Abstract; }(); - + exports.default = Abstract; module.exports = exports["default"]; @@ -3779,23 +3773,23 @@ var Application = /***/ function(module, exports, __webpack_require__) { "use strict"; - + Object.defineProperty(exports, "__esModule", { value: true }); - + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - + var _Abstract2 = __webpack_require__(8); - + var _Abstract3 = _interopRequireDefault(_Abstract2); - + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - + function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } - + function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /* * Copyright (c) 2016 Martin Donath * @@ -3817,14 +3811,14 @@ var Application = * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - + /* ---------------------------------------------------------------------------- * Definition * ------------------------------------------------------------------------- */ - + var Position = function (_Abstract) { _inherits(Position, _Abstract); - + /** * Set sidebars to locked state and limit height to parent node * @@ -3833,62 +3827,62 @@ var Application = */ function Position(el) { _classCallCheck(this, Position); - + /* Resolve elements */ var _this = _possibleConstructorReturn(this, (Position.__proto__ || Object.getPrototypeOf(Position)).call(this)); - + _this.el_ = typeof el === "string" ? document.querySelector(el) : el; - + /* Index inner and outer container */ var inner = _this.el_.parentNode; var outer = _this.el_.parentNode.parentNode; - + /* Get top and bottom bounds */ _this.offset_ = outer.offsetTop; _this.bounds_ = { top: inner.offsetTop, bottom: inner.offsetTop + inner.offsetHeight }; - + /* Initialize current height */ _this.height_ = 0; return _this; } - + /** * Update locked state and height * * @param {Event} ev - Event (omitted) */ - - + + _createClass(Position, [{ key: "update", value: function update() { var scroll = window.pageYOffset; var expand = window.innerHeight; - + /* Calculate new bounds */ var offset = this.bounds_.top - scroll; var height = expand - Math.max(0, scroll + expand - this.bounds_.bottom) - Math.max(offset, this.offset_); - + /* If height changed, update element */ if (height !== this.height_) this.el_.style.height = (this.height_ = height) + "px"; - + /* Sidebar should be locked, as we're below parent offset */ if (offset < this.offset_) { if (!this.el_.dataset.mdLocked) this.el_.dataset.mdLocked = ""; - + /* Sidebar should be unlocked, if locked */ } else if (typeof this.el_.dataset.mdLocked === "string") { delete this.el_.dataset.mdLocked; } } - + /** * Reset locked state and height */ - + }, { key: "reset", value: function reset() { @@ -3897,13 +3891,12 @@ var Application = this.height_ = 0; } }]); - + return Position; }(_Abstract3.default); - + exports.default = Position; module.exports = exports["default"]; /***/ } -/******/ ]); -//# sourceMappingURL=application.js.map \ No newline at end of file +/******/ ]); \ No newline at end of file diff --git a/material/assets/stylesheets/application.css b/material/assets/stylesheets/application.css index 45f9ee2d3..61347a7f3 100644 --- a/material/assets/stylesheets/application.css +++ b/material/assets/stylesheets/application.css @@ -89,7 +89,7 @@ input { border: 0; outline: 0; } -.md-icon, .md-nav__title::before, .md-nav__link::after, .admonition-title::before, .footnote-backref, .md-search-term::before, .checklist li::before, .critic.comment::before { +.md-icon, .md-nav__title::before, .md-nav__link::after, .admonition-title::before, .footnote-backref, .checklist li::before, .critic.comment::before { font-family: "Material Icons"; font-style: normal; font-variant: normal; @@ -389,10 +389,9 @@ hr { position: absolute; bottom: 0; width: 100%; } - -.md-footer-pagination { - background: rgba(0, 0, 0, 0.87); - color: white; } + .md-footer__inner { + background: rgba(0, 0, 0, 0.87); + color: white; } .md-footer-nav { padding: 0.4rem; @@ -486,20 +485,11 @@ hr { .md-search__inner { width: 100%; } -.md-search__icon { - position: absolute; - top: 0.8rem; - left: 1.2rem; - -webkit-transition: color 0.25s; - transition: color 0.25s; - font-size: 2.4rem; - cursor: pointer; } - .md-search__icon::before { - content: "search"; } - .md-search__input { + position: relative; padding: 0 1.6rem 0 7.2rem; - text-overflow: ellipsis; } + text-overflow: ellipsis; + z-index: 1; } .md-search__input + .md-search__icon, .md-search__input::-webkit-input-placeholder { color: rgba(0, 0, 0, 0.54); } .md-search__input + .md-search__icon, .md-search__input::-moz-placeholder { @@ -509,6 +499,34 @@ hr { .md-search__input + .md-search__icon, .md-search__input::placeholder { color: rgba(0, 0, 0, 0.54); } +.md-search__icon { + position: absolute; + top: 0.8rem; + left: 1.2rem; + -webkit-transition: color 0.25s; + transition: color 0.25s; + font-size: 2.4rem; + cursor: pointer; + z-index: 1; } + .md-search__icon::before { + content: "search"; } + +.md-search__output { + width: 100%; + border-radius: 0 0 0.2rem 0.2rem; + overflow: hidden; } + +.md-search__scrollwrap { + height: 100%; + background: -webkit-linear-gradient(top, white 10%, rgba(255, 255, 255, 0)), -webkit-linear-gradient(top, rgba(0, 0, 0, 0.26), rgba(0, 0, 0, 0.07) 35%, transparent 60%); + background: linear-gradient(to bottom, white 10%, rgba(255, 255, 255, 0)), linear-gradient(to bottom, rgba(0, 0, 0, 0.26), rgba(0, 0, 0, 0.07) 35%, transparent 60%); + background-attachment: local, scroll; + background-color: white; + background-repeat: no-repeat; + background-size: 100% 2.0rem, 100% 1.0rem; + box-shadow: 0 0.1rem 0 rgba(0, 0, 0, 0.07) inset; + overflow-y: auto; } + .md-sidebar { position: relative; width: 24.2rem; @@ -1016,17 +1034,6 @@ hr { padding-top: 9rem; content: ""; } -.md-search__output { - overflow-y: auto; - width: 100%; - opacity: 0; - -webkit-transition: opacity .4s, max-height .4s; - transition: opacity .4s, max-height .4s; - text-align: left; - z-index: -1; } - [data-md-locked] .md-search__output { - opacity: 1; } - .md-search-result__meta { color: rgba(0, 0, 0, 0.54); padding-left: 4.8rem; @@ -1062,24 +1069,6 @@ hr { line-height: 1.4; margin: 0.5em 0; } -.md-search-term { - position: relative; - padding: 0 0.8rem 0 4.8rem; - line-height: 4.0rem; - font-size: 1.6rem; - -webkit-transition: background .25s; - transition: background .25s; - cursor: pointer; } - .md-search-term::before { - position: absolute; - content: "access_time"; - font-size: 2.4rem; - line-height: 4.0rem; - left: 1.2rem; - color: rgba(0, 0, 0, 0.26); } - .md-search-term:hover { - background: #eceef8; } - .checklist li { position: relative; list-style-type: none; } @@ -1186,22 +1175,29 @@ mark { border-radius: 0.2em; } .md-typeset sup[id]:target { background: orange; } - @media only screen and (max-width: 44.9375em){ + +.md-header { + position: static !important; } + +.md-toggle { + display: initial !important; } + +@media only screen and (max-width: 44.9375em){ .md-typeset > div > pre, .md-typeset > pre > code{ margin: 1.0em -1.6rem; padding: 1.0rem 1.6rem; - border-radius: 0; } - .md-search__suggest{ - position: relative; - z-index: 2; } } - @media only screen and (min-width: 100em){ + border-radius: 0; } } + +@media only screen and (min-width: 100em){ html{ font-size: 68.75%; } } - @media only screen and (min-width: 125em){ + +@media only screen and (min-width: 125em){ html{ font-size: 75%; } } - @media only screen and (max-width: 74.9375em){ + +@media only screen and (max-width: 74.9375em){ .md-toggle--drawer:checked ~ .md-overlay{ width: 100%; height: 100%; @@ -1336,7 +1332,8 @@ mark { overflow: hidden; } .md-sidebar--primary .md-sidebar__scrollwrap{ margin: 0; } } - @media only screen and (min-width: 60em){ + +@media only screen and (min-width: 60em){ .md-content{ margin-right: 24.2rem; } .md-header-nav__icon--search{ @@ -1353,10 +1350,11 @@ mark { position: relative; } .md-search__form{ width: 23.0rem; + float: right; -webkit-transition: width 0.25s cubic-bezier(0.1, 0.7, 0.1, 1); transition: width 0.25s cubic-bezier(0.1, 0.7, 0.1, 1); border-radius: 0.2rem; } - [data-md-locked] .md-search__form{ + .md-toggle--search:checked ~ .md-header .md-search__form{ width: 66.8rem; } .md-search__input{ width: 100%; @@ -1386,50 +1384,46 @@ mark { color: white; } .md-search__input:hover{ background: rgba(255, 255, 255, 0.12); } - [data-md-locked] .md-search__input{ + .md-toggle--search:checked ~ .md-header .md-search__input{ border-radius: 0.2rem 0.2rem 0 0; background: white; color: rgba(0, 0, 0, 0.87); text-overflow: none; } - [data-md-locked] .md-search__input + .md-search__icon, [data-md-locked] .md-search__input::-webkit-input-placeholder{ + .md-toggle--search:checked ~ .md-header .md-search__input + .md-search__icon, .md-toggle--search:checked ~ .md-header .md-search__input::-webkit-input-placeholder{ color: rgba(0, 0, 0, 0.54); } - [data-md-locked] .md-search__input + .md-search__icon, [data-md-locked] .md-search__input::-moz-placeholder{ + .md-toggle--search:checked ~ .md-header .md-search__input + .md-search__icon, .md-toggle--search:checked ~ .md-header .md-search__input::-moz-placeholder{ color: rgba(0, 0, 0, 0.54); } - [data-md-locked] .md-search__input + .md-search__icon, [data-md-locked] .md-search__input:-ms-input-placeholder{ + .md-toggle--search:checked ~ .md-header .md-search__input + .md-search__icon, .md-toggle--search:checked ~ .md-header .md-search__input:-ms-input-placeholder{ color: rgba(0, 0, 0, 0.54); } - [data-md-locked] .md-search__input + .md-search__icon, [data-md-locked] .md-search__input::placeholder{ + .md-toggle--search:checked ~ .md-header .md-search__input + .md-search__icon, .md-toggle--search:checked ~ .md-header .md-search__input::placeholder{ color: rgba(0, 0, 0, 0.54); } + .md-search__output{ + box-shadow: 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12), 0 3px 5px -1px rgba(0, 0, 0, 0.4); + -webkit-transition: opacity 0.4s; + transition: opacity 0.4s; + opacity: 0; } + .md-toggle--search:checked ~ .md-header .md-search__output{ + opacity: 1; } + .md-search__scrollwrap{ + max-height: 0; } + .md-toggle--search:checked ~ .md-header .md-search__scrollwrap{ + max-height: 75vh; } + .md-search__scrollwrap::-webkit-scrollbar{ + width: 0.4rem; + height: 0.4rem; } + .md-search__scrollwrap::-webkit-scrollbar-thumb{ + background-color: rgba(0, 0, 0, 0.26); } + .md-search__scrollwrap::-webkit-scrollbar-thumb:hover{ + background-color: #536dfe; } .md-sidebar--secondary{ display: block; float: right; } .md-sidebar--secondary[data-md-locked]{ margin-left: 100%; -webkit-transform: translate(-100%, 0); - transform: translate(-100%, 0); } - .md-search__output{ - box-shadow: 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12), 0 3px 5px -1px rgba(0, 0, 0, 0.4); - background: white; - border-top: 0.1rem solid rgba(0, 0, 0, 0.07); - border-radius: 0 0 0.3rem 0.3rem; - position: absolute; - max-height: 0vh; - background: -webkit-linear-gradient(white 10%, rgba(255, 255, 255, 0)), -webkit-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.2) 20%, transparent 60%); - background: linear-gradient(white 10%, rgba(255, 255, 255, 0)), linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.2) 20%, transparent 60%); - background-repeat: no-repeat; - background-color: white; - background-size: 100% 20px, 100% 5px; - /* Opera doesn't support this in the shorthand */ - background-attachment: local, scroll; } - [data-md-locked] .md-search__output{ - max-height: 75vh; } - .md-search__output::-webkit-scrollbar{ - width: 0.4rem; - height: 0.4rem; } - .md-search__output::-webkit-scrollbar-thumb{ - background-color: rgba(0, 0, 0, 0.26); } - .md-search__output::-webkit-scrollbar-thumb:hover{ - background-color: #536dfe; } } - @media only screen and (min-width: 75em){ + transform: translate(-100%, 0); } } + +@media only screen and (min-width: 75em){ .md-content{ margin-left: 24.2rem; } .md-content__inner{ @@ -1463,16 +1457,19 @@ mark { transform: rotateX(180deg); } .md-sidebar__inner{ border-right: 0.1rem solid rgba(0, 0, 0, 0.07); } } - @media only screen and (min-width: 30em){ + +@media only screen and (min-width: 30em){ .md-footer-nav__link{ width: 50%; } } - @media only screen and (max-width: 29.9375em){ + +@media only screen and (max-width: 29.9375em){ .md-footer-nav__link--prev .md-footer-nav__title{ display: none; } .md-toggle--search:checked ~ .md-header .md-search__overlay{ -webkit-transform: scale(45); transform: scale(45); } } - @media only screen and (max-width: 59.9375em){ + +@media only screen and (max-width: 59.9375em){ .md-nav--secondary{ border-left: 0; } html .md-nav__link[for="toc"]{ @@ -1539,40 +1536,34 @@ mark { transition: left 0s 0s, transform 0.15s 0.15s cubic-bezier(0.1, 0.7, 0.1, 1), opacity 0.15s 0.15s; transition: left 0s 0s, transform 0.15s 0.15s cubic-bezier(0.1, 0.7, 0.1, 1), opacity 0.15s 0.15s, -webkit-transform 0.15s 0.15s cubic-bezier(0.1, 0.7, 0.1, 1); opacity: 1; } + .md-search__input{ + width: 100%; + height: 5.6rem; + font-size: 1.8rem; } .md-search__icon{ top: 1.6rem; left: 1.6rem; } .md-search__icon::before{ content: "arrow_back"; } - .md-search__input{ - width: 100%; - height: 5.6rem; - font-size: 1.8rem; } .md-search__output{ position: absolute; top: 5.6rem; - bottom: 0; - background: -webkit-linear-gradient(white 10%, rgba(255, 255, 255, 0)), -webkit-linear-gradient(top, rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.125) 20%, transparent 60%); - background: linear-gradient(white 10%, rgba(255, 255, 255, 0)), linear-gradient(to bottom, rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.125) 20%, transparent 60%); - background-repeat: no-repeat; - background-color: white; - background-size: 100% 20px, 100% 10px; - background-attachment: local, scroll; } + bottom: 0; } .md-search-result__link{ padding: 0 1.6rem; } .md-search-result__meta{ - padding-left: 1.6rem; - border-top: 0.1rem solid rgba(0, 0, 0, 0.07); } } - @media only screen and (min-width: 30em) and (max-width: 44.9375em){ + padding-left: 1.6rem; } } + +@media only screen and (min-width: 30em) and (max-width: 44.9375em){ .md-toggle--search:checked ~ .md-header .md-search__overlay{ -webkit-transform: scale(60); transform: scale(60); } } - @media only screen and (min-width: 45em) and (max-width: 59.9375em){ + +@media only screen and (min-width: 45em) and (max-width: 59.9375em){ .md-toggle--search:checked ~ .md-header .md-search__overlay{ -webkit-transform: scale(75); transform: scale(75); } } - @media only screen and (min-width: 60em) and (min-width: 75em){ + +@media only screen and (min-width: 60em) and (min-width: 75em){ .md-sidebar--secondary[data-md-locked]{ margin-left: 120.0rem; } } - -/*# sourceMappingURL=application.css.map */ diff --git a/material/partials/footer.html b/material/partials/footer.html index cb3382dd2..85db44d05 100644 --- a/material/partials/footer.html +++ b/material/partials/footer.html @@ -1,6 +1,6 @@
- {% if previous_page or next_page %} -
+
+ {% if previous_page or next_page %} -
- {% endif %} + {% endif %} +
diff --git a/material/partials/search.html b/material/partials/search.html index 10e560f73..61eec5931 100644 --- a/material/partials/search.html +++ b/material/partials/search.html @@ -3,15 +3,16 @@
- +
-
-
- 3 Search results +
+
+
+ Type to search... +
+
    -
      -
    diff --git a/src/assets/javascripts/application.js b/src/assets/javascripts/application.js index ecdc1a804..4007893dd 100644 --- a/src/assets/javascripts/application.js +++ b/src/assets/javascripts/application.js @@ -100,59 +100,74 @@ document.addEventListener("DOMContentLoaded", () => { FastClick.attach(document.body) const query = document.getElementById("query") - query.addEventListener("focus", () => { - document.querySelector(".md-search").dataset.mdLocked = "" - }) + // query.addEventListener("focus", () => { + // document.querySelector(".md-search").dataset.mdLocked = "" + // }) /* Intercept click on search mode toggle */ - let offset = 0 - const toggle = document.getElementById("search") - toggle.addEventListener("click", () => { // TODO: click may be the wrong event... - const list = document.body // classList md bla - const lock = !matchMedia("only screen and (min-width: 960px)").matches - - /* Exiting search mode */ - if (list.dataset.mdLocked) { - delete list.dataset.mdLocked - - /* Scroll to former position, but wait for 100ms to prevent flashes - on iOS. A short timeout seems to do the trick */ - if (lock) - setTimeout(() => { - window.scrollTo(0, offset) - }, 100) - - /* Entering search mode */ - } else { - offset = window.scrollY - - /* First timeout: scroll to top after transition, to omit flickering */ - if (lock) - setTimeout(() => { - window.scrollTo(0, 0) - }, 400) - - /* Second timeout: Lock body after finishing transition and scrolling to - top and focus input field. Sadly, the focus event is not dispatched - on iOS Safari and there's nothing we can do about it. */ - setTimeout(() => { - - /* This additional check is necessary to handle fast subsequent clicks - on the toggle and the timeout to lock the body must be cancelled */ - // if (ev.target.checked) { - if (lock) - list.dataset.mdLocked = "" - setTimeout(() => { - document.getElementById("query").focus() - }, 200) - // } - }, 450) - } - }) + // const offset = 0 + // const toggle = document.getElementById("search") + // toggle.addEventListener("click", () => { + // const list = document.body // classList md bla + // const lock = !matchMedia("only screen and (min-width: 960px)").matches + // + // /* Exiting search mode */ + // if (list.dataset.mdLocked) { + // delete list.dataset.mdLocked + // + // /* Scroll to former position, but wait for 100ms to prevent flashes + // on iOS. A short timeout seems to do the trick */ + // if (lock) + // setTimeout(() => { + // window.scrollTo(0, offset) + // }, 100) + // + // /* Entering search mode */ + // } else { + // offset = window.scrollY + // + // /* First timeout: scroll to top after transition, to omit flickering */ + // if (lock) + // setTimeout(() => { + // window.scrollTo(0, 0) + // }, 400) + // + // /* Second timeout: Lock body after finishing transition and scrolling + // to top and focus input field. Sadly, the focus event is not + // dispatched on iOS Safari and there's nothing we can do about it. */ + // setTimeout(() => { + // + // /* This additional check is necessary to handle fast subsequent + // clicks on the toggle and the timeout to lock the body must be + // cancelled */ + // // if (ev.target.checked) { + // if (lock) + // list.dataset.mdLocked = "" + // setTimeout(() => { + // document.getElementById("query").focus() + // }, 200) + // // } + // }, 450) + // } + // }) // TODO: only do this on MOBILE and TABLET - const toggleSearchClose = document.querySelector(".md-search__icon") - toggleSearchClose.setAttribute("for", "search") // TODO: override query with search, when on mobile!!! + // const toggleSearchClose = document.querySelector(".md-search__icon") + // toggleSearchClose.setAttribute("for", "search") // TODO: override query with search, when on mobile!!! + document.getElementById("query").addEventListener("focus", () => { + document.getElementById("search").checked = true + }) + + // should be registered on body, but leads to problems + document.querySelector(".md-container").addEventListener("click", () => { + if (document.getElementById("search").checked) + document.getElementById("search").checked = false + }) + + // stop propagation, if search is active... + document.querySelector(".md-search").addEventListener("click", ev => { + ev.stopPropagation() + }) // toggleSearchClose.addEventListener("click", ev => { // ev.preventDefault() // // ev.target @@ -202,7 +217,6 @@ document.addEventListener("DOMContentLoaded", () => { nav.style.maxHeight = `${last}px` }) } - }) // Capture the end with transitionend diff --git a/src/assets/stylesheets/_config.scss b/src/assets/stylesheets/_config.scss index 551bffa85..fbd7fe1b5 100644 --- a/src/assets/stylesheets/_config.scss +++ b/src/assets/stylesheets/_config.scss @@ -62,12 +62,14 @@ $md-color-black: hsla(0, 0%, 0%, 0.87); $md-color-black--light: hsla(0, 0%, 0%, 0.54); $md-color-black--lighter: hsla(0, 0%, 0%, 0.26); $md-color-black--lightest: hsla(0, 0%, 0%, 0.07); +$md-color-black--transparent: hsla(0, 0%, 0%, 0); // Shades of white $md-color-white: hsla(0, 0%, 100%, 1.00); $md-color-white--light: hsla(0, 0%, 100%, 0.70); $md-color-white--lighter: hsla(0, 0%, 100%, 0.30); $md-color-white--lightest: hsla(0, 0%, 100%, 0.12); +$md-color-white--transparent: hsla(0, 0%, 100%, 0); // ---------------------------------------------------------------------------- // Variables: sizing and spacing diff --git a/src/assets/stylesheets/_shame.scss b/src/assets/stylesheets/_shame.scss index 0ab391430..5f97fcd2b 100644 --- a/src/assets/stylesheets/_shame.scss +++ b/src/assets/stylesheets/_shame.scss @@ -24,124 +24,23 @@ // Rules // ---------------------------------------------------------------------------- -// TODO: cleanup redundant data-md-locked, -// --> use hidden checkbox for reasons of label/button/trigger easyness... -// TODO: set label for magnifying glasses onto search toggle -// --> this way we can always use the search toggle and only need the locked state on the body! -// --> question: how does this play with directly focusing the search field!? - -.md-search__output { - overflow-y: auto; // necessary for rounded borders - // &::after { - // display: block; - // content: ""; - // width: 100%; - // height: 20px; - // background: red; // TODO: white shadow overlay to fade out result scrolling - // } - - [data-md-locked] & { - opacity: 1; - } - - width: 100%; - - opacity: 0; - transition: opacity .4s, max-height .4s; - - - text-align: left; // TODO: wrap with another div for this effect - - z-index: -1; // ??? wherefor? probably not necessary anymore. -} - @include break-to-device(tablet portrait) { - .md-search__output { - position: absolute; - top: 5.6rem; - bottom: 0; - - background: - linear-gradient(white 10%, rgba(255,255,255,0)), // cover - linear-gradient(to bottom, rgba(0, 0, 0, 0.25), - rgba(0, 0, 0, 0.125) 20%, - rgba(0, 0, 0, 0) 60%); // shadow - background-repeat: no-repeat; - background-color: white; - background-size: 100% 20px, 100% 10px; - - // Opera doesn't support this in the shorthand - background-attachment: local, scroll; - } - .md-search-result__item { - // margin: 0.8rem; - } .md-search-result__link { padding: 0 1.6rem; - // background: white; - // border-radius: 0.2rem; - // @include z-depth(2); } .md-search-result__meta { padding-left: 1.6rem; - border-top: 0.1rem solid rgba(0, 0, 0, 0.07); - } -} - -@include break-from-device(tablet landscape) { - - // Scroll shadow - WIP - .md-search__output { - @include z-depth(6); - - background: $md-color-white; - // color: red; - border-top: 0.1rem solid $md-color-black--lightest; // TODO: box-shadow inset! - border-radius: 0 0 0.3rem 0.3rem; // ??? - position: absolute; // must be absolute, or header nav will stretch - max-height: 0vh; // TODO: can this be done in percent!?!?!? - [data-md-locked] & { - max-height: 75vh; - } - - // Override native scrollbar styles - &::-webkit-scrollbar { - width: 0.4rem; - height: 0.4rem; - - // Style scrollbar thumb - &-thumb { - background-color: $md-color-black--lighter; - - // Hovered scrollbar thumb - &:hover { - background-color: $md-color-accent; - } - } - } - - background: - linear-gradient(white 10%, rgba(255,255,255,0)), // cover - linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.2) 20%, rgba(0, 0, 0, 0) 60%); // shadow - background-repeat: no-repeat; - background-color: white; - background-size: 100% 20px, 100% 5px; - - /* Opera doesn't support this in the shorthand */ - background-attachment: local, scroll; } } .md-search-result { - &__meta { color: $md-color-black--light; padding-left: 4.8rem; padding-right: 1.6rem; line-height: 4.0rem; font-size: ms(-1); - } &__list { @@ -151,13 +50,6 @@ border-top: 0.1rem solid $md-color-black--lightest; } - &__item { - // background: yellow; - - // border-top: 0.1rem solid $md-color-black--lightest; - } - - &__link { overflow: auto; display: block; @@ -225,37 +117,37 @@ // border-radius: 0.3rem 0.3rem 0 0; // } -@include break-to-device(mobile landscape) { - - .md-search__suggest { - position: relative; - z-index: 2; - } -} - -.md-search-term { - position: relative; - padding: 0 0.8rem 0 4.8rem; - line-height: 4.0rem; // don't use line height???? - font-size: 1.6rem; - - &::before { - @extend %md-icon; - - position: absolute; - - content: "access_time"; - font-size: 2.4rem; - line-height: 4.0rem; // this sucks... - left: 1.2rem; - color: $md-color-black--lighter; - } - transition: background .25s; - cursor: pointer; - &:hover { - background: mix($md-color-white, $md-color-primary, 90%); - } -} +// @include break-to-device(mobile landscape) { +// +// .md-search__suggest { +// position: relative; +// z-index: 2; +// } +// } +// +// .md-search-term { +// position: relative; +// padding: 0 0.8rem 0 4.8rem; +// line-height: 4.0rem; // don't use line height???? +// font-size: 1.6rem; +// +// &::before { +// @extend %md-icon; +// +// position: absolute; +// +// content: "access_time"; +// font-size: 2.4rem; +// line-height: 4.0rem; // this sucks... +// left: 1.2rem; +// color: $md-color-black--lighter; +// } +// transition: background .25s; +// cursor: pointer; +// &:hover { +// background: mix($md-color-white, $md-color-primary, 90%); +// } +// } @@ -440,9 +332,10 @@ mark { } } -// TODO: remove jitter -// .md-search, -// .md-search__inner, -// .md-search__form { -// text-align: right; -// } +// TODO for temporary fixes +.md-header { + position: static !important +} +.md-toggle { + display: initial !important; +} diff --git a/src/assets/stylesheets/layout/_base.scss b/src/assets/stylesheets/layout/_base.scss index ccb9bb144..2997a2d48 100644 --- a/src/assets/stylesheets/layout/_base.scss +++ b/src/assets/stylesheets/layout/_base.scss @@ -30,12 +30,12 @@ html { height: 100%; font-size: 62.5%; - // [screen medium +] Set base font-size to 11px + // [screen medium +]: Set base font-size to 11px @include break-from-device(screen medium) { font-size: 68.75%; } - // [screen large +] Set base font-size to 12px + // [screen large +]: Set base font-size to 12px @include break-from-device(screen large) { font-size: 75%; } diff --git a/src/assets/stylesheets/layout/_footer.scss b/src/assets/stylesheets/layout/_footer.scss index bd2903b3b..d47a46a60 100644 --- a/src/assets/stylesheets/layout/_footer.scss +++ b/src/assets/stylesheets/layout/_footer.scss @@ -29,15 +29,15 @@ position: absolute; bottom: 0; width: 100%; + + // Footer container + &__inner { + background: $md-color-black; + color: $md-color-white; + } } -// Pagination container -.md-footer-pagination { - background: $md-color-black; - color: $md-color-white; -} - -// Footer navigation +// Navigation within footer .md-footer-nav { padding: 0.4rem; overflow: auto; diff --git a/src/assets/stylesheets/layout/_search.scss b/src/assets/stylesheets/layout/_search.scss index 2a662612c..a8195b952 100644 --- a/src/assets/stylesheets/layout/_search.scss +++ b/src/assets/stylesheets/layout/_search.scss @@ -43,7 +43,7 @@ display: none; pointer-events: none; - // [tablet portrait -]: Show overlay + // [tablet portrait -]: Full-screen search bar @include break-to-device(tablet portrait) { display: block; position: absolute; @@ -70,7 +70,7 @@ } } - // Set scale factors (currently selected by trial) + // Set scale factors .md-toggle--search:checked ~ .md-header & { // [mobile portrait -]: Scale up 45 times @@ -83,7 +83,7 @@ transform: scale(60); } - // [mobile landscape]: Scale up 75 times + // [tablet portrait]: Scale up 75 times @include break-at-device(tablet portrait) { transform: scale(75); } @@ -120,7 +120,7 @@ } } - // [tablet landscape +]: Make relative for inner positioning + // [tablet landscape +]: Make relative for inner layout @include break-from-device(tablet landscape) { position: relative; } @@ -132,47 +132,26 @@ // [tablet landscape +]: Header-embedded search @include break-from-device(tablet landscape) { width: 23.0rem; + + // Hack: omit jitter when form is resized + float: right; + transition: width 0.25s cubic-bezier(0.1, 0.7, 0.1, 1.0); border-radius: 0.2rem; - // Active search field - [data-md-locked] & { + // Enlarge search field when active + .md-toggle--search:checked ~ .md-header & { width: 66.8rem; } } } - // Icon - &__icon { - position: absolute; - top: $md-icon-padding; - left: $md-icon-padding + $md-icon-margin; // TODO: solve in some other way... - transition: color 0.25s; - font-size: $md-icon-size; - cursor: pointer; - - // Set search icon on pseudo class, so it can be overridden for mobile - // and tablet when the search is rendered in an overlay - &::before { - content: "search"; - } - - // [tablet portrait -]: Use back arrow as search icon - @include break-to-device(tablet portrait) { - top: 1.6rem; - left: 1.6rem; - - // Show back arrow instead of search icon - &::before { - content: "arrow_back"; - } - } - } - - // Search field + // Search input &__input { + position: relative; padding: 0 1.6rem 0 7.2rem; text-overflow: ellipsis; + z-index: 1; // Placeholder and icon color in active state + .md-search__icon, @@ -212,8 +191,8 @@ background: $md-color-white--lightest; } - // Active search field - [data-md-locked] & { + // Set light background on active search field + .md-toggle--search:checked ~ .md-header & { border-radius: 0.2rem 0.2rem 0 0; background: $md-color-white; color: $md-color-black; @@ -227,4 +206,112 @@ } } } + + // Icon + &__icon { + position: absolute; + top: $md-icon-padding; + left: $md-icon-padding + $md-icon-margin; + transition: color 0.25s; + font-size: $md-icon-size; + cursor: pointer; + z-index: 1; + + // Set search icon on pseudo class, so it can be overridden for mobile + // and tablet when the search is rendered in an overlay + &::before { + content: "search"; + } + + // [tablet portrait -]: Full-screen search bar + @include break-to-device(tablet portrait) { + top: 1.6rem; + left: 1.6rem; + + // Show back arrow instead of search icon + &::before { + content: "arrow_back"; + } + } + } + + // Search output container + &__output { + width: 100%; + border-radius: 0 0 0.2rem 0.2rem; + overflow: hidden; + + // [tablet portrait -]: Full-screen search bar + @include break-to-device(tablet portrait) { + position: absolute; + top: 5.6rem; + bottom: 0; + } + + // [tablet landscape +]: Header-embedded search + @include break-from-device(tablet landscape) { + @include z-depth(6); + + transition: opacity 0.4s; + opacity: 0; + + // Show search output in active state + .md-toggle--search:checked ~ .md-header & { + opacity: 1; + } + } + } + + // Wrapper for scrolling on overflow + &__scrollwrap { + height: 100%; + + // Pure CSS scrolling shadows, taken from + // http://lea.verou.me/2012/04/background-attachment-local/ + background: + linear-gradient( + to bottom, + $md-color-white 10%, + $md-color-white--transparent), + linear-gradient( + to bottom, + $md-color-black--lighter, + $md-color-black--lightest 35%, + $md-color-black--transparent 60%); + + // Hack: Opera doesn't support this in the shorthand + background-attachment: local, scroll; + background-color: $md-color-white; + background-repeat: no-repeat; + background-size: 100% 2.0rem, 100% 1.0rem; + + box-shadow: 0 0.1rem 0 $md-color-black--lightest inset; + overflow-y: auto; + + // [tablet landscape +]: Limit height to viewport + @include break-from-device(tablet landscape) { + max-height: 0; + + // Expand in active state + .md-toggle--search:checked ~ .md-header & { + max-height: 75vh; + } + + // Override native scrollbar styles + &::-webkit-scrollbar { + width: 0.4rem; + height: 0.4rem; + + // Style scrollbar thumb + &-thumb { + background-color: $md-color-black--lighter; + + // Hovered scrollbar thumb + &:hover { + background-color: $md-color-accent; + } + } + } + } + } } diff --git a/src/partials/footer.html b/src/partials/footer.html index 4c8cc7296..6c07fa847 100644 --- a/src/partials/footer.html +++ b/src/partials/footer.html @@ -22,10 +22,10 @@
    +
    - - {% if previous_page or next_page %} -
    + + {% if previous_page or next_page %} -
    - {% endif %} + {% endif %} +
    diff --git a/src/partials/search.html b/src/partials/search.html index 14379e401..e1b54ca7f 100644 --- a/src/partials/search.html +++ b/src/partials/search.html @@ -23,77 +23,21 @@
    - -
    - - - - +
    -
    -
    - 3 Search results +
    +
    +
    + Type to search... +
    +
      -
        - -