+ {{- if (.Param "ShowBreadCrumbs")}} + + {{- $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }} + {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} + + {{ i18n "home" | default "Home"}} + {{- range $index, $element := split $lang_url "/" }} + + {{- $.Scratch.Add "path" (printf "%s/" $element )}} + {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} + + {{- if (and ($bc_pg) (gt (len . ) 0))}} + {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} + {{- end }} + + {{- end }} + + {{- end }} {{ .Title }} {{- if .Draft }} [draft]{{- end }} From 2b8e7c0b2205643fa9e87c90030d671472b76264 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:07:52 +0530 Subject: [PATCH 036/483] Update FUNDING.yml re-add buymeacoffee after technical issue is resolved --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 00c66657..6a78a557 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: # +custom: ['https://www.buymeacoffee.com/adityatelange'] From 714859b682c470bff0508d9e0844f0c9c5954df5 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:31:41 +0530 Subject: [PATCH 037/483] Update README.md add new features in the list --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1b13fae1..8122d5a2 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ ExampleSite can be found here: [exampleSite](https://github.com/adityatelange/hu - SEO Friendly. - Muliple Author support. - Search Page with Fuse.js +- Other Posts suggestion below a post +- BreadCrumb Navigation - No webpack, nodejs and other depedencies required to edit the theme. Read Wiki For More Details => **[PaperMod - Features](https://github.com/adityatelange/hugo-PaperMod/wiki/Features)** From 346ae95069b832984a95caf00cafcc9bb6705516 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:40:58 +0530 Subject: [PATCH 038/483] use Basic instead of Full - also use production ones which contains lesser redundant code - https://fusejs.io/getting-started/different-builds.html#explanation-of-different-builds --- assets/js/fuse.js | 2248 +-------------------------------------------- 1 file changed, 1 insertion(+), 2247 deletions(-) diff --git a/assets/js/fuse.js b/assets/js/fuse.js index 6be05928..3ca4e666 100644 --- a/assets/js/fuse.js +++ b/assets/js/fuse.js @@ -6,2250 +6,4 @@ * * http://www.apache.org/licenses/LICENSE-2.0 */ - -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : - typeof define === 'function' && define.amd ? define(factory) : - (global = global || self, global.Fuse = factory()); -}(this, (function () { 'use strict'; - - function _typeof(obj) { - "@babel/helpers - typeof"; - - if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { - _typeof = function (obj) { - return typeof obj; - }; - } else { - _typeof = function (obj) { - return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; - }; - } - - return _typeof(obj); - } - - function _classCallCheck(instance, Constructor) { - if (!(instance instanceof Constructor)) { - throw new TypeError("Cannot call a class as a 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); - } - } - - function _createClass(Constructor, protoProps, staticProps) { - if (protoProps) _defineProperties(Constructor.prototype, protoProps); - if (staticProps) _defineProperties(Constructor, staticProps); - return Constructor; - } - - function _defineProperty(obj, key, value) { - if (key in obj) { - Object.defineProperty(obj, key, { - value: value, - enumerable: true, - configurable: true, - writable: true - }); - } else { - obj[key] = value; - } - - return obj; - } - - function ownKeys(object, enumerableOnly) { - var keys = Object.keys(object); - - if (Object.getOwnPropertySymbols) { - var symbols = Object.getOwnPropertySymbols(object); - if (enumerableOnly) symbols = symbols.filter(function (sym) { - return Object.getOwnPropertyDescriptor(object, sym).enumerable; - }); - keys.push.apply(keys, symbols); - } - - return keys; - } - - function _objectSpread2(target) { - for (var i = 1; i < arguments.length; i++) { - var source = arguments[i] != null ? arguments[i] : {}; - - if (i % 2) { - ownKeys(Object(source), true).forEach(function (key) { - _defineProperty(target, key, source[key]); - }); - } else if (Object.getOwnPropertyDescriptors) { - Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); - } else { - ownKeys(Object(source)).forEach(function (key) { - Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); - }); - } - } - - return target; - } - - function _inherits(subClass, superClass) { - if (typeof superClass !== "function" && superClass !== null) { - throw new TypeError("Super expression must either be null or a function"); - } - - subClass.prototype = Object.create(superClass && superClass.prototype, { - constructor: { - value: subClass, - writable: true, - configurable: true - } - }); - if (superClass) _setPrototypeOf(subClass, superClass); - } - - function _getPrototypeOf(o) { - _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { - return o.__proto__ || Object.getPrototypeOf(o); - }; - return _getPrototypeOf(o); - } - - function _setPrototypeOf(o, p) { - _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { - o.__proto__ = p; - return o; - }; - - return _setPrototypeOf(o, p); - } - - function _isNativeReflectConstruct() { - if (typeof Reflect === "undefined" || !Reflect.construct) return false; - if (Reflect.construct.sham) return false; - if (typeof Proxy === "function") return true; - - try { - Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); - return true; - } catch (e) { - return false; - } - } - - function _assertThisInitialized(self) { - if (self === void 0) { - throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); - } - - return self; - } - - function _possibleConstructorReturn(self, call) { - if (call && (typeof call === "object" || typeof call === "function")) { - return call; - } - - return _assertThisInitialized(self); - } - - function _createSuper(Derived) { - var hasNativeReflectConstruct = _isNativeReflectConstruct(); - - return function _createSuperInternal() { - var Super = _getPrototypeOf(Derived), - result; - - if (hasNativeReflectConstruct) { - var NewTarget = _getPrototypeOf(this).constructor; - - result = Reflect.construct(Super, arguments, NewTarget); - } else { - result = Super.apply(this, arguments); - } - - return _possibleConstructorReturn(this, result); - }; - } - - function _toConsumableArray(arr) { - return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); - } - - function _arrayWithoutHoles(arr) { - if (Array.isArray(arr)) return _arrayLikeToArray(arr); - } - - function _iterableToArray(iter) { - if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); - } - - function _unsupportedIterableToArray(o, minLen) { - if (!o) return; - if (typeof o === "string") return _arrayLikeToArray(o, minLen); - var n = Object.prototype.toString.call(o).slice(8, -1); - if (n === "Object" && o.constructor) n = o.constructor.name; - if (n === "Map" || n === "Set") return Array.from(o); - if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); - } - - function _arrayLikeToArray(arr, len) { - if (len == null || len > arr.length) len = arr.length; - - for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; - - return arr2; - } - - function _nonIterableSpread() { - throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); - } - - function isArray(value) { - return !Array.isArray ? getTag(value) === '[object Array]' : Array.isArray(value); - } // Adapted from: https://github.com/lodash/lodash/blob/master/.internal/baseToString.js - - var INFINITY = 1 / 0; - function baseToString(value) { - // Exit early for strings to avoid a performance hit in some environments. - if (typeof value == 'string') { - return value; - } - - var result = value + ''; - return result == '0' && 1 / value == -INFINITY ? '-0' : result; - } - function toString(value) { - return value == null ? '' : baseToString(value); - } - function isString(value) { - return typeof value === 'string'; - } - function isNumber(value) { - return typeof value === 'number'; - } // Adapted from: https://github.com/lodash/lodash/blob/master/isBoolean.js - - function isBoolean(value) { - return value === true || value === false || isObjectLike(value) && getTag(value) == '[object Boolean]'; - } - function isObject(value) { - return _typeof(value) === 'object'; - } // Checks if `value` is object-like. - - function isObjectLike(value) { - return isObject(value) && value !== null; - } - function isDefined(value) { - return value !== undefined && value !== null; - } - function isBlank(value) { - return !value.trim().length; - } // Gets the `toStringTag` of `value`. - // Adapted from: https://github.com/lodash/lodash/blob/master/.internal/getTag.js - - function getTag(value) { - return value == null ? value === undefined ? '[object Undefined]' : '[object Null]' : Object.prototype.toString.call(value); - } - - var EXTENDED_SEARCH_UNAVAILABLE = 'Extended search is not available'; - var INCORRECT_INDEX_TYPE = "Incorrect 'index' type"; - var LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY = function LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY(key) { - return "Invalid value for key ".concat(key); - }; - var PATTERN_LENGTH_TOO_LARGE = function PATTERN_LENGTH_TOO_LARGE(max) { - return "Pattern length exceeds max of ".concat(max, "."); - }; - var MISSING_KEY_PROPERTY = function MISSING_KEY_PROPERTY(name) { - return "Missing ".concat(name, " property in key"); - }; - var INVALID_KEY_WEIGHT_VALUE = function INVALID_KEY_WEIGHT_VALUE(key) { - return "Property 'weight' in key '".concat(key, "' must be a positive integer"); - }; - - var hasOwn = Object.prototype.hasOwnProperty; - - var KeyStore = /*#__PURE__*/function () { - function KeyStore(keys) { - var _this = this; - - _classCallCheck(this, KeyStore); - - this._keys = []; - this._keyMap = {}; - var totalWeight = 0; - keys.forEach(function (key) { - var obj = createKey(key); - totalWeight += obj.weight; - - _this._keys.push(obj); - - _this._keyMap[obj.id] = obj; - totalWeight += obj.weight; - }); // Normalize weights so that their sum is equal to 1 - - this._keys.forEach(function (key) { - key.weight /= totalWeight; - }); - } - - _createClass(KeyStore, [{ - key: "get", - value: function get(keyId) { - return this._keyMap[keyId]; - } - }, { - key: "keys", - value: function keys() { - return this._keys; - } - }, { - key: "toJSON", - value: function toJSON() { - return JSON.stringify(this._keys); - } - }]); - - return KeyStore; - }(); - function createKey(key) { - var path = null; - var id = null; - var src = null; - var weight = 1; - - if (isString(key) || isArray(key)) { - src = key; - path = createKeyPath(key); - id = createKeyId(key); - } else { - if (!hasOwn.call(key, 'name')) { - throw new Error(MISSING_KEY_PROPERTY('name')); - } - - var name = key.name; - src = name; - - if (hasOwn.call(key, 'weight')) { - weight = key.weight; - - if (weight <= 0) { - throw new Error(INVALID_KEY_WEIGHT_VALUE(name)); - } - } - - path = createKeyPath(name); - id = createKeyId(name); - } - - return { - path: path, - id: id, - weight: weight, - src: src - }; - } - function createKeyPath(key) { - return isArray(key) ? key : key.split('.'); - } - function createKeyId(key) { - return isArray(key) ? key.join('.') : key; - } - - function get(obj, path) { - var list = []; - var arr = false; - - var deepGet = function deepGet(obj, path, index) { - if (!isDefined(obj)) { - return; - } - - if (!path[index]) { - // If there's no path left, we've arrived at the object we care about. - list.push(obj); - } else { - var key = path[index]; - var value = obj[key]; - - if (!isDefined(value)) { - return; - } // If we're at the last value in the path, and if it's a string/number/bool, - // add it to the list - - - if (index === path.length - 1 && (isString(value) || isNumber(value) || isBoolean(value))) { - list.push(toString(value)); - } else if (isArray(value)) { - arr = true; // Search each item in the array. - - for (var i = 0, len = value.length; i < len; i += 1) { - deepGet(value[i], path, index + 1); - } - } else if (path.length) { - // An object. Recurse further. - deepGet(value, path, index + 1); - } - } - }; // Backwards compatibility (since path used to be a string) - - - deepGet(obj, isString(path) ? path.split('.') : path, 0); - return arr ? list : list[0]; - } - - var MatchOptions = { - // Whether the matches should be included in the result set. When `true`, each record in the result - // set will include the indices of the matched characters. - // These can consequently be used for highlighting purposes. - includeMatches: false, - // When `true`, the matching function will continue to the end of a search pattern even if - // a perfect match has already been located in the string. - findAllMatches: false, - // Minimum number of characters that must be matched before a result is considered a match - minMatchCharLength: 1 - }; - var BasicOptions = { - // When `true`, the algorithm continues searching to the end of the input even if a perfect - // match is found before the end of the same input. - isCaseSensitive: false, - // When true, the matching function will continue to the end of a search pattern even if - includeScore: false, - // List of properties that will be searched. This also supports nested properties. - keys: [], - // Whether to sort the result list, by score - shouldSort: true, - // Default sort function: sort by ascending score, ascending index - sortFn: function sortFn(a, b) { - return a.score === b.score ? a.idx < b.idx ? -1 : 1 : a.score < b.score ? -1 : 1; - } - }; - var FuzzyOptions = { - // Approximately where in the text is the pattern expected to be found? - location: 0, - // At what point does the match algorithm give up. A threshold of '0.0' requires a perfect match - // (of both letters and location), a threshold of '1.0' would match anything. - threshold: 0.6, - // Determines how close the match must be to the fuzzy location (specified above). - // An exact letter match which is 'distance' characters away from the fuzzy location - // would score as a complete mismatch. A distance of '0' requires the match be at - // the exact location specified, a threshold of '1000' would require a perfect match - // to be within 800 characters of the fuzzy location to be found using a 0.8 threshold. - distance: 100 - }; - var AdvancedOptions = { - // When `true`, it enables the use of unix-like search commands - useExtendedSearch: false, - // The get function to use when fetching an object's properties. - // The default will search nested paths *ie foo.bar.baz* - getFn: get, - // When `true`, search will ignore `location` and `distance`, so it won't matter - // where in the string the pattern appears. - // More info: https://fusejs.io/concepts/scoring-theory.html#fuzziness-score - ignoreLocation: false, - // When `true`, the calculation for the relevance score (used for sorting) will - // ignore the field-length norm. - // More info: https://fusejs.io/concepts/scoring-theory.html#field-length-norm - ignoreFieldNorm: false - }; - var Config = _objectSpread2({}, BasicOptions, {}, MatchOptions, {}, FuzzyOptions, {}, AdvancedOptions); - - var SPACE = /[^ ]+/g; // Field-length norm: the shorter the field, the higher the weight. - // Set to 3 decimals to reduce index size. - - function norm() { - var mantissa = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 3; - var cache = new Map(); - var m = Math.pow(10, mantissa); - return { - get: function get(value) { - var numTokens = value.match(SPACE).length; - - if (cache.has(numTokens)) { - return cache.get(numTokens); - } - - var norm = 1 / Math.sqrt(numTokens); // In place of `toFixed(mantissa)`, for faster computation - - var n = parseFloat(Math.round(norm * m) / m); - cache.set(numTokens, n); - return n; - }, - clear: function clear() { - cache.clear(); - } - }; - } - - var FuseIndex = /*#__PURE__*/function () { - function FuseIndex() { - var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, - _ref$getFn = _ref.getFn, - getFn = _ref$getFn === void 0 ? Config.getFn : _ref$getFn; - - _classCallCheck(this, FuseIndex); - - this.norm = norm(3); - this.getFn = getFn; - this.isCreated = false; - this.setIndexRecords(); - } - - _createClass(FuseIndex, [{ - key: "setSources", - value: function setSources() { - var docs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - this.docs = docs; - } - }, { - key: "setIndexRecords", - value: function setIndexRecords() { - var records = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - this.records = records; - } - }, { - key: "setKeys", - value: function setKeys() { - var _this = this; - - var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - this.keys = keys; - this._keysMap = {}; - keys.forEach(function (key, idx) { - _this._keysMap[key.id] = idx; - }); - } - }, { - key: "create", - value: function create() { - var _this2 = this; - - if (this.isCreated || !this.docs.length) { - return; - } - - this.isCreated = true; // List is Array - - if (isString(this.docs[0])) { - this.docs.forEach(function (doc, docIndex) { - _this2._addString(doc, docIndex); - }); - } else { - // List is Array - this.docs.forEach(function (doc, docIndex) { - _this2._addObject(doc, docIndex); - }); - } - - this.norm.clear(); - } // Adds a doc to the end of the index - - }, { - key: "add", - value: function add(doc) { - var idx = this.size(); - - if (isString(doc)) { - this._addString(doc, idx); - } else { - this._addObject(doc, idx); - } - } // Removes the doc at the specified index of the index - - }, { - key: "removeAt", - value: function removeAt(idx) { - this.records.splice(idx, 1); // Change ref index of every subsquent doc - - for (var i = idx, len = this.size(); i < len; i += 1) { - this.records[i].i -= 1; - } - } - }, { - key: "getValueForItemAtKeyId", - value: function getValueForItemAtKeyId(item, keyId) { - return item[this._keysMap[keyId]]; - } - }, { - key: "size", - value: function size() { - return this.records.length; - } - }, { - key: "_addString", - value: function _addString(doc, docIndex) { - if (!isDefined(doc) || isBlank(doc)) { - return; - } - - var record = { - v: doc, - i: docIndex, - n: this.norm.get(doc) - }; - this.records.push(record); - } - }, { - key: "_addObject", - value: function _addObject(doc, docIndex) { - var _this3 = this; - - var record = { - i: docIndex, - $: {} - }; // Iterate over every key (i.e, path), and fetch the value at that key - - this.keys.forEach(function (key, keyIndex) { - // console.log(key) - var value = _this3.getFn(doc, key.path); - - if (!isDefined(value)) { - return; - } - - if (isArray(value)) { - (function () { - var subRecords = []; - var stack = [{ - nestedArrIndex: -1, - value: value - }]; - - while (stack.length) { - var _stack$pop = stack.pop(), - nestedArrIndex = _stack$pop.nestedArrIndex, - _value = _stack$pop.value; - - if (!isDefined(_value)) { - continue; - } - - if (isString(_value) && !isBlank(_value)) { - var subRecord = { - v: _value, - i: nestedArrIndex, - n: _this3.norm.get(_value) - }; - subRecords.push(subRecord); - } else if (isArray(_value)) { - _value.forEach(function (item, k) { - stack.push({ - nestedArrIndex: k, - value: item - }); - }); - } - } - - record.$[keyIndex] = subRecords; - })(); - } else if (!isBlank(value)) { - var subRecord = { - v: value, - n: _this3.norm.get(value) - }; - record.$[keyIndex] = subRecord; - } - }); - this.records.push(record); - } - }, { - key: "toJSON", - value: function toJSON() { - return { - keys: this.keys, - records: this.records - }; - } - }]); - - return FuseIndex; - }(); - function createIndex(keys, docs) { - var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - _ref2$getFn = _ref2.getFn, - getFn = _ref2$getFn === void 0 ? Config.getFn : _ref2$getFn; - - var myIndex = new FuseIndex({ - getFn: getFn - }); - myIndex.setKeys(keys.map(createKey)); - myIndex.setSources(docs); - myIndex.create(); - return myIndex; - } - function parseIndex(data) { - var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref3$getFn = _ref3.getFn, - getFn = _ref3$getFn === void 0 ? Config.getFn : _ref3$getFn; - - var keys = data.keys, - records = data.records; - var myIndex = new FuseIndex({ - getFn: getFn - }); - myIndex.setKeys(keys); - myIndex.setIndexRecords(records); - return myIndex; - } - - function computeScore(pattern) { - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$errors = _ref.errors, - errors = _ref$errors === void 0 ? 0 : _ref$errors, - _ref$currentLocation = _ref.currentLocation, - currentLocation = _ref$currentLocation === void 0 ? 0 : _ref$currentLocation, - _ref$expectedLocation = _ref.expectedLocation, - expectedLocation = _ref$expectedLocation === void 0 ? 0 : _ref$expectedLocation, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; - - var accuracy = errors / pattern.length; - - if (ignoreLocation) { - return accuracy; - } - - var proximity = Math.abs(expectedLocation - currentLocation); - - if (!distance) { - // Dodge divide by zero error. - return proximity ? 1.0 : accuracy; - } - - return accuracy + proximity / distance; - } - - function convertMaskToIndices() { - var matchmask = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - var minMatchCharLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Config.minMatchCharLength; - var indices = []; - var start = -1; - var end = -1; - var i = 0; - - for (var len = matchmask.length; i < len; i += 1) { - var match = matchmask[i]; - - if (match && start === -1) { - start = i; - } else if (!match && start !== -1) { - end = i - 1; - - if (end - start + 1 >= minMatchCharLength) { - indices.push([start, end]); - } - - start = -1; - } - } // (i-1 - start) + 1 => i - start - - - if (matchmask[i - 1] && i - start >= minMatchCharLength) { - indices.push([start, i - 1]); - } - - return indices; - } - - // Machine word size - var MAX_BITS = 32; - - function search(text, pattern, patternAlphabet) { - var _ref = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {}, - _ref$location = _ref.location, - location = _ref$location === void 0 ? Config.location : _ref$location, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance, - _ref$threshold = _ref.threshold, - threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, - _ref$findAllMatches = _ref.findAllMatches, - findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, - _ref$minMatchCharLeng = _ref.minMatchCharLength, - minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; - - if (pattern.length > MAX_BITS) { - throw new Error(PATTERN_LENGTH_TOO_LARGE(MAX_BITS)); - } - - var patternLen = pattern.length; // Set starting location at beginning text and initialize the alphabet. - - var textLen = text.length; // Handle the case when location > text.length - - var expectedLocation = Math.max(0, Math.min(location, textLen)); // Highest score beyond which we give up. - - var currentThreshold = threshold; // Is there a nearby exact match? (speedup) - - var bestLocation = expectedLocation; // Performance: only computer matches when the minMatchCharLength > 1 - // OR if `includeMatches` is true. - - var computeMatches = minMatchCharLength > 1 || includeMatches; // A mask of the matches, used for building the indices - - var matchMask = computeMatches ? Array(textLen) : []; - var index; // Get all exact matches, here for speed up - - while ((index = text.indexOf(pattern, bestLocation)) > -1) { - var score = computeScore(pattern, { - currentLocation: index, - expectedLocation: expectedLocation, - distance: distance, - ignoreLocation: ignoreLocation - }); - currentThreshold = Math.min(score, currentThreshold); - bestLocation = index + patternLen; - - if (computeMatches) { - var i = 0; - - while (i < patternLen) { - matchMask[index + i] = 1; - i += 1; - } - } - } // Reset the best location - - - bestLocation = -1; - var lastBitArr = []; - var finalScore = 1; - var binMax = patternLen + textLen; - var mask = 1 << patternLen - 1; - - for (var _i = 0; _i < patternLen; _i += 1) { - // Scan for the best match; each iteration allows for one more error. - // Run a binary search to determine how far from the match location we can stray - // at this error level. - var binMin = 0; - var binMid = binMax; - - while (binMin < binMid) { - var _score2 = computeScore(pattern, { - errors: _i, - currentLocation: expectedLocation + binMid, - expectedLocation: expectedLocation, - distance: distance, - ignoreLocation: ignoreLocation - }); - - if (_score2 <= currentThreshold) { - binMin = binMid; - } else { - binMax = binMid; - } - - binMid = Math.floor((binMax - binMin) / 2 + binMin); - } // Use the result from this iteration as the maximum for the next. - - - binMax = binMid; - var start = Math.max(1, expectedLocation - binMid + 1); - var finish = findAllMatches ? textLen : Math.min(expectedLocation + binMid, textLen) + patternLen; // Initialize the bit array - - var bitArr = Array(finish + 2); - bitArr[finish + 1] = (1 << _i) - 1; - - for (var j = finish; j >= start; j -= 1) { - var currentLocation = j - 1; - var charMatch = patternAlphabet[text.charAt(currentLocation)]; - - if (computeMatches) { - // Speed up: quick bool to int conversion (i.e, `charMatch ? 1 : 0`) - matchMask[currentLocation] = +!!charMatch; - } // First pass: exact match - - - bitArr[j] = (bitArr[j + 1] << 1 | 1) & charMatch; // Subsequent passes: fuzzy match - - if (_i) { - bitArr[j] |= (lastBitArr[j + 1] | lastBitArr[j]) << 1 | 1 | lastBitArr[j + 1]; - } - - if (bitArr[j] & mask) { - finalScore = computeScore(pattern, { - errors: _i, - currentLocation: currentLocation, - expectedLocation: expectedLocation, - distance: distance, - ignoreLocation: ignoreLocation - }); // This match will almost certainly be better than any existing match. - // But check anyway. - - if (finalScore <= currentThreshold) { - // Indeed it is - currentThreshold = finalScore; - bestLocation = currentLocation; // Already passed `loc`, downhill from here on in. - - if (bestLocation <= expectedLocation) { - break; - } // When passing `bestLocation`, don't exceed our current distance from `expectedLocation`. - - - start = Math.max(1, 2 * expectedLocation - bestLocation); - } - } - } // No hope for a (better) match at greater error levels. - - - var _score = computeScore(pattern, { - errors: _i + 1, - currentLocation: expectedLocation, - expectedLocation: expectedLocation, - distance: distance, - ignoreLocation: ignoreLocation - }); - - if (_score > currentThreshold) { - break; - } - - lastBitArr = bitArr; - } - - var result = { - isMatch: bestLocation >= 0, - // Count exact matches (those with a score of 0) to be "almost" exact - score: Math.max(0.001, finalScore) - }; - - if (computeMatches) { - var indices = convertMaskToIndices(matchMask, minMatchCharLength); - - if (!indices.length) { - result.isMatch = false; - } else if (includeMatches) { - result.indices = indices; - } - } - - return result; - } - - function createPatternAlphabet(pattern) { - var mask = {}; - - for (var i = 0, len = pattern.length; i < len; i += 1) { - var char = pattern.charAt(i); - mask[char] = (mask[char] || 0) | 1 << len - i - 1; - } - - return mask; - } - - var BitapSearch = /*#__PURE__*/function () { - function BitapSearch(pattern) { - var _this = this; - - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$location = _ref.location, - location = _ref$location === void 0 ? Config.location : _ref$location, - _ref$threshold = _ref.threshold, - threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$findAllMatches = _ref.findAllMatches, - findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, - _ref$minMatchCharLeng = _ref.minMatchCharLength, - minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, - _ref$isCaseSensitive = _ref.isCaseSensitive, - isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; - - _classCallCheck(this, BitapSearch); - - this.options = { - location: location, - threshold: threshold, - distance: distance, - includeMatches: includeMatches, - findAllMatches: findAllMatches, - minMatchCharLength: minMatchCharLength, - isCaseSensitive: isCaseSensitive, - ignoreLocation: ignoreLocation - }; - this.pattern = isCaseSensitive ? pattern : pattern.toLowerCase(); - this.chunks = []; - - if (!this.pattern.length) { - return; - } - - var addChunk = function addChunk(pattern, startIndex) { - _this.chunks.push({ - pattern: pattern, - alphabet: createPatternAlphabet(pattern), - startIndex: startIndex - }); - }; - - var len = this.pattern.length; - - if (len > MAX_BITS) { - var i = 0; - var remainder = len % MAX_BITS; - var end = len - remainder; - - while (i < end) { - addChunk(this.pattern.substr(i, MAX_BITS), i); - i += MAX_BITS; - } - - if (remainder) { - var startIndex = len - MAX_BITS; - addChunk(this.pattern.substr(startIndex), startIndex); - } - } else { - addChunk(this.pattern, 0); - } - } - - _createClass(BitapSearch, [{ - key: "searchIn", - value: function searchIn(text) { - var _this$options = this.options, - isCaseSensitive = _this$options.isCaseSensitive, - includeMatches = _this$options.includeMatches; - - if (!isCaseSensitive) { - text = text.toLowerCase(); - } // Exact match - - - if (this.pattern === text) { - var _result = { - isMatch: true, - score: 0 - }; - - if (includeMatches) { - _result.indices = [[0, text.length - 1]]; - } - - return _result; - } // Otherwise, use Bitap algorithm - - - var _this$options2 = this.options, - location = _this$options2.location, - distance = _this$options2.distance, - threshold = _this$options2.threshold, - findAllMatches = _this$options2.findAllMatches, - minMatchCharLength = _this$options2.minMatchCharLength, - ignoreLocation = _this$options2.ignoreLocation; - var allIndices = []; - var totalScore = 0; - var hasMatches = false; - this.chunks.forEach(function (_ref2) { - var pattern = _ref2.pattern, - alphabet = _ref2.alphabet, - startIndex = _ref2.startIndex; - - var _search = search(text, pattern, alphabet, { - location: location + startIndex, - distance: distance, - threshold: threshold, - findAllMatches: findAllMatches, - minMatchCharLength: minMatchCharLength, - includeMatches: includeMatches, - ignoreLocation: ignoreLocation - }), - isMatch = _search.isMatch, - score = _search.score, - indices = _search.indices; - - if (isMatch) { - hasMatches = true; - } - - totalScore += score; - - if (isMatch && indices) { - allIndices = [].concat(_toConsumableArray(allIndices), _toConsumableArray(indices)); - } - }); - var result = { - isMatch: hasMatches, - score: hasMatches ? totalScore / this.chunks.length : 1 - }; - - if (hasMatches && includeMatches) { - result.indices = allIndices; - } - - return result; - } - }]); - - return BitapSearch; - }(); - - var BaseMatch = /*#__PURE__*/function () { - function BaseMatch(pattern) { - _classCallCheck(this, BaseMatch); - - this.pattern = pattern; - } - - _createClass(BaseMatch, [{ - key: "search", - value: function search() - /*text*/ - {} - }], [{ - key: "isMultiMatch", - value: function isMultiMatch(pattern) { - return getMatch(pattern, this.multiRegex); - } - }, { - key: "isSingleMatch", - value: function isSingleMatch(pattern) { - return getMatch(pattern, this.singleRegex); - } - }]); - - return BaseMatch; - }(); - - function getMatch(pattern, exp) { - var matches = pattern.match(exp); - return matches ? matches[1] : null; - } - - var ExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(ExactMatch, _BaseMatch); - - var _super = _createSuper(ExactMatch); - - function ExactMatch(pattern) { - _classCallCheck(this, ExactMatch); - - return _super.call(this, pattern); - } - - _createClass(ExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = text === this.pattern; - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, this.pattern.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^="(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^=(.*)$/; - } - }]); - - return ExactMatch; - }(BaseMatch); - - var InverseExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(InverseExactMatch, _BaseMatch); - - var _super = _createSuper(InverseExactMatch); - - function InverseExactMatch(pattern) { - _classCallCheck(this, InverseExactMatch); - - return _super.call(this, pattern); - } - - _createClass(InverseExactMatch, [{ - key: "search", - value: function search(text) { - var index = text.indexOf(this.pattern); - var isMatch = index === -1; - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, text.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'inverse-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^!"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^!(.*)$/; - } - }]); - - return InverseExactMatch; - }(BaseMatch); - - var PrefixExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(PrefixExactMatch, _BaseMatch); - - var _super = _createSuper(PrefixExactMatch); - - function PrefixExactMatch(pattern) { - _classCallCheck(this, PrefixExactMatch); - - return _super.call(this, pattern); - } - - _createClass(PrefixExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = text.startsWith(this.pattern); - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, this.pattern.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'prefix-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^\^"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^\^(.*)$/; - } - }]); - - return PrefixExactMatch; - }(BaseMatch); - - var InversePrefixExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(InversePrefixExactMatch, _BaseMatch); - - var _super = _createSuper(InversePrefixExactMatch); - - function InversePrefixExactMatch(pattern) { - _classCallCheck(this, InversePrefixExactMatch); - - return _super.call(this, pattern); - } - - _createClass(InversePrefixExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = !text.startsWith(this.pattern); - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, text.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'inverse-prefix-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^!\^"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^!\^(.*)$/; - } - }]); - - return InversePrefixExactMatch; - }(BaseMatch); - - var SuffixExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(SuffixExactMatch, _BaseMatch); - - var _super = _createSuper(SuffixExactMatch); - - function SuffixExactMatch(pattern) { - _classCallCheck(this, SuffixExactMatch); - - return _super.call(this, pattern); - } - - _createClass(SuffixExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = text.endsWith(this.pattern); - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [text.length - this.pattern.length, text.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'suffix-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^"(.*)"\$$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^(.*)\$$/; - } - }]); - - return SuffixExactMatch; - }(BaseMatch); - - var InverseSuffixExactMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(InverseSuffixExactMatch, _BaseMatch); - - var _super = _createSuper(InverseSuffixExactMatch); - - function InverseSuffixExactMatch(pattern) { - _classCallCheck(this, InverseSuffixExactMatch); - - return _super.call(this, pattern); - } - - _createClass(InverseSuffixExactMatch, [{ - key: "search", - value: function search(text) { - var isMatch = !text.endsWith(this.pattern); - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: [0, text.length - 1] - }; - } - }], [{ - key: "type", - get: function get() { - return 'inverse-suffix-exact'; - } - }, { - key: "multiRegex", - get: function get() { - return /^!"(.*)"\$$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^!(.*)\$$/; - } - }]); - - return InverseSuffixExactMatch; - }(BaseMatch); - - var FuzzyMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(FuzzyMatch, _BaseMatch); - - var _super = _createSuper(FuzzyMatch); - - function FuzzyMatch(pattern) { - var _this; - - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$location = _ref.location, - location = _ref$location === void 0 ? Config.location : _ref$location, - _ref$threshold = _ref.threshold, - threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$findAllMatches = _ref.findAllMatches, - findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, - _ref$minMatchCharLeng = _ref.minMatchCharLength, - minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, - _ref$isCaseSensitive = _ref.isCaseSensitive, - isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation; - - _classCallCheck(this, FuzzyMatch); - - _this = _super.call(this, pattern); - _this._bitapSearch = new BitapSearch(pattern, { - location: location, - threshold: threshold, - distance: distance, - includeMatches: includeMatches, - findAllMatches: findAllMatches, - minMatchCharLength: minMatchCharLength, - isCaseSensitive: isCaseSensitive, - ignoreLocation: ignoreLocation - }); - return _this; - } - - _createClass(FuzzyMatch, [{ - key: "search", - value: function search(text) { - return this._bitapSearch.searchIn(text); - } - }], [{ - key: "type", - get: function get() { - return 'fuzzy'; - } - }, { - key: "multiRegex", - get: function get() { - return /^"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^(.*)$/; - } - }]); - - return FuzzyMatch; - }(BaseMatch); - - var IncludeMatch = /*#__PURE__*/function (_BaseMatch) { - _inherits(IncludeMatch, _BaseMatch); - - var _super = _createSuper(IncludeMatch); - - function IncludeMatch(pattern) { - _classCallCheck(this, IncludeMatch); - - return _super.call(this, pattern); - } - - _createClass(IncludeMatch, [{ - key: "search", - value: function search(text) { - var location = 0; - var index; - var indices = []; - var patternLen = this.pattern.length; // Get all exact matches - - while ((index = text.indexOf(this.pattern, location)) > -1) { - location = index + patternLen; - indices.push([index, location - 1]); - } - - var isMatch = !!indices.length; - return { - isMatch: isMatch, - score: isMatch ? 0 : 1, - indices: indices - }; - } - }], [{ - key: "type", - get: function get() { - return 'include'; - } - }, { - key: "multiRegex", - get: function get() { - return /^'"(.*)"$/; - } - }, { - key: "singleRegex", - get: function get() { - return /^'(.*)$/; - } - }]); - - return IncludeMatch; - }(BaseMatch); - - var searchers = [ExactMatch, IncludeMatch, PrefixExactMatch, InversePrefixExactMatch, InverseSuffixExactMatch, SuffixExactMatch, InverseExactMatch, FuzzyMatch]; - var searchersLen = searchers.length; // Regex to split by spaces, but keep anything in quotes together - - var SPACE_RE = / +(?=([^\"]*\"[^\"]*\")*[^\"]*$)/; - var OR_TOKEN = '|'; // Return a 2D array representation of the query, for simpler parsing. - // Example: - // "^core go$ | rb$ | py$ xy$" => [["^core", "go$"], ["rb$"], ["py$", "xy$"]] - - function parseQuery(pattern) { - var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; - return pattern.split(OR_TOKEN).map(function (item) { - var query = item.trim().split(SPACE_RE).filter(function (item) { - return item && !!item.trim(); - }); - var results = []; - - for (var i = 0, len = query.length; i < len; i += 1) { - var queryItem = query[i]; // 1. Handle multiple query match (i.e, once that are quoted, like `"hello world"`) - - var found = false; - var idx = -1; - - while (!found && ++idx < searchersLen) { - var searcher = searchers[idx]; - var token = searcher.isMultiMatch(queryItem); - - if (token) { - results.push(new searcher(token, options)); - found = true; - } - } - - if (found) { - continue; - } // 2. Handle single query matches (i.e, once that are *not* quoted) - - - idx = -1; - - while (++idx < searchersLen) { - var _searcher = searchers[idx]; - - var _token = _searcher.isSingleMatch(queryItem); - - if (_token) { - results.push(new _searcher(_token, options)); - break; - } - } - } - - return results; - }); - } - - // to a singl match - - var MultiMatchSet = new Set([FuzzyMatch.type, IncludeMatch.type]); - /** - * Command-like searching - * ====================== - * - * Given multiple search terms delimited by spaces.e.g. `^jscript .python$ ruby !java`, - * search in a given text. - * - * Search syntax: - * - * | Token | Match type | Description | - * | ----------- | -------------------------- | -------------------------------------- | - * | `jscript` | fuzzy-match | Items that fuzzy match `jscript` | - * | `=scheme` | exact-match | Items that are `scheme` | - * | `'python` | include-match | Items that include `python` | - * | `!ruby` | inverse-exact-match | Items that do not include `ruby` | - * | `^java` | prefix-exact-match | Items that start with `java` | - * | `!^earlang` | inverse-prefix-exact-match | Items that do not start with `earlang` | - * | `.js$` | suffix-exact-match | Items that end with `.js` | - * | `!.go$` | inverse-suffix-exact-match | Items that do not end with `.go` | - * - * A single pipe character acts as an OR operator. For example, the following - * query matches entries that start with `core` and end with either`go`, `rb`, - * or`py`. - * - * ``` - * ^core go$ | rb$ | py$ - * ``` - */ - - var ExtendedSearch = /*#__PURE__*/function () { - function ExtendedSearch(pattern) { - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$isCaseSensitive = _ref.isCaseSensitive, - isCaseSensitive = _ref$isCaseSensitive === void 0 ? Config.isCaseSensitive : _ref$isCaseSensitive, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$minMatchCharLeng = _ref.minMatchCharLength, - minMatchCharLength = _ref$minMatchCharLeng === void 0 ? Config.minMatchCharLength : _ref$minMatchCharLeng, - _ref$ignoreLocation = _ref.ignoreLocation, - ignoreLocation = _ref$ignoreLocation === void 0 ? Config.ignoreLocation : _ref$ignoreLocation, - _ref$findAllMatches = _ref.findAllMatches, - findAllMatches = _ref$findAllMatches === void 0 ? Config.findAllMatches : _ref$findAllMatches, - _ref$location = _ref.location, - location = _ref$location === void 0 ? Config.location : _ref$location, - _ref$threshold = _ref.threshold, - threshold = _ref$threshold === void 0 ? Config.threshold : _ref$threshold, - _ref$distance = _ref.distance, - distance = _ref$distance === void 0 ? Config.distance : _ref$distance; - - _classCallCheck(this, ExtendedSearch); - - this.query = null; - this.options = { - isCaseSensitive: isCaseSensitive, - includeMatches: includeMatches, - minMatchCharLength: minMatchCharLength, - findAllMatches: findAllMatches, - ignoreLocation: ignoreLocation, - location: location, - threshold: threshold, - distance: distance - }; - this.pattern = isCaseSensitive ? pattern : pattern.toLowerCase(); - this.query = parseQuery(this.pattern, this.options); - } - - _createClass(ExtendedSearch, [{ - key: "searchIn", - value: function searchIn(text) { - var query = this.query; - - if (!query) { - return { - isMatch: false, - score: 1 - }; - } - - var _this$options = this.options, - includeMatches = _this$options.includeMatches, - isCaseSensitive = _this$options.isCaseSensitive; - text = isCaseSensitive ? text : text.toLowerCase(); - var numMatches = 0; - var allIndices = []; - var totalScore = 0; // ORs - - for (var i = 0, qLen = query.length; i < qLen; i += 1) { - var searchers = query[i]; // Reset indices - - allIndices.length = 0; - numMatches = 0; // ANDs - - for (var j = 0, pLen = searchers.length; j < pLen; j += 1) { - var searcher = searchers[j]; - - var _searcher$search = searcher.search(text), - isMatch = _searcher$search.isMatch, - indices = _searcher$search.indices, - score = _searcher$search.score; - - if (isMatch) { - numMatches += 1; - totalScore += score; - - if (includeMatches) { - var type = searcher.constructor.type; - - if (MultiMatchSet.has(type)) { - allIndices = [].concat(_toConsumableArray(allIndices), _toConsumableArray(indices)); - } else { - allIndices.push(indices); - } - } - } else { - totalScore = 0; - numMatches = 0; - allIndices.length = 0; - break; - } - } // OR condition, so if TRUE, return - - - if (numMatches) { - var result = { - isMatch: true, - score: totalScore / numMatches - }; - - if (includeMatches) { - result.indices = allIndices; - } - - return result; - } - } // Nothing was matched - - - return { - isMatch: false, - score: 1 - }; - } - }], [{ - key: "condition", - value: function condition(_, options) { - return options.useExtendedSearch; - } - }]); - - return ExtendedSearch; - }(); - - var registeredSearchers = []; - function register() { - registeredSearchers.push.apply(registeredSearchers, arguments); - } - function createSearcher(pattern, options) { - for (var i = 0, len = registeredSearchers.length; i < len; i += 1) { - var searcherClass = registeredSearchers[i]; - - if (searcherClass.condition(pattern, options)) { - return new searcherClass(pattern, options); - } - } - - return new BitapSearch(pattern, options); - } - - var LogicalOperator = { - AND: '$and', - OR: '$or' - }; - var KeyType = { - PATH: '$path', - PATTERN: '$val' - }; - - var isExpression = function isExpression(query) { - return !!(query[LogicalOperator.AND] || query[LogicalOperator.OR]); - }; - - var isPath = function isPath(query) { - return !!query[KeyType.PATH]; - }; - - var isLeaf = function isLeaf(query) { - return !isArray(query) && isObject(query) && !isExpression(query); - }; - - var convertToExplicit = function convertToExplicit(query) { - return _defineProperty({}, LogicalOperator.AND, Object.keys(query).map(function (key) { - return _defineProperty({}, key, query[key]); - })); - }; // When `auto` is `true`, the parse function will infer and initialize and add - // the appropriate `Searcher` instance - - - function parse(query, options) { - var _ref3 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - _ref3$auto = _ref3.auto, - auto = _ref3$auto === void 0 ? true : _ref3$auto; - - var next = function next(query) { - var keys = Object.keys(query); - var isQueryPath = isPath(query); - - if (!isQueryPath && keys.length > 1 && !isExpression(query)) { - return next(convertToExplicit(query)); - } - - if (isLeaf(query)) { - var key = isQueryPath ? query[KeyType.PATH] : keys[0]; - var pattern = isQueryPath ? query[KeyType.PATTERN] : query[key]; - - if (!isString(pattern)) { - throw new Error(LOGICAL_SEARCH_INVALID_QUERY_FOR_KEY(key)); - } - - var obj = { - keyId: createKeyId(key), - pattern: pattern - }; - - if (auto) { - obj.searcher = createSearcher(pattern, options); - } - - return obj; - } - - var node = { - children: [], - operator: keys[0] - }; - keys.forEach(function (key) { - var value = query[key]; - - if (isArray(value)) { - value.forEach(function (item) { - node.children.push(next(item)); - }); - } - }); - return node; - }; - - if (!isExpression(query)) { - query = convertToExplicit(query); - } - - return next(query); - } - - function computeScore$1(results, _ref) { - var _ref$ignoreFieldNorm = _ref.ignoreFieldNorm, - ignoreFieldNorm = _ref$ignoreFieldNorm === void 0 ? Config.ignoreFieldNorm : _ref$ignoreFieldNorm; - results.forEach(function (result) { - var totalScore = 1; - result.matches.forEach(function (_ref2) { - var key = _ref2.key, - norm = _ref2.norm, - score = _ref2.score; - var weight = key ? key.weight : null; - totalScore *= Math.pow(score === 0 && weight ? Number.EPSILON : score, (weight || 1) * (ignoreFieldNorm ? 1 : norm)); - }); - result.score = totalScore; - }); - } - - function transformMatches(result, data) { - var matches = result.matches; - data.matches = []; - - if (!isDefined(matches)) { - return; - } - - matches.forEach(function (match) { - if (!isDefined(match.indices) || !match.indices.length) { - return; - } - - var indices = match.indices, - value = match.value; - var obj = { - indices: indices, - value: value - }; - - if (match.key) { - obj.key = match.key.src; - } - - if (match.idx > -1) { - obj.refIndex = match.idx; - } - - data.matches.push(obj); - }); - } - - function transformScore(result, data) { - data.score = result.score; - } - - function format(results, docs) { - var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}, - _ref$includeMatches = _ref.includeMatches, - includeMatches = _ref$includeMatches === void 0 ? Config.includeMatches : _ref$includeMatches, - _ref$includeScore = _ref.includeScore, - includeScore = _ref$includeScore === void 0 ? Config.includeScore : _ref$includeScore; - - var transformers = []; - if (includeMatches) transformers.push(transformMatches); - if (includeScore) transformers.push(transformScore); - return results.map(function (result) { - var idx = result.idx; - var data = { - item: docs[idx], - refIndex: idx - }; - - if (transformers.length) { - transformers.forEach(function (transformer) { - transformer(result, data); - }); - } - - return data; - }); - } - - var Fuse = /*#__PURE__*/function () { - function Fuse(docs) { - var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; - var index = arguments.length > 2 ? arguments[2] : undefined; - - _classCallCheck(this, Fuse); - - this.options = _objectSpread2({}, Config, {}, options); - - if (this.options.useExtendedSearch && !true) { - throw new Error(EXTENDED_SEARCH_UNAVAILABLE); - } - - this._keyStore = new KeyStore(this.options.keys); - this.setCollection(docs, index); - } - - _createClass(Fuse, [{ - key: "setCollection", - value: function setCollection(docs, index) { - this._docs = docs; - - if (index && !(index instanceof FuseIndex)) { - throw new Error(INCORRECT_INDEX_TYPE); - } - - this._myIndex = index || createIndex(this.options.keys, this._docs, { - getFn: this.options.getFn - }); - } - }, { - key: "add", - value: function add(doc) { - if (!isDefined(doc)) { - return; - } - - this._docs.push(doc); - - this._myIndex.add(doc); - } - }, { - key: "remove", - value: function remove() { - var predicate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () { - return ( - /* doc, idx */ - false - ); - }; - var results = []; - - for (var i = 0, len = this._docs.length; i < len; i += 1) { - var doc = this._docs[i]; - - if (predicate(doc, i)) { - this.removeAt(i); - i -= 1; - len -= 1; - results.push(doc); - } - } - - return results; - } - }, { - key: "removeAt", - value: function removeAt(idx) { - this._docs.splice(idx, 1); - - this._myIndex.removeAt(idx); - } - }, { - key: "getIndex", - value: function getIndex() { - return this._myIndex; - } - }, { - key: "search", - value: function search(query) { - var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}, - _ref$limit = _ref.limit, - limit = _ref$limit === void 0 ? -1 : _ref$limit; - - var _this$options = this.options, - includeMatches = _this$options.includeMatches, - includeScore = _this$options.includeScore, - shouldSort = _this$options.shouldSort, - sortFn = _this$options.sortFn, - ignoreFieldNorm = _this$options.ignoreFieldNorm; - var results = isString(query) ? isString(this._docs[0]) ? this._searchStringList(query) : this._searchObjectList(query) : this._searchLogical(query); - computeScore$1(results, { - ignoreFieldNorm: ignoreFieldNorm - }); - - if (shouldSort) { - results.sort(sortFn); - } - - if (isNumber(limit) && limit > -1) { - results = results.slice(0, limit); - } - - return format(results, this._docs, { - includeMatches: includeMatches, - includeScore: includeScore - }); - } - }, { - key: "_searchStringList", - value: function _searchStringList(query) { - var searcher = createSearcher(query, this.options); - var records = this._myIndex.records; - var results = []; // Iterate over every string in the index - - records.forEach(function (_ref2) { - var text = _ref2.v, - idx = _ref2.i, - norm = _ref2.n; - - if (!isDefined(text)) { - return; - } - - var _searcher$searchIn = searcher.searchIn(text), - isMatch = _searcher$searchIn.isMatch, - score = _searcher$searchIn.score, - indices = _searcher$searchIn.indices; - - if (isMatch) { - results.push({ - item: text, - idx: idx, - matches: [{ - score: score, - value: text, - norm: norm, - indices: indices - }] - }); - } - }); - return results; - } - }, { - key: "_searchLogical", - value: function _searchLogical(query) { - var _this = this; - - var expression = parse(query, this.options); - - var evaluate = function evaluate(node, item, idx) { - if (!node.children) { - var keyId = node.keyId, - searcher = node.searcher; - - var matches = _this._findMatches({ - key: _this._keyStore.get(keyId), - value: _this._myIndex.getValueForItemAtKeyId(item, keyId), - searcher: searcher - }); - - if (matches && matches.length) { - return [{ - idx: idx, - item: item, - matches: matches - }]; - } - - return []; - } - /*eslint indent: [2, 2, {"SwitchCase": 1}]*/ - - - switch (node.operator) { - case LogicalOperator.AND: - { - var res = []; - - for (var i = 0, len = node.children.length; i < len; i += 1) { - var child = node.children[i]; - var result = evaluate(child, item, idx); - - if (result.length) { - res.push.apply(res, _toConsumableArray(result)); - } else { - return []; - } - } - - return res; - } - - case LogicalOperator.OR: - { - var _res = []; - - for (var _i = 0, _len = node.children.length; _i < _len; _i += 1) { - var _child = node.children[_i]; - - var _result = evaluate(_child, item, idx); - - if (_result.length) { - _res.push.apply(_res, _toConsumableArray(_result)); - - break; - } - } - - return _res; - } - } - }; - - var records = this._myIndex.records; - var resultMap = {}; - var results = []; - records.forEach(function (_ref3) { - var item = _ref3.$, - idx = _ref3.i; - - if (isDefined(item)) { - var expResults = evaluate(expression, item, idx); - - if (expResults.length) { - // Dedupe when adding - if (!resultMap[idx]) { - resultMap[idx] = { - idx: idx, - item: item, - matches: [] - }; - results.push(resultMap[idx]); - } - - expResults.forEach(function (_ref4) { - var _resultMap$idx$matche; - - var matches = _ref4.matches; - - (_resultMap$idx$matche = resultMap[idx].matches).push.apply(_resultMap$idx$matche, _toConsumableArray(matches)); - }); - } - } - }); - return results; - } - }, { - key: "_searchObjectList", - value: function _searchObjectList(query) { - var _this2 = this; - - var searcher = createSearcher(query, this.options); - var _this$_myIndex = this._myIndex, - keys = _this$_myIndex.keys, - records = _this$_myIndex.records; - var results = []; // List is Array - - records.forEach(function (_ref5) { - var item = _ref5.$, - idx = _ref5.i; - - if (!isDefined(item)) { - return; - } - - var matches = []; // Iterate over every key (i.e, path), and fetch the value at that key - - keys.forEach(function (key, keyIndex) { - matches.push.apply(matches, _toConsumableArray(_this2._findMatches({ - key: key, - value: item[keyIndex], - searcher: searcher - }))); - }); - - if (matches.length) { - results.push({ - idx: idx, - item: item, - matches: matches - }); - } - }); - return results; - } - }, { - key: "_findMatches", - value: function _findMatches(_ref6) { - var key = _ref6.key, - value = _ref6.value, - searcher = _ref6.searcher; - - if (!isDefined(value)) { - return []; - } - - var matches = []; - - if (isArray(value)) { - value.forEach(function (_ref7) { - var text = _ref7.v, - idx = _ref7.i, - norm = _ref7.n; - - if (!isDefined(text)) { - return; - } - - var _searcher$searchIn2 = searcher.searchIn(text), - isMatch = _searcher$searchIn2.isMatch, - score = _searcher$searchIn2.score, - indices = _searcher$searchIn2.indices; - - if (isMatch) { - matches.push({ - score: score, - key: key, - value: text, - idx: idx, - norm: norm, - indices: indices - }); - } - }); - } else { - var text = value.v, - norm = value.n; - - var _searcher$searchIn3 = searcher.searchIn(text), - isMatch = _searcher$searchIn3.isMatch, - score = _searcher$searchIn3.score, - indices = _searcher$searchIn3.indices; - - if (isMatch) { - matches.push({ - score: score, - key: key, - value: text, - norm: norm, - indices: indices - }); - } - } - - return matches; - } - }]); - - return Fuse; - }(); - - Fuse.version = '6.4.6'; - Fuse.createIndex = createIndex; - Fuse.parseIndex = parseIndex; - Fuse.config = Config; - - { - Fuse.parseQuery = parse; - } - - { - register(ExtendedSearch); - } - - return Fuse; - -}))); +var e,t;e=this,t=function(){"use strict";function e(t){return(e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(t)}function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){for(var n=0;ne.length)&&(t=e.length);for(var n=0,r=new Array(t);n0&&void 0!==arguments[0]?arguments[0]:3,t=new Map,n=Math.pow(10,e);return{get:function(e){var r=e.match(w).length;if(t.has(r))return t.get(r);var i=1/Math.sqrt(r),o=parseFloat(Math.round(i*n)/n);return t.set(r,o),o},clear:function(){t.clear()}}}var _=function(){function e(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},r=n.getFn,i=void 0===r?x.getFn:r;t(this,e),this.norm=L(3),this.getFn=i,this.isCreated=!1,this.setIndexRecords()}return r(e,[{key:"setSources",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];this.docs=e}},{key:"setIndexRecords",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];this.records=e}},{key:"setKeys",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];this.keys=t,this._keysMap={},t.forEach((function(t,n){e._keysMap[t.id]=n}))}},{key:"create",value:function(){var e=this;!this.isCreated&&this.docs.length&&(this.isCreated=!0,u(this.docs[0])?this.docs.forEach((function(t,n){e._addString(t,n)})):this.docs.forEach((function(t,n){e._addObject(t,n)})),this.norm.clear())}},{key:"add",value:function(e){var t=this.size();u(e)?this._addString(e,t):this._addObject(e,t)}},{key:"removeAt",value:function(e){this.records.splice(e,1);for(var t=e,n=this.size();t2&&void 0!==arguments[2]?arguments[2]:{},r=n.getFn,i=void 0===r?x.getFn:r,o=new _({getFn:i});return o.setKeys(e.map(b)),o.setSources(t),o.create(),o}function O(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.errors,r=void 0===n?0:n,i=t.currentLocation,o=void 0===i?0:i,a=t.expectedLocation,c=void 0===a?0:a,s=t.distance,h=void 0===s?x.distance:s,u=t.ignoreLocation,l=void 0===u?x.ignoreLocation:u,d=r/e.length;if(l)return d;var f=Math.abs(c-o);return h?d+f/h:f?1:d}function A(){for(var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:x.minMatchCharLength,n=[],r=-1,i=-1,o=0,a=e.length;o=t&&n.push([r,i]),r=-1)}return e[o-1]&&o-r>=t&&n.push([r,o-1]),n}function j(e){for(var t={},n=0,r=e.length;n1&&void 0!==arguments[1]?arguments[1]:{},o=i.location,a=void 0===o?x.location:o,c=i.threshold,s=void 0===c?x.threshold:c,h=i.distance,u=void 0===h?x.distance:h,l=i.includeMatches,d=void 0===l?x.includeMatches:l,f=i.findAllMatches,v=void 0===f?x.findAllMatches:f,y=i.minMatchCharLength,g=void 0===y?x.minMatchCharLength:y,p=i.isCaseSensitive,m=void 0===p?x.isCaseSensitive:p,b=i.ignoreLocation,k=void 0===b?x.ignoreLocation:b;if(t(this,e),this.options={location:a,threshold:s,distance:u,includeMatches:d,findAllMatches:v,minMatchCharLength:g,isCaseSensitive:m,ignoreLocation:k},this.pattern=m?n:n.toLowerCase(),this.chunks=[],this.pattern.length){var M=function(e,t){r.chunks.push({pattern:e,alphabet:j(e),startIndex:t})},w=this.pattern.length;if(w>32){for(var L=0,_=w%32,S=w-_;L3&&void 0!==arguments[3]?arguments[3]:{},i=r.location,o=void 0===i?x.location:i,a=r.distance,c=void 0===a?x.distance:a,s=r.threshold,h=void 0===s?x.threshold:s,u=r.findAllMatches,l=void 0===u?x.findAllMatches:u,d=r.minMatchCharLength,f=void 0===d?x.minMatchCharLength:d,v=r.includeMatches,y=void 0===v?x.includeMatches:v,p=r.ignoreLocation,m=void 0===p?x.ignoreLocation:p;if(t.length>32)throw new Error(g(32));for(var b,k=t.length,M=e.length,w=Math.max(0,Math.min(o,M)),L=h,_=w,S=f>1||y,j=S?Array(M):[];(b=e.indexOf(t,_))>-1;){var E=O(t,{currentLocation:b,expectedLocation:w,distance:c,ignoreLocation:m});if(L=Math.min(E,L),_=b+k,S)for(var I=0;I=J;U-=1){var q=U-1,B=n[e.charAt(q)];if(S&&(j[q]=+!!B),T[U]=(T[U+1]<<1|1)&B,$&&(T[U]|=(C[U+1]|C[U])<<1|1|C[U+1]),T[U]&N&&(F=O(t,{errors:$,currentLocation:q,expectedLocation:w,distance:c,ignoreLocation:m}))<=L){if(L=F,(_=q)<=w)break;J=Math.max(1,2*w-_)}}var V=O(t,{errors:$+1,currentLocation:w,expectedLocation:w,distance:c,ignoreLocation:m});if(V>L)break;C=T}var G={isMatch:_>=0,score:Math.max(.001,F)};if(S){var H=A(j,f);H.length?y&&(G.indices=H):G.isMatch=!1}return G}(e,n,i,{location:a+o,distance:s,threshold:h,findAllMatches:u,minMatchCharLength:l,includeMatches:r,ignoreLocation:d}),m=p.isMatch,b=p.score,k=p.indices;m&&(y=!0),v+=b,m&&k&&(f=[].concat(c(f),c(k)))}));var p={isMatch:y,score:y?v/this.chunks.length:1};return y&&r&&(p.indices=f),p}}]),e}(),I=[];function C(e,t){for(var n=0,r=I.length;n-1&&(n.refIndex=e.idx),t.matches.push(n)}}))}function N(e,t){t.score=e.score}function $(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=n.includeMatches,i=void 0===r?x.includeMatches:r,o=n.includeScore,a=void 0===o?x.includeScore:o,c=[];return i&&c.push(P),a&&c.push(N),e.map((function(e){var n=e.idx,r={item:t[n],refIndex:n};return c.length&&c.forEach((function(t){t(e,r)})),r}))}var D=function(){function e(n){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=arguments.length>2?arguments[2]:void 0;if(t(this,e),this.options=a({},x,{},r),this.options.useExtendedSearch)throw new Error("Extended search is not available");this._keyStore=new m(this.options.keys),this.setCollection(n,i)}return r(e,[{key:"setCollection",value:function(e,t){if(this._docs=e,t&&!(t instanceof _))throw new Error("Incorrect 'index' type");this._myIndex=t||S(this.options.keys,this._docs,{getFn:this.options.getFn})}},{key:"add",value:function(e){f(e)&&(this._docs.push(e),this._myIndex.add(e))}},{key:"remove",value:function(){for(var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:function(){return!1},t=[],n=0,r=this._docs.length;n1&&void 0!==arguments[1]?arguments[1]:{},n=t.limit,r=void 0===n?-1:n,i=this.options,o=i.includeMatches,a=i.includeScore,c=i.shouldSort,s=i.sortFn,h=i.ignoreFieldNorm,d=u(e)?u(this._docs[0])?this._searchStringList(e):this._searchObjectList(e):this._searchLogical(e);return F(d,{ignoreFieldNorm:h}),c&&d.sort(s),l(r)&&r>-1&&(d=d.slice(0,r)),$(d,this._docs,{includeMatches:o,includeScore:a})}},{key:"_searchStringList",value:function(e){var t=C(e,this.options),n=this._myIndex.records,r=[];return n.forEach((function(e){var n=e.v,i=e.i,o=e.n;if(f(n)){var a=t.searchIn(n),c=a.isMatch,s=a.score,h=a.indices;c&&r.push({item:n,idx:i,matches:[{score:s,value:n,norm:o,indices:h}]})}})),r}},{key:"_searchLogical",value:function(e){throw new Error("Logical search is not available")}},{key:"_searchObjectList",value:function(e){var t=this,n=C(e,this.options),r=this._myIndex,i=r.keys,o=r.records,a=[];return o.forEach((function(e){var r=e.$,o=e.i;if(f(r)){var s=[];i.forEach((function(e,i){s.push.apply(s,c(t._findMatches({key:e,value:r[i],searcher:n})))})),s.length&&a.push({idx:o,item:r,matches:s})}})),a}},{key:"_findMatches",value:function(e){var t=e.key,n=e.value,r=e.searcher;if(!f(n))return[];var i=[];if(h(n))n.forEach((function(e){var n=e.v,o=e.i,a=e.n;if(f(n)){var c=r.searchIn(n),s=c.isMatch,h=c.score,u=c.indices;s&&i.push({score:h,key:t,value:n,idx:o,norm:a,indices:u})}}));else{var o=n.v,a=n.n,c=r.searchIn(o),s=c.isMatch,u=c.score,l=c.indices;s&&i.push({score:u,key:t,value:o,norm:a,indices:l})}return i}}]),e}();return D.version="6.4.6",D.createIndex=S,D.parseIndex=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.getFn,r=void 0===n?x.getFn:n,i=e.keys,o=e.records,a=new _({getFn:r});return a.setKeys(i),a.setIndexRecords(o),a},D.config=x,D},"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).Fuse=t(); \ No newline at end of file From 624b1d0afb76652bc555f745612748dd80dbb6a4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:54:34 +0530 Subject: [PATCH 039/483] trim whitespace before searching --- assets/js/fastsearch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/fastsearch.js b/assets/js/fastsearch.js index 3b7061a7..f2f50385 100644 --- a/assets/js/fastsearch.js +++ b/assets/js/fastsearch.js @@ -52,7 +52,7 @@ function activeToggle() { sInput.onkeyup = function (e) { // run a search query (for "term") every time a letter is typed // in the search box - const results = fuse.search(this.value); // the actual query being run using fuse.js + const results = fuse.search(this.value.trim()); // the actual query being run using fuse.js if (results.length !== 0) { // build our html if result exists From f64c44c8d2a19fd0ad833bea92033b0b13e3c276 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:56:09 +0530 Subject: [PATCH 040/483] tweak fuse opts -rm default opts, - add ignoreLocation (to search everywhere not just 1st 60 chars) - ref https://fusejs.io/concepts/scoring-theory.html#scoring-theory --- assets/js/fastsearch.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/js/fastsearch.js b/assets/js/fastsearch.js index f2f50385..935d8fbd 100644 --- a/assets/js/fastsearch.js +++ b/assets/js/fastsearch.js @@ -14,12 +14,9 @@ function loadSearch() { if (data) { // fuse.js options; check fuse.js website for details var options = { - isCaseSensitive: false, - shouldSort: true, - location: 0, distance: 100, threshold: 0.4, - minMatchCharLength: 0, + ignoreLocation: true, keys: [ 'title', 'permalink', From 6c79b99de8ce1ea14bc013b3c318aec743dac6e1 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 12:14:38 +0530 Subject: [PATCH 041/483] reserve space for scroll-bar --- assets/css/reset.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/css/reset.css b/assets/css/reset.css index 0f3d12fc..4b8e09f8 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -5,7 +5,8 @@ } html { - -webkit-tap-highlight-color: transparent + -webkit-tap-highlight-color: transparent; + overflow-y: scroll; } a, From 0c28a4ad5a41b0479cc1e517fbb609a3c4b73f67 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 12:50:16 +0530 Subject: [PATCH 042/483] introduce searchHidden front-matter var - to hide particular pages from search usage: in page's front-matter add searchHidden: true --- layouts/_default/index.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layouts/_default/index.json b/layouts/_default/index.json index deef3c9e..436f9e65 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -1,6 +1,7 @@ {{- $.Scratch.Add "index" slice -}} {{- range .Site.RegularPages -}} + {{- if not .Params.searchHidden }} {{- $.Scratch.Add "index" (dict "title" .Title "content" .Plain "permalink" .Permalink "summary" .Summary) -}} + {{- end }} {{- end -}} {{- $.Scratch.Get "index" | jsonify -}} - From c7b388346bc69498309d58f7b67422d9d7dc8021 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 30 Jan 2021 12:53:14 +0530 Subject: [PATCH 043/483] hide archives and search page from being searched --- layouts/_default/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/index.json b/layouts/_default/index.json index 436f9e65..2c86f7c4 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -1,6 +1,6 @@ {{- $.Scratch.Add "index" slice -}} {{- range .Site.RegularPages -}} - {{- if not .Params.searchHidden }} + {{- if and (not .Params.searchHidden) (ne .Layout `archives`) (ne .Layout `search`) }} {{- $.Scratch.Add "index" (dict "title" .Title "content" .Plain "permalink" .Permalink "summary" .Summary) -}} {{- end }} {{- end -}} From ebbeca4ab4066baaac2bfb9bcc60272dc0303344 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 12:18:04 +0530 Subject: [PATCH 044/483] Revert "fix : footer height increase for mobile devices" This reverts commit f40842915ed7d56f9690777b4eefa04acd50c7dc. --- assets/css/footer.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/footer.css b/assets/css/footer.css index 11cc29a6..c51d1c45 100644 --- a/assets/css/footer.css +++ b/assets/css/footer.css @@ -7,7 +7,7 @@ .footer { max-width: calc(var(--main-width) + var(--gap) * 2); margin: auto; - padding: calc((var(--footer-height) - (var(--gap)) - 10px) / 2) var(--gap); + padding: calc((var(--footer-height) - var(--gap)) / 2) var(--gap); text-align: center; line-height: 24px } From f8781e2cc8437b9af29714e6bc96adbd2797374b Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 17:05:40 +0530 Subject: [PATCH 045/483] Improve header - fix header height 61px->60px - check for elements before displaying - align theme-toggle - rm unnecessary elements - rm theme-toggle class - rm menu class --- assets/css/header.css | 27 ++++++++---- layouts/partials/header.html | 84 ++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 51 deletions(-) diff --git a/assets/css/header.css b/assets/css/header.css index c5fcf9d4..ffba3699 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -13,7 +13,7 @@ } .logo, -.menu { +#menu { display: flex; margin: auto var(--gap); } @@ -25,7 +25,6 @@ .logo a { font-size: 24px; font-weight: 700; - margin-inline-end: 10px } .logo a img { @@ -37,9 +36,14 @@ margin-inline-end: 8px } -.theme-toggle svg { +#theme-toggle svg { height: 18px; +} + +a#theme-toggle { + font-size: 24px; user-select: none; + margin: auto 4px; cursor: pointer } @@ -52,22 +56,22 @@ body:not(.dark) #sun { display: none } -.menu { +#menu { list-style: none; word-break: keep-all; overflow-x: auto; white-space: nowrap } -.menu li+li { +#menu li+li { margin-inline-start: var(--gap) } -.menu a { +#menu a { font-size: 16px } -.menu .active { +#menu .active { font-weight: 500; border-bottom: 2px solid currentColor } @@ -75,13 +79,18 @@ body:not(.dark) #sun { .lang-switch li, .lang-switch ul, .logo-switches { - display: inline-flex + display: inline-flex; + margin: auto 4px; +} + +.lang-switch { + display: flex; + flex-wrap: inherit } .lang-switch a { font-size: 16px; font-weight: 500; - margin: 0 8px } .logo-switches { diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 51773ed8..d91cc6fe 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -50,6 +50,7 @@ + {{- if .Title }} {{- if .Site.Params.label.icon }} + {{- end }} {{- if (not .Site.Params.disableThemeToggle) }} - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + {{- end}} {{ $lang := .Lang}} + {{ $separator := or .Title (not .Site.Params.disableThemeToggle)}} {{- with $.Site.Home.AllTranslations }} - - | - - {{- range . -}} - {{- if ne $lang .Lang }} - - - {{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }} - {{- .Language.LanguageName | emojify -}} - {{- else }} - {{- .Lang | humanize -}} - {{- end -}} - - - {{- end -}} - {{- end}} - - + + + {{- if $separator }}|{{ end }} + {{- range . -}} + {{- if ne $lang .Lang }} + + + {{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }} + {{- .Language.LanguageName | emojify -}} + {{- else }} + {{- .Lang | humanize -}} + {{- end -}} + + + {{- end -}} + {{- end}} + {{- end }} {{- $currentPage := . }} - + {{- range .Site.Menus.main }} {{- $menu_item_url := (cond (strings.HasSuffix .URL "/") .URL (printf "%s/" .URL) ) | absLangURL }} {{- $page_url:= $currentPage.Permalink | absLangURL }} From e8076c8f61076dc39dafbae9f36654fc10fa0d11 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 17:17:00 +0530 Subject: [PATCH 046/483] Fix missing first level heading in home-info close: #199 --- assets/css/post-entry.css | 2 +- layouts/partials/home_info.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/post-entry.css b/assets/css/post-entry.css index e91cb53d..21ec6ab3 100644 --- a/assets/css/post-entry.css +++ b/assets/css/post-entry.css @@ -14,7 +14,7 @@ -webkit-line-clamp: 3 } -.first-entry .entry-header h2 { +.first-entry .entry-header h1 { font-size: 34px; line-height: 1.3 } diff --git a/layouts/partials/home_info.html b/layouts/partials/home_info.html index ef086158..63a9b2cf 100644 --- a/layouts/partials/home_info.html +++ b/layouts/partials/home_info.html @@ -1,7 +1,7 @@ {{- with $.Site.Params.homeInfoParams }} - {{- .Title | markdownify }} + {{- .Title | markdownify }} {{- .Content | markdownify }} From c32e03605312e8fb11488cacce47fd36193ef50d Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 17:33:22 +0530 Subject: [PATCH 047/483] set equal margin to page-header and post-header --- assets/css/main.css | 4 ---- assets/css/post-single.css | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index b9dbe418..a22329e7 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -6,10 +6,6 @@ padding: var(--gap) } -.page-header { - margin-bottom: 24px -} - .page-header h1 { font-size: 40px } diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 76214685..9ca3e92a 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -1,3 +1,4 @@ +.page-header, .post-header { margin: 24px auto var(--content-gap) auto } From 084498558c1d0dc1cd2b3bbc2d8b07a88d199f99 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 18:04:06 +0530 Subject: [PATCH 048/483] Fix 'Tap targets are not sized appropriately' --- assets/css/header.css | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/header.css b/assets/css/header.css index ffba3699..910e98ce 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -89,6 +89,7 @@ body:not(.dark) #sun { } .lang-switch a { + margin: auto 3px; font-size: 16px; font-weight: 500; } From 7170eda1729b25b46bbcada3629d73b6abaa6d84 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 6 Feb 2021 23:50:19 +0530 Subject: [PATCH 049/483] translation list separate partial --- layouts/_default/search.html | 17 +---------------- layouts/_default/single.html | 20 ++------------------ layouts/partials/translation_list.html | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 34 deletions(-) create mode 100644 layouts/partials/translation_list.html diff --git a/layouts/_default/search.html b/layouts/_default/search.html index 4d0c415c..8ad0bef4 100644 --- a/layouts/_default/search.html +++ b/layouts/_default/search.html @@ -15,22 +15,7 @@ {{- end }} {{- if not (.Param "hideMeta") }} - {{- if .IsTranslated -}} - - {{- i18n "translations" | default "Translations"}}: - {{- range .Translations }} - - - {{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }} - {{- .Language.LanguageName | emojify | humanize -}} - {{- else }} - {{- .Lang | humanize -}} - {{- end -}} - - - {{- end }} - - {{- end }} + {{- partial "translation_list.html" . -}} {{- end}} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9716ad14..658d79cc 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -31,24 +31,8 @@ {{- end }} {{- if not (.Param "hideMeta") }} - {{- partial "post_meta.html" . -}} - {{- if .IsTranslated -}} - {{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) }} | {{- end -}} - - {{- i18n "translations" | default "Translations"}}: - {{- range .Translations }} - - - {{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }} - {{- .Language.LanguageName | emojify | humanize -}} - {{- else }} - {{- .Lang | humanize -}} - {{- end -}} - - - {{- end }} - - {{- end }} + {{- partial "post_meta.html" . -}} + {{- partial "translation_list.html" . -}} {{- end}} diff --git a/layouts/partials/translation_list.html b/layouts/partials/translation_list.html new file mode 100644 index 00000000..a2c2d86c --- /dev/null +++ b/layouts/partials/translation_list.html @@ -0,0 +1,19 @@ +{{- if .IsTranslated -}} +{{- if (ne .Layout "search")}} +{{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) }} | {{- end -}} +{{- end }} + + {{- i18n "translations" | default "Translations"}}: + {{- range .Translations }} + + + {{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }} + {{- .Language.LanguageName | emojify | humanize -}} + {{- else }} + {{- .Lang | humanize -}} + {{- end -}} + + + {{- end }} + +{{- end }} From e03348c041bc8c5c6399d2299a4a63dc93473aa0 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 7 Feb 2021 21:34:34 +0530 Subject: [PATCH 050/483] improve search - fix menu element becoming inactive change class active -> focus - set input type seach #198 - add a reset func - add script to clear searchbox when clicked on X sign --- assets/css/search.css | 2 +- assets/js/fastsearch.js | 39 ++++++++++++++++++++++-------------- layouts/_default/search.html | 4 ++-- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/assets/css/search.css b/assets/css/search.css index 5deb71ed..2b9d4bc9 100644 --- a/assets/css/search.css +++ b/assets/css/search.css @@ -39,7 +39,7 @@ outline: none; } -#searchResults .active { +#searchResults .focus { transform: scale(.98); border: 2px solid var(--tertiary) } diff --git a/assets/js/fastsearch.js b/assets/js/fastsearch.js index 935d8fbd..2546310a 100644 --- a/assets/js/fastsearch.js +++ b/assets/js/fastsearch.js @@ -42,7 +42,13 @@ function itemGen(name, link) { } function activeToggle() { - document.activeElement.parentElement.classList.toggle("active") + document.activeElement.parentElement.classList.toggle("focus") +} + +function reset() { + resultsAvailable = false; + resList.innerHTML = sInput.value = ''; // clear inputbox and searchResults + sInput.focus(); // shift focus to input box } // execute search as each character is typed @@ -59,16 +65,21 @@ sInput.onkeyup = function (e) { resultSet = resultSet + itemGen(results[item].item.title, results[item].item.permalink) } - document.getElementById("searchResults").innerHTML = resultSet; + resList.innerHTML = resultSet; resultsAvailable = true; first = resList.firstChild; last = resList.lastChild; } else { resultsAvailable = false; - document.getElementById("searchResults").innerHTML = ''; + resList.innerHTML = ''; } } +sInput.addEventListener('search', function (e) { + // clicked on x + if (!this.value) reset() +}) + // kb bindings document.onkeydown = function (e) { let key = e.key; @@ -76,9 +87,9 @@ document.onkeydown = function (e) { let inbox = document.getElementById("searchbox").contains(ae) if (ae === sInput) { - var elements = document.getElementsByClassName('active'); + var elements = document.getElementsByClassName('focus'); while (elements.length > 0) { - elements[0].classList.remove('active'); + elements[0].classList.remove('focus'); } } @@ -86,16 +97,16 @@ document.onkeydown = function (e) { e.preventDefault(); if (ae == sInput) { // if the currently focused element is the search input, focus the of first - activeToggle(); // rm active class + activeToggle(); // rm focus class resList.firstChild.lastChild.focus(); - activeToggle(); // add active class + activeToggle(); // add focus class } else if (ae.parentElement == last) { // if the currently focused element's parent is last, do nothing } else { // otherwise select the next search result - activeToggle(); // rm active class + activeToggle(); // rm focus class ae.parentElement.nextSibling.lastChild.focus(); - activeToggle(); // add active class + activeToggle(); // add focus class } } else if (key === "ArrowUp" && resultsAvailable && inbox) { e.preventDefault(); @@ -103,19 +114,17 @@ document.onkeydown = function (e) { // if the currently focused element is input box, do nothing } else if (ae.parentElement == first) { // if the currently focused element is first item, go to input box - activeToggle(); // rm active class + activeToggle(); // rm focus class sInput.focus(); } else { // otherwise select the previous search result - activeToggle(); // rm active class + activeToggle(); // rm focus class ae.parentElement.previousSibling.lastChild.focus(); - activeToggle(); // add active class + activeToggle(); // add focus class } } else if (key === "ArrowRight" && resultsAvailable && inbox) { ae.click(); // click on active link } else if (key === "Escape") { - resultsAvailable = false; - resList.innerHTML = sInput.value = ''; // clear inputbox and searchResults - sInput.focus(); // shift focus to input box + reset() } } diff --git a/layouts/_default/search.html b/layouts/_default/search.html index 8ad0bef4..ae9ba068 100644 --- a/layouts/_default/search.html +++ b/layouts/_default/search.html @@ -21,8 +21,8 @@ - + -{{- end }}{{/* end main */}} +{{- end }}{{/* end main */}} From 65f84d6f197c5212b26289a4b99b8198a582c0d4 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:21:26 +0530 Subject: [PATCH 051/483] use Parent's Permalink for breadcrumb nav --- layouts/_default/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 658d79cc..ca054336 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -4,7 +4,7 @@ {{- if (.Param "ShowBreadCrumbs")}} - {{- $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }} + {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} {{ i18n "home" | default "Home"}} From 43ddff0fde3948b6e53d5d5c15fdb7cda4e548db Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:28:55 +0530 Subject: [PATCH 052/483] breadcrumb nav as partial --- layouts/_default/single.html | 19 +------------------ layouts/partials/breadcrumbs.html | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 layouts/partials/breadcrumbs.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index ca054336..3673ea63 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,24 +2,7 @@ - {{- if (.Param "ShowBreadCrumbs")}} - - {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} - {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} - - {{ i18n "home" | default "Home"}} - {{- range $index, $element := split $lang_url "/" }} - - {{- $.Scratch.Add "path" (printf "%s/" $element )}} - {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} - - {{- if (and ($bc_pg) (gt (len . ) 0))}} - {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} - {{- end }} - - {{- end }} - - {{- end }} + {{- partial "breadcrumbs.html" . }} {{ .Title }} {{- if .Draft }} [draft]{{- end }} diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html new file mode 100644 index 00000000..55320892 --- /dev/null +++ b/layouts/partials/breadcrumbs.html @@ -0,0 +1,18 @@ +{{- if (.Param "ShowBreadCrumbs")}} + + {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} + {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} + + {{ i18n "home" | default "Home"}} + {{- range $index, $element := split $lang_url "/" }} + + {{- $.Scratch.Add "path" (printf "%s/" $element )}} + {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} + + {{- if (and ($bc_pg) (gt (len . ) 0))}} + {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} + {{- end }} + + {{- end }} + +{{- end }} From 37afb5f13e5e11925c9641f1acc4020947a3bad3 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:30:34 +0530 Subject: [PATCH 053/483] show breadcrumb nav also on list pages - specifically section pages - should not display on home(index) --- layouts/_default/list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9518ebf5..30b1527b 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -6,6 +6,7 @@ {{- if not .IsHome | and .Title }} + {{- partial "breadcrumbs.html" . }} {{ .Title }} {{- if .Description }} From 143eb18b756e051641664aca1a9538b52e2f4516 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 20:58:08 +0530 Subject: [PATCH 054/483] handle case where home-info was hidden when num of posts = 0 - fix: #227 - refactor conditions for nested if - also fix for 082d960 --- layouts/_default/list.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 30b1527b..bf87ef90 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,6 +16,10 @@ {{- end }} +{{- if and .IsHome .Site.Params.homeInfoParams (eq .Paginator.PageNumber 1) }} +{{- partial "home_info.html" . }} +{{- end }} + {{- $pages := union .RegularPages .Sections }} {{- if .IsHome }} @@ -27,15 +31,14 @@ {{- range $index, $page := $paginator.Pages }} {{- $class := "post-entry" }} -{{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }} -{{- if .Site.Params.homeInfoParams | or .Site.Params.disableSpecial1stPost}} -{{- partial "home_info.html" . }} -{{- else}} + +{{- $user_preferred := or .Site.Params.disableSpecial1stPost .Site.Params.homeInfoParams }} +{{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0) (not $user_preferred)) }} {{- $class = "first-entry" }} -{{- end }} {{- else if $term }} {{- $class = "post-entry tag-entry" }} {{- end }} + {{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList)}} {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }} @@ -72,4 +75,4 @@ {{- end }} {{end}}{{/* end profileMode */}} -{{- end }}{{- /* end main */ -}} +{{- end }}{{- /* end main */ -}} From 1a8e14a8485a615eea260bf6ff24b8ce0ee821dd Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 21:17:40 +0530 Subject: [PATCH 055/483] Use custom paginator's PageNumber for home-info fixes non-mainSections pages from being displayed in the list amend to 143eb18 --- layouts/_default/list.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index bf87ef90..ab98c958 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,10 +16,6 @@ {{- end }} -{{- if and .IsHome .Site.Params.homeInfoParams (eq .Paginator.PageNumber 1) }} -{{- partial "home_info.html" . }} -{{- end }} - {{- $pages := union .RegularPages .Sections }} {{- if .IsHome }} @@ -27,6 +23,11 @@ {{- end}} {{ $paginator := .Paginate $pages }} + +{{- if and .IsHome .Site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} +{{- partial "home_info.html" . }} +{{- end }} + {{ $term := .Data.Term}} {{- range $index, $page := $paginator.Pages }} From 034da041800de60cfdfa6dbefc00f479f7c009cb Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 21:43:45 +0530 Subject: [PATCH 056/483] use local scratch var in breadcrumbs - fix undisplayed breadcrumbs in section pages having pagination --- layouts/partials/breadcrumbs.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index 55320892..71ce58a2 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -4,10 +4,11 @@ {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} {{ i18n "home" | default "Home"}} + {{- $scratch := newScratch }} {{- range $index, $element := split $lang_url "/" }} - {{- $.Scratch.Add "path" (printf "%s/" $element )}} - {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} + {{- $scratch.Add "path" (printf "%s/" $element )}} + {{- $bc_pg := $.Site.GetPage ($scratch.Get "path") -}} {{- if (and ($bc_pg) (gt (len . ) 0))}} {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} From 6f8edf1ffa88129a26eddf508e5d1833b86e486e Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:48:04 +0530 Subject: [PATCH 057/483] change theme-switch from 'a' to 'button' and refactor --- assets/css/header.css | 8 +++----- assets/css/reset.css | 1 + layouts/partials/header.html | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/assets/css/header.css b/assets/css/header.css index 910e98ce..beaf5bd6 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -40,11 +40,9 @@ height: 18px; } -a#theme-toggle { - font-size: 24px; - user-select: none; - margin: auto 4px; - cursor: pointer +button#theme-toggle { + font-size: 26px; + margin: auto 4px } body.dark #moon { diff --git a/assets/css/reset.css b/assets/css/reset.css index 4b8e09f8..ee8e77bd 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -10,6 +10,7 @@ html { } a, +button, body, h1, h2, diff --git a/layouts/partials/header.html b/layouts/partials/header.html index d91cc6fe..301367c4 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -61,7 +61,7 @@ {{- end }} {{- if (not .Site.Params.disableThemeToggle) }} - + @@ -80,7 +80,7 @@ - + {{- end}} {{ $lang := .Lang}} {{ $separator := or .Title (not .Site.Params.disableThemeToggle)}} From a57641a24b843e9f352299d94d9f353da2071c77 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:49:03 +0530 Subject: [PATCH 058/483] fix theme-toggle shown when js is disabled --- layouts/partials/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 301367c4..00953ec0 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -40,7 +40,7 @@ {{- end }} From b523192b513450ef5748fc9df6e86abb3735f744 Mon Sep 17 00:00:00 2001 From: gsh3ll <64195264+gsh3ll@users.noreply.github.com> Date: Fri, 19 Mar 2021 21:21:20 +0800 Subject: [PATCH 081/483] Fix code block wraps on Safari (#298) --- assets/css/post-single.css | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 16a6c12e..b4307e2f 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -213,7 +213,8 @@ color: rgba(255, 255, 255, .8); background: 0 0; border-radius: 0; - overflow-x: auto + overflow-x: auto; + word-break: break-all; } .post-content blockquote { @@ -243,20 +244,20 @@ } .post-content figure.align-center { - text-align: center; + text-align: center; } -.post-content figure > figcaption { +.post-content figure>figcaption { color: var(--primary); font-size: 16px; font-weight: bold; margin: 8px 0 16px; } -.post-content figure > figcaption > p { - color: var(--secondary); - font-size: 14px; - font-weight: normal; +.post-content figure>figcaption>p { + color: var(--secondary); + font-size: 14px; + font-weight: normal; } .toc { @@ -428,4 +429,4 @@ h6:hover .anchor { [dir="rtl"] .paginav .next { text-align: left; -} +} \ No newline at end of file From 4b24a94a6a316b17945083cb95acd96f1afae48b Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 19 Mar 2021 19:35:36 +0530 Subject: [PATCH 082/483] fix reduced motion in search Results amend to e03348c --- assets/css/zmedia.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index b70aa60e..14133f0c 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -66,7 +66,7 @@ } /* search */ - #searchResults .active { + #searchResults .focus { transform: none; } } From 306aa9fbfc9af725a1c1531cb0106917b725c8f5 Mon Sep 17 00:00:00 2001 From: Kian Kasad Date: Mon, 22 Mar 2021 04:04:02 -0700 Subject: [PATCH 083/483] Fix scrollbar track background in dark mode caused by #308 (#313) --- layouts/partials/header.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 0cdd189a..f0e4bd03 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -60,6 +60,12 @@ .list { background: var(--theme); } + .list:not(.dark)::-webkit-scrollbar-track { + background: 0 0; + } + .list:not(.dark)::-webkit-scrollbar-thumb { + border-color: var(--theme); + } } {{- end }} From 80ad6ec2a33082e8c0780e9a955bba7803eca2f4 Mon Sep 17 00:00:00 2001 From: Mohammad Noor Abu Khleif Date: Mon, 22 Mar 2021 13:17:40 +0200 Subject: [PATCH 084/483] Add support for `rtl` and `ltr` shortcodes (#293) refer https://github.com/adityatelange/hugo-PaperMod/pull/293#issue-585979395 for usage guide and examples --- layouts/shortcodes/ltr.html | 15 +++++++++++++++ layouts/shortcodes/rtl.html | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 layouts/shortcodes/ltr.html create mode 100644 layouts/shortcodes/rtl.html diff --git a/layouts/shortcodes/ltr.html b/layouts/shortcodes/ltr.html new file mode 100644 index 00000000..4ad7682b --- /dev/null +++ b/layouts/shortcodes/ltr.html @@ -0,0 +1,15 @@ +{{ $.Scratch.Set "md" false }} + +{{ if .IsNamedParams }} +{{ $.Scratch.Set "md" (.Get "md") }} +{{ else }} +{{ $.Scratch.Set "md" (.Get 0) }} +{{ end }} + + + {{ if eq ($.Scratch.Get "md") false }} + {{ .Inner }} + {{ else }} + {{ .Inner | markdownify }} + {{ end }} + diff --git a/layouts/shortcodes/rtl.html b/layouts/shortcodes/rtl.html new file mode 100644 index 00000000..a69b8ce8 --- /dev/null +++ b/layouts/shortcodes/rtl.html @@ -0,0 +1,15 @@ +{{ $.Scratch.Set "md" false }} + +{{ if .IsNamedParams }} +{{ $.Scratch.Set "md" (.Get "md") }} +{{ else }} +{{ $.Scratch.Set "md" (.Get 0) }} +{{ end }} + + + {{ if eq ($.Scratch.Get "md") false }} + {{ .Inner }} + {{ else }} + {{ .Inner | markdownify }} + {{ end }} + From cb778d8db48676019ff8fc179a1dbe97501c24b4 Mon Sep 17 00:00:00 2001 From: Bassel Cheaib Date: Mon, 22 Mar 2021 13:19:29 +0200 Subject: [PATCH 085/483] Minor adjustments in Arabic translations (#309) --- i18n/ar.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/ar.yaml b/i18n/ar.yaml index 120f9981..11f50a2c 100644 --- a/i18n/ar.yaml +++ b/i18n/ar.yaml @@ -6,17 +6,17 @@ - id: read_time translation: - one: "دقيقة واحده" + one: "دقيقة واحدة" two: "دقيقتان" few: "بضع ثوان" zero: "الآن" other: "دقائق {{ .Count }}" - id: toc - translation: "فهرس المحتوي" + translation: "فهرس المحتوى" - id: translations - translation: "ترجمات اخري" + translation: "ترجمات أخرى" - id: home translation: "الصفحة الرئيسية" From d3813138d7ceb03492bca66de450b79049758c88 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 22 Mar 2021 18:16:26 +0530 Subject: [PATCH 086/483] fix more reduced motion in search Results amend to 4b24a94 & e03348c --- assets/css/zmedia.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index 14133f0c..d69ee62d 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -69,4 +69,8 @@ #searchResults .focus { transform: none; } + + #searchResults li:active { + transform: none; + } } From f3cac6c09e02d9ac2836906368608a4955c1ef42 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 22 Mar 2021 18:21:07 +0530 Subject: [PATCH 087/483] Refactor media queries reduce code --- assets/css/zmedia.css | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index d69ee62d..6f63a6df 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -40,36 +40,13 @@ } @media (prefers-reduced-motion) { - /* terms */ - .terms-tags a:active { - transform: none; - } - - /* profile-mode */ - .button:active { - transform: none; - } - - /* post-single */ - .share-buttons svg:active { - transform: none; - } - - /* post-entry */ - .post-entry:active { - transform: none; - } - - /* footer */ - .top-link { - transition: none; - } - - /* search */ - #searchResults .focus { - transform: none; - } - + /* terms; profile-mode; post-single; post-entry; post-entry; search; search */ + .terms-tags a:active, + .button:active, + .share-buttons svg:active, + .post-entry:active, + .top-link, + #searchResults .focus, #searchResults li:active { transform: none; } From abfdb54c92a26dcfaf876d2e06c1059ec9254694 Mon Sep 17 00:00:00 2001 From: Syphdias Date: Tue, 23 Mar 2021 10:28:26 +0100 Subject: [PATCH 088/483] Add option to show link in meta data for editing posts (#278) Usage - in site config => Params: editPost: URL: "https://github.com//content" Text: "Suggest Changes" # edit text appendFilePath: true # to append file path to Edit link - in front-matter vars => --- editPost: URL: "https://github.com//content" Text: "Suggest Changes" # edit text appendFilePath: true # to append file path to Edit link --- - Front-matter vars overrides global ones --- i18n/de.yaml | 3 +++ layouts/_default/single.html | 1 + layouts/partials/edit_post.html | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 layouts/partials/edit_post.html diff --git a/i18n/de.yaml b/i18n/de.yaml index 66412775..fcb53301 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -14,3 +14,6 @@ - id: translations translation: "Übersetzungen" + +- id: edit_post + translation: "Bearbeiten" diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 28689422..117ce7b0 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -16,6 +16,7 @@ {{- partial "post_meta.html" . -}} {{- partial "translation_list.html" . -}} + {{- partial "edit_post.html" . -}} {{- end}} diff --git a/layouts/partials/edit_post.html b/layouts/partials/edit_post.html new file mode 100644 index 00000000..21a33eb5 --- /dev/null +++ b/layouts/partials/edit_post.html @@ -0,0 +1,6 @@ +{{- if or .Params.editPost.URL .Site.Params.editPost.URL -}} +{{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) .IsTranslated }}| {{- end -}} + + {{- .Params.editPost.Text | default (.Site.Params.editPost.Text | default (i18n "edit_post" | default "Edit") ) -}} + +{{- end }} From 0ca760a9b323c42f39285d2c410e75419b3e18a0 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 23 Mar 2021 15:10:40 +0530 Subject: [PATCH 089/483] add Description and Summary in JSON schema as in other templates --- layouts/partials/templates/schema_json.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/templates/schema_json.html b/layouts/partials/templates/schema_json.html index df5170b6..6e0a289c 100644 --- a/layouts/partials/templates/schema_json.html +++ b/layouts/partials/templates/schema_json.html @@ -62,7 +62,7 @@ "@type": "BlogPosting", "headline": {{ .Title | plainify}}, "name": "{{ .Title | plainify }}", - "description": {{ .Summary | plainify | truncate 180 | safeHTML }}, + "description": {{ with .Description | plainify }}{{ . }}{{ else }}{{ .Summary | plainify }}{{ end -}}, "keywords": [ {{- if .Params.keywords }} {{ range $i, $e := .Params.keywords }}{{ if $i }}, {{ end }}{{ $e }}{{ end }} From 772f5711614ae93d57358e55875f4b29ec5f74b6 Mon Sep 17 00:00:00 2001 From: Daniel Atwood Date: Tue, 23 Mar 2021 15:44:46 +0530 Subject: [PATCH 090/483] Update internal tempplate from hugo cp from ffd9dac4218b8f1709de04f7131ca661715fc481 & fe77f7434bc0d7a9b54af69014eb28dbea2b236b tpl: Update date logic of opengraph and schema internal templates * Fix: updated date logic in opengraph template * Updated date logic in schema template * Reformatted opengraph and schema * Wrapped PublishDate and Lastmod in with tpl: Make the build green again Co-authored-by: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Signed-off-by: Aditya Telange <21258296+adityatelange@users.noreply.github.com> --- layouts/partials/templates/opengraph.html | 53 ++++++++++------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index c0a647df..9c2b8a59 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -9,57 +9,52 @@ {{- end}} {{- else }} -{{ with $.Params.images }}{{ range first 6 . -}} - -{{ end }}{{ else -}} + +{{- with $.Params.images -}} +{{- range first 6 . }}{{ end -}} +{{- else -}} {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} {{- with $featured -}} -{{ else -}} -{{- with $.Site.Params.images -}} - -{{ end }}{{ end }}{{ end }} +{{- else -}} +{{- with $.Site.Params.images }}{{ end -}} +{{- end -}} +{{- end -}} {{- end }} -{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} {{- if .IsPage }} -{{- if not .PublishDate.IsZero }} -{{ else if not .Date.IsZero }} -{{ end }} -{{- if not .Lastmod.IsZero }}{{ end }} -{{- else }} -{{- if not .Date.IsZero }} -{{- end }} -{{- end }}{{/* .IsPage */}} +{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} + +{{ with .PublishDate }}{{ end }} +{{ with .Lastmod }}{{ end }} + +{{- range .Site.Authors }} +{{ with .Social.facebook }}{{ end }} +{{ with .Site.Social.facebook }}{{ end }} +{{- with .Params.tags }}{{ range first 6 . }} + +{{- end }}{{ end -}} +{{- end -}} +{{- end -}} {{- with .Params.audio }}{{ end }} {{- with .Params.locale }}{{ end }} {{- with .Site.Params.title }}{{ end }} -{{- with .Params.videos }} -{{- range . }} +{{- with .Params.videos }}{{- range . }} {{ end }}{{ end }} {{- /* If it is part of a series, link to related articles */}} {{- $permalink := .Permalink }} -{{- $siteSeries := .Site.Taxonomies.series }}{{ with .Params.series }} -{{- range $name := . }} +{{- $siteSeries := .Site.Taxonomies.series }} +{{ with .Params.series }}{{- range $name := . }} {{- $series := index $siteSeries ($name | urlize) }} {{- range $page := first 6 $series.Pages }} {{- if ne $page.Permalink $permalink }}{{ end }} {{- end }} {{ end }}{{ end }} -{{- if .IsPage }} -{{- range .Site.Authors }}{{ with .Social.facebook }} -{{ end }}{{ with .Site.Social.facebook }} -{{ end }} - -{{- with .Params.tags }}{{ range first 6 . }} -{{ end }}{{ end }} -{{- end }}{{ end }} - {{- /* Facebook Page Admin ID for Domain Insights */}} {{- with .Site.Social.facebook_admin }}{{ end }} From a2b3be016947538ae60883db01a913865db38e0a Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 25 Mar 2021 10:55:11 +0530 Subject: [PATCH 091/483] Refactor noscript styles to not break with code formatter --- layouts/partials/header.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index f0e4bd03..23f25885 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -44,7 +44,10 @@ .top-link { display: none; } - {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + + + {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + + {{- end }} + From ddf004b709578a488a8c1c03478085460ba74cdd Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 25 Mar 2021 11:00:22 +0530 Subject: [PATCH 092/483] Allow disabling ScrollToTop button - refactor corresponding code usage => in site config: params: disableScrollToTop: true closes: #321 --- layouts/partials/footer.html | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 49e6061e..f818e85e 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -9,6 +9,7 @@ · Theme PaperMod +{{- if (not .Site.Params.disableScrollToTop) }} @@ -16,6 +17,7 @@ +{{- end }} {{- partial "extend_footer.html" . -}} {{- $isHLJSdisabled := (.Site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} {{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }} @@ -34,6 +36,11 @@ document.getElementById('menu').scrollLeft = localStorage.getItem("menu-scroll-position"); } } + + function menu_on_scroll() { + localStorage.setItem("menu-scroll-position", document.getElementById('menu').scrollLeft); + } + document.querySelectorAll('a[href^="#"]').forEach(anchor => { anchor.addEventListener("click", function (e) { e.preventDefault(); @@ -52,6 +59,11 @@ } }); }); + + + +{{- if (not .Site.Params.disableScrollToTop) }} + +{{- end }} + {{- if (not .Site.Params.disableThemeToggle) }} -{{- else}} +{{- else }} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }} -{{- end}} {{- end }} +{{- end }} + -{{- else}} -{{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} +{{- else }} +{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} -{{- end}} +{{- end }} {{- end -}} - - - - - - +{{- /* Favicons */}} + + + + + - -{{- hugo.Generator }} - -{{- range .AlternativeOutputFormats -}} + +{{- /* Generator */}} +{{ hugo.Generator }} + +{{- /* RSS */}} +{{ range .AlternativeOutputFormats -}} {{ end -}} {{- range .AllTranslations -}} - + {{ end }} {{- partial "extend_head.html" . -}} - + +{{- /* Misc */}} {{- if hugo.IsProduction | or (eq .Site.Params.env "production") }} {{- template "_internal/google_analytics_async.html" . }} {{- template "_internal/google_news.html" . }} {{- template "partials/templates/opengraph.html" . }} {{- template "partials/templates/twitter_cards.html" . }} {{- template "partials/templates/schema_json.html" . }} -{{- end }} +{{- end -}} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8fa2dbe9..52d470f2 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,6 +1,6 @@ -{{- /* theme-toggle is enabled */}} +{{- /* theme-toggle is enabled */}} {{- if (not .Site.Params.disableThemeToggle) }} -{{- /* theme is light */}} +{{- /* theme is light */}} {{- if (eq .Site.Params.defaultTheme "light") }} -{{- /* theme is dark */}} +{{- /* theme is dark */}} {{- else if (eq .Site.Params.defaultTheme "dark") }} {{- else }} -{{- /* theme is auto */}} +{{- /* theme is auto */}} {{- end }} -{{- /* theme-toggle is disabled and theme is auto */}} +{{- /* theme-toggle is disabled and theme is auto */}} {{- else if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark"))}} -{{ end }}{{/* .IsPage end */}} +{{- end }}{{/* .IsPage end */}} -{{ end }} +{{- end -}} diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index 4d47b2f4..89b2b7c6 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -7,7 +7,7 @@ {{- $headers := findRE "(.|\n])+?" .Content -}} {{- $has_headers := ge (len $headers) 1 -}} {{- if $has_headers -}} - + {{- $largest := 6 -}} {{- range $headers -}} {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}} @@ -16,9 +16,9 @@ {{- $largest = $headerLevel -}} {{- end -}} {{- end -}} - + {{- $firstHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers 0) 1) 0)) -}} - + {{- $.Scratch.Set "bareul" slice -}} {{- range seq (sub $firstHeaderLevel $largest) -}} @@ -28,14 +28,14 @@ {{- range $i, $header := $headers -}} {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}} {{- $headerLevel := len (seq $headerLevel) -}} - + {{/* get id="xyz" */}} {{- $id := index (findRE "(id=\"(.*?)\")" $header 9) 0 }} - + {{- /* strip id="" to leave xyz, no way to get regex capturing groups in hugo */ -}} {{- $cleanedID := replace (replace $id "id=\"" "") "\"" "" }} {{- $header := replaceRE "((.|\n])+?)" "$1" $header -}} - + {{- if ne $i 0 -}} {{- $prevHeaderLevel := index (findRE "[1-6]" (index $headers (sub $i 1)) 1) 0 -}} {{- $prevHeaderLevel := len (seq $prevHeaderLevel) -}} @@ -66,28 +66,28 @@ {{- end -}} {{- end -}} {{- end -}} - {{- end -}} + {{- end }} {{- $header | safeHTML -}} - {{- else -}} + {{- else }} {{- $header | safeHTML -}} {{- end -}} {{- end -}} {{- $firstHeaderLevel := $largest }} - {{- $lastHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers (sub (len $headers) 1)) 1) 0)) -}} + {{- $lastHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers (sub (len $headers) 1)) 1) 0)) }} {{- range seq (sub $lastHeaderLevel $firstHeaderLevel) -}} - {{- if in ($.Scratch.Get "bareul") (add . $firstHeaderLevel) -}} + {{- if in ($.Scratch.Get "bareul") (add . $firstHeaderLevel) }} - {{- else -}} + {{- else }} {{- end -}} - {{- end -}} + {{- end }} - {{- end -}} + {{- end }} - \ No newline at end of file +
- {{- .Title | markdownify }} + {{- .Title | markdownify }} {{- .Content | markdownify }} From c32e03605312e8fb11488cacce47fd36193ef50d Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 17:33:22 +0530 Subject: [PATCH 047/483] set equal margin to page-header and post-header --- assets/css/main.css | 4 ---- assets/css/post-single.css | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index b9dbe418..a22329e7 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -6,10 +6,6 @@ padding: var(--gap) } -.page-header { - margin-bottom: 24px -} - .page-header h1 { font-size: 40px } diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 76214685..9ca3e92a 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -1,3 +1,4 @@ +.page-header, .post-header { margin: 24px auto var(--content-gap) auto } From 084498558c1d0dc1cd2b3bbc2d8b07a88d199f99 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sun, 31 Jan 2021 18:04:06 +0530 Subject: [PATCH 048/483] Fix 'Tap targets are not sized appropriately' --- assets/css/header.css | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/header.css b/assets/css/header.css index ffba3699..910e98ce 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -89,6 +89,7 @@ body:not(.dark) #sun { } .lang-switch a { + margin: auto 3px; font-size: 16px; font-weight: 500; } From 7170eda1729b25b46bbcada3629d73b6abaa6d84 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Sat, 6 Feb 2021 23:50:19 +0530 Subject: [PATCH 049/483] translation list separate partial --- layouts/_default/search.html | 17 +---------------- layouts/_default/single.html | 20 ++------------------ layouts/partials/translation_list.html | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 34 deletions(-) create mode 100644 layouts/partials/translation_list.html diff --git a/layouts/_default/search.html b/layouts/_default/search.html index 4d0c415c..8ad0bef4 100644 --- a/layouts/_default/search.html +++ b/layouts/_default/search.html @@ -15,22 +15,7 @@ {{- end }} {{- if not (.Param "hideMeta") }} - {{- if .IsTranslated -}} - - {{- i18n "translations" | default "Translations"}}: - {{- range .Translations }} - - - {{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }} - {{- .Language.LanguageName | emojify | humanize -}} - {{- else }} - {{- .Lang | humanize -}} - {{- end -}} - - - {{- end }} - - {{- end }} + {{- partial "translation_list.html" . -}} {{- end}}
- {{- if (.Param "ShowBreadCrumbs")}} - - {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} - {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} - - {{ i18n "home" | default "Home"}} - {{- range $index, $element := split $lang_url "/" }} - - {{- $.Scratch.Add "path" (printf "%s/" $element )}} - {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} - - {{- if (and ($bc_pg) (gt (len . ) 0))}} - {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} - {{- end }} - - {{- end }} - - {{- end }} + {{- partial "breadcrumbs.html" . }} {{ .Title }} {{- if .Draft }} [draft]{{- end }} diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html new file mode 100644 index 00000000..55320892 --- /dev/null +++ b/layouts/partials/breadcrumbs.html @@ -0,0 +1,18 @@ +{{- if (.Param "ShowBreadCrumbs")}} + + {{- $url := replace .Parent.Permalink ( printf "%s" .Site.BaseURL) "" }} + {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} + + {{ i18n "home" | default "Home"}} + {{- range $index, $element := split $lang_url "/" }} + + {{- $.Scratch.Add "path" (printf "%s/" $element )}} + {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} + + {{- if (and ($bc_pg) (gt (len . ) 0))}} + {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} + {{- end }} + + {{- end }} + +{{- end }} From 37afb5f13e5e11925c9641f1acc4020947a3bad3 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:30:34 +0530 Subject: [PATCH 053/483] show breadcrumb nav also on list pages - specifically section pages - should not display on home(index) --- layouts/_default/list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9518ebf5..30b1527b 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -6,6 +6,7 @@ {{- if not .IsHome | and .Title }} + {{- partial "breadcrumbs.html" . }} {{ .Title }} {{- if .Description }} From 143eb18b756e051641664aca1a9538b52e2f4516 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 20:58:08 +0530 Subject: [PATCH 054/483] handle case where home-info was hidden when num of posts = 0 - fix: #227 - refactor conditions for nested if - also fix for 082d960 --- layouts/_default/list.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 30b1527b..bf87ef90 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,6 +16,10 @@ {{- end }} +{{- if and .IsHome .Site.Params.homeInfoParams (eq .Paginator.PageNumber 1) }} +{{- partial "home_info.html" . }} +{{- end }} + {{- $pages := union .RegularPages .Sections }} {{- if .IsHome }} @@ -27,15 +31,14 @@ {{- range $index, $page := $paginator.Pages }} {{- $class := "post-entry" }} -{{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }} -{{- if .Site.Params.homeInfoParams | or .Site.Params.disableSpecial1stPost}} -{{- partial "home_info.html" . }} -{{- else}} + +{{- $user_preferred := or .Site.Params.disableSpecial1stPost .Site.Params.homeInfoParams }} +{{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0) (not $user_preferred)) }} {{- $class = "first-entry" }} -{{- end }} {{- else if $term }} {{- $class = "post-entry tag-entry" }} {{- end }} + {{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList)}} {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }} @@ -72,4 +75,4 @@ {{- end }} {{end}}{{/* end profileMode */}} -{{- end }}{{- /* end main */ -}} +{{- end }}{{- /* end main */ -}} From 1a8e14a8485a615eea260bf6ff24b8ce0ee821dd Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 21:17:40 +0530 Subject: [PATCH 055/483] Use custom paginator's PageNumber for home-info fixes non-mainSections pages from being displayed in the list amend to 143eb18 --- layouts/_default/list.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index bf87ef90..ab98c958 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,10 +16,6 @@ {{- end }} -{{- if and .IsHome .Site.Params.homeInfoParams (eq .Paginator.PageNumber 1) }} -{{- partial "home_info.html" . }} -{{- end }} - {{- $pages := union .RegularPages .Sections }} {{- if .IsHome }} @@ -27,6 +23,11 @@ {{- end}} {{ $paginator := .Paginate $pages }} + +{{- if and .IsHome .Site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} +{{- partial "home_info.html" . }} +{{- end }} + {{ $term := .Data.Term}} {{- range $index, $page := $paginator.Pages }} From 034da041800de60cfdfa6dbefc00f479f7c009cb Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 21:43:45 +0530 Subject: [PATCH 056/483] use local scratch var in breadcrumbs - fix undisplayed breadcrumbs in section pages having pagination --- layouts/partials/breadcrumbs.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index 55320892..71ce58a2 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -4,10 +4,11 @@ {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} {{ i18n "home" | default "Home"}} + {{- $scratch := newScratch }} {{- range $index, $element := split $lang_url "/" }} - {{- $.Scratch.Add "path" (printf "%s/" $element )}} - {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} + {{- $scratch.Add "path" (printf "%s/" $element )}} + {{- $bc_pg := $.Site.GetPage ($scratch.Get "path") -}} {{- if (and ($bc_pg) (gt (len . ) 0))}} {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} From 6f8edf1ffa88129a26eddf508e5d1833b86e486e Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:48:04 +0530 Subject: [PATCH 057/483] change theme-switch from 'a' to 'button' and refactor --- assets/css/header.css | 8 +++----- assets/css/reset.css | 1 + layouts/partials/header.html | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/assets/css/header.css b/assets/css/header.css index 910e98ce..beaf5bd6 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -40,11 +40,9 @@ height: 18px; } -a#theme-toggle { - font-size: 24px; - user-select: none; - margin: auto 4px; - cursor: pointer +button#theme-toggle { + font-size: 26px; + margin: auto 4px } body.dark #moon { diff --git a/assets/css/reset.css b/assets/css/reset.css index 4b8e09f8..ee8e77bd 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -10,6 +10,7 @@ html { } a, +button, body, h1, h2, diff --git a/layouts/partials/header.html b/layouts/partials/header.html index d91cc6fe..301367c4 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -61,7 +61,7 @@ {{- end }} {{- if (not .Site.Params.disableThemeToggle) }} - + @@ -80,7 +80,7 @@ - + {{- end}} {{ $lang := .Lang}} {{ $separator := or .Title (not .Site.Params.disableThemeToggle)}} From a57641a24b843e9f352299d94d9f353da2071c77 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:49:03 +0530 Subject: [PATCH 058/483] fix theme-toggle shown when js is disabled --- layouts/partials/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 301367c4..00953ec0 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -40,7 +40,7 @@ {{- end }} From b523192b513450ef5748fc9df6e86abb3735f744 Mon Sep 17 00:00:00 2001 From: gsh3ll <64195264+gsh3ll@users.noreply.github.com> Date: Fri, 19 Mar 2021 21:21:20 +0800 Subject: [PATCH 081/483] Fix code block wraps on Safari (#298) --- assets/css/post-single.css | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 16a6c12e..b4307e2f 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -213,7 +213,8 @@ color: rgba(255, 255, 255, .8); background: 0 0; border-radius: 0; - overflow-x: auto + overflow-x: auto; + word-break: break-all; } .post-content blockquote { @@ -243,20 +244,20 @@ } .post-content figure.align-center { - text-align: center; + text-align: center; } -.post-content figure > figcaption { +.post-content figure>figcaption { color: var(--primary); font-size: 16px; font-weight: bold; margin: 8px 0 16px; } -.post-content figure > figcaption > p { - color: var(--secondary); - font-size: 14px; - font-weight: normal; +.post-content figure>figcaption>p { + color: var(--secondary); + font-size: 14px; + font-weight: normal; } .toc { @@ -428,4 +429,4 @@ h6:hover .anchor { [dir="rtl"] .paginav .next { text-align: left; -} +} \ No newline at end of file From 4b24a94a6a316b17945083cb95acd96f1afae48b Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 19 Mar 2021 19:35:36 +0530 Subject: [PATCH 082/483] fix reduced motion in search Results amend to e03348c --- assets/css/zmedia.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index b70aa60e..14133f0c 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -66,7 +66,7 @@ } /* search */ - #searchResults .active { + #searchResults .focus { transform: none; } } From 306aa9fbfc9af725a1c1531cb0106917b725c8f5 Mon Sep 17 00:00:00 2001 From: Kian Kasad Date: Mon, 22 Mar 2021 04:04:02 -0700 Subject: [PATCH 083/483] Fix scrollbar track background in dark mode caused by #308 (#313) --- layouts/partials/header.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 0cdd189a..f0e4bd03 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -60,6 +60,12 @@ .list { background: var(--theme); } + .list:not(.dark)::-webkit-scrollbar-track { + background: 0 0; + } + .list:not(.dark)::-webkit-scrollbar-thumb { + border-color: var(--theme); + } } {{- end }} From 80ad6ec2a33082e8c0780e9a955bba7803eca2f4 Mon Sep 17 00:00:00 2001 From: Mohammad Noor Abu Khleif Date: Mon, 22 Mar 2021 13:17:40 +0200 Subject: [PATCH 084/483] Add support for `rtl` and `ltr` shortcodes (#293) refer https://github.com/adityatelange/hugo-PaperMod/pull/293#issue-585979395 for usage guide and examples --- layouts/shortcodes/ltr.html | 15 +++++++++++++++ layouts/shortcodes/rtl.html | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 layouts/shortcodes/ltr.html create mode 100644 layouts/shortcodes/rtl.html diff --git a/layouts/shortcodes/ltr.html b/layouts/shortcodes/ltr.html new file mode 100644 index 00000000..4ad7682b --- /dev/null +++ b/layouts/shortcodes/ltr.html @@ -0,0 +1,15 @@ +{{ $.Scratch.Set "md" false }} + +{{ if .IsNamedParams }} +{{ $.Scratch.Set "md" (.Get "md") }} +{{ else }} +{{ $.Scratch.Set "md" (.Get 0) }} +{{ end }} + + + {{ if eq ($.Scratch.Get "md") false }} + {{ .Inner }} + {{ else }} + {{ .Inner | markdownify }} + {{ end }} + diff --git a/layouts/shortcodes/rtl.html b/layouts/shortcodes/rtl.html new file mode 100644 index 00000000..a69b8ce8 --- /dev/null +++ b/layouts/shortcodes/rtl.html @@ -0,0 +1,15 @@ +{{ $.Scratch.Set "md" false }} + +{{ if .IsNamedParams }} +{{ $.Scratch.Set "md" (.Get "md") }} +{{ else }} +{{ $.Scratch.Set "md" (.Get 0) }} +{{ end }} + + + {{ if eq ($.Scratch.Get "md") false }} + {{ .Inner }} + {{ else }} + {{ .Inner | markdownify }} + {{ end }} + From cb778d8db48676019ff8fc179a1dbe97501c24b4 Mon Sep 17 00:00:00 2001 From: Bassel Cheaib Date: Mon, 22 Mar 2021 13:19:29 +0200 Subject: [PATCH 085/483] Minor adjustments in Arabic translations (#309) --- i18n/ar.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/ar.yaml b/i18n/ar.yaml index 120f9981..11f50a2c 100644 --- a/i18n/ar.yaml +++ b/i18n/ar.yaml @@ -6,17 +6,17 @@ - id: read_time translation: - one: "دقيقة واحده" + one: "دقيقة واحدة" two: "دقيقتان" few: "بضع ثوان" zero: "الآن" other: "دقائق {{ .Count }}" - id: toc - translation: "فهرس المحتوي" + translation: "فهرس المحتوى" - id: translations - translation: "ترجمات اخري" + translation: "ترجمات أخرى" - id: home translation: "الصفحة الرئيسية" From d3813138d7ceb03492bca66de450b79049758c88 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 22 Mar 2021 18:16:26 +0530 Subject: [PATCH 086/483] fix more reduced motion in search Results amend to 4b24a94 & e03348c --- assets/css/zmedia.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index 14133f0c..d69ee62d 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -69,4 +69,8 @@ #searchResults .focus { transform: none; } + + #searchResults li:active { + transform: none; + } } From f3cac6c09e02d9ac2836906368608a4955c1ef42 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 22 Mar 2021 18:21:07 +0530 Subject: [PATCH 087/483] Refactor media queries reduce code --- assets/css/zmedia.css | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index d69ee62d..6f63a6df 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -40,36 +40,13 @@ } @media (prefers-reduced-motion) { - /* terms */ - .terms-tags a:active { - transform: none; - } - - /* profile-mode */ - .button:active { - transform: none; - } - - /* post-single */ - .share-buttons svg:active { - transform: none; - } - - /* post-entry */ - .post-entry:active { - transform: none; - } - - /* footer */ - .top-link { - transition: none; - } - - /* search */ - #searchResults .focus { - transform: none; - } - + /* terms; profile-mode; post-single; post-entry; post-entry; search; search */ + .terms-tags a:active, + .button:active, + .share-buttons svg:active, + .post-entry:active, + .top-link, + #searchResults .focus, #searchResults li:active { transform: none; } From abfdb54c92a26dcfaf876d2e06c1059ec9254694 Mon Sep 17 00:00:00 2001 From: Syphdias Date: Tue, 23 Mar 2021 10:28:26 +0100 Subject: [PATCH 088/483] Add option to show link in meta data for editing posts (#278) Usage - in site config => Params: editPost: URL: "https://github.com//content" Text: "Suggest Changes" # edit text appendFilePath: true # to append file path to Edit link - in front-matter vars => --- editPost: URL: "https://github.com//content" Text: "Suggest Changes" # edit text appendFilePath: true # to append file path to Edit link --- - Front-matter vars overrides global ones --- i18n/de.yaml | 3 +++ layouts/_default/single.html | 1 + layouts/partials/edit_post.html | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 layouts/partials/edit_post.html diff --git a/i18n/de.yaml b/i18n/de.yaml index 66412775..fcb53301 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -14,3 +14,6 @@ - id: translations translation: "Übersetzungen" + +- id: edit_post + translation: "Bearbeiten" diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 28689422..117ce7b0 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -16,6 +16,7 @@ {{- partial "post_meta.html" . -}} {{- partial "translation_list.html" . -}} + {{- partial "edit_post.html" . -}} {{- end}} diff --git a/layouts/partials/edit_post.html b/layouts/partials/edit_post.html new file mode 100644 index 00000000..21a33eb5 --- /dev/null +++ b/layouts/partials/edit_post.html @@ -0,0 +1,6 @@ +{{- if or .Params.editPost.URL .Site.Params.editPost.URL -}} +{{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) .IsTranslated }}| {{- end -}} + + {{- .Params.editPost.Text | default (.Site.Params.editPost.Text | default (i18n "edit_post" | default "Edit") ) -}} + +{{- end }} From 0ca760a9b323c42f39285d2c410e75419b3e18a0 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 23 Mar 2021 15:10:40 +0530 Subject: [PATCH 089/483] add Description and Summary in JSON schema as in other templates --- layouts/partials/templates/schema_json.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/templates/schema_json.html b/layouts/partials/templates/schema_json.html index df5170b6..6e0a289c 100644 --- a/layouts/partials/templates/schema_json.html +++ b/layouts/partials/templates/schema_json.html @@ -62,7 +62,7 @@ "@type": "BlogPosting", "headline": {{ .Title | plainify}}, "name": "{{ .Title | plainify }}", - "description": {{ .Summary | plainify | truncate 180 | safeHTML }}, + "description": {{ with .Description | plainify }}{{ . }}{{ else }}{{ .Summary | plainify }}{{ end -}}, "keywords": [ {{- if .Params.keywords }} {{ range $i, $e := .Params.keywords }}{{ if $i }}, {{ end }}{{ $e }}{{ end }} From 772f5711614ae93d57358e55875f4b29ec5f74b6 Mon Sep 17 00:00:00 2001 From: Daniel Atwood Date: Tue, 23 Mar 2021 15:44:46 +0530 Subject: [PATCH 090/483] Update internal tempplate from hugo cp from ffd9dac4218b8f1709de04f7131ca661715fc481 & fe77f7434bc0d7a9b54af69014eb28dbea2b236b tpl: Update date logic of opengraph and schema internal templates * Fix: updated date logic in opengraph template * Updated date logic in schema template * Reformatted opengraph and schema * Wrapped PublishDate and Lastmod in with tpl: Make the build green again Co-authored-by: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Signed-off-by: Aditya Telange <21258296+adityatelange@users.noreply.github.com> --- layouts/partials/templates/opengraph.html | 53 ++++++++++------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index c0a647df..9c2b8a59 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -9,57 +9,52 @@ {{- end}} {{- else }} -{{ with $.Params.images }}{{ range first 6 . -}} - -{{ end }}{{ else -}} + +{{- with $.Params.images -}} +{{- range first 6 . }}{{ end -}} +{{- else -}} {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} {{- with $featured -}} -{{ else -}} -{{- with $.Site.Params.images -}} - -{{ end }}{{ end }}{{ end }} +{{- else -}} +{{- with $.Site.Params.images }}{{ end -}} +{{- end -}} +{{- end -}} {{- end }} -{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} {{- if .IsPage }} -{{- if not .PublishDate.IsZero }} -{{ else if not .Date.IsZero }} -{{ end }} -{{- if not .Lastmod.IsZero }}{{ end }} -{{- else }} -{{- if not .Date.IsZero }} -{{- end }} -{{- end }}{{/* .IsPage */}} +{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} + +{{ with .PublishDate }}{{ end }} +{{ with .Lastmod }}{{ end }} + +{{- range .Site.Authors }} +{{ with .Social.facebook }}{{ end }} +{{ with .Site.Social.facebook }}{{ end }} +{{- with .Params.tags }}{{ range first 6 . }} + +{{- end }}{{ end -}} +{{- end -}} +{{- end -}} {{- with .Params.audio }}{{ end }} {{- with .Params.locale }}{{ end }} {{- with .Site.Params.title }}{{ end }} -{{- with .Params.videos }} -{{- range . }} +{{- with .Params.videos }}{{- range . }} {{ end }}{{ end }} {{- /* If it is part of a series, link to related articles */}} {{- $permalink := .Permalink }} -{{- $siteSeries := .Site.Taxonomies.series }}{{ with .Params.series }} -{{- range $name := . }} +{{- $siteSeries := .Site.Taxonomies.series }} +{{ with .Params.series }}{{- range $name := . }} {{- $series := index $siteSeries ($name | urlize) }} {{- range $page := first 6 $series.Pages }} {{- if ne $page.Permalink $permalink }}{{ end }} {{- end }} {{ end }}{{ end }} -{{- if .IsPage }} -{{- range .Site.Authors }}{{ with .Social.facebook }} -{{ end }}{{ with .Site.Social.facebook }} -{{ end }} - -{{- with .Params.tags }}{{ range first 6 . }} -{{ end }}{{ end }} -{{- end }}{{ end }} - {{- /* Facebook Page Admin ID for Domain Insights */}} {{- with .Site.Social.facebook_admin }}{{ end }} From a2b3be016947538ae60883db01a913865db38e0a Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 25 Mar 2021 10:55:11 +0530 Subject: [PATCH 091/483] Refactor noscript styles to not break with code formatter --- layouts/partials/header.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index f0e4bd03..23f25885 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -44,7 +44,10 @@ .top-link { display: none; } - {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + + + {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + + {{- end }} + From ddf004b709578a488a8c1c03478085460ba74cdd Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 25 Mar 2021 11:00:22 +0530 Subject: [PATCH 092/483] Allow disabling ScrollToTop button - refactor corresponding code usage => in site config: params: disableScrollToTop: true closes: #321 --- layouts/partials/footer.html | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 49e6061e..f818e85e 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -9,6 +9,7 @@ · Theme PaperMod +{{- if (not .Site.Params.disableScrollToTop) }} @@ -16,6 +17,7 @@ +{{- end }} {{- partial "extend_footer.html" . -}} {{- $isHLJSdisabled := (.Site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} {{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }} @@ -34,6 +36,11 @@ document.getElementById('menu').scrollLeft = localStorage.getItem("menu-scroll-position"); } } + + function menu_on_scroll() { + localStorage.setItem("menu-scroll-position", document.getElementById('menu').scrollLeft); + } + document.querySelectorAll('a[href^="#"]').forEach(anchor => { anchor.addEventListener("click", function (e) { e.preventDefault(); @@ -52,6 +59,11 @@ } }); }); + + + +{{- if (not .Site.Params.disableScrollToTop) }} + +{{- end }} + {{- if (not .Site.Params.disableThemeToggle) }} -{{- else}} +{{- else }} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }} -{{- end}} {{- end }} +{{- end }} + -{{- else}} -{{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} +{{- else }} +{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} -{{- end}} +{{- end }} {{- end -}} - - - - - - +{{- /* Favicons */}} + + + + + - -{{- hugo.Generator }} - -{{- range .AlternativeOutputFormats -}} + +{{- /* Generator */}} +{{ hugo.Generator }} + +{{- /* RSS */}} +{{ range .AlternativeOutputFormats -}} {{ end -}} {{- range .AllTranslations -}} - + {{ end }} {{- partial "extend_head.html" . -}} - + +{{- /* Misc */}} {{- if hugo.IsProduction | or (eq .Site.Params.env "production") }} {{- template "_internal/google_analytics_async.html" . }} {{- template "_internal/google_news.html" . }} {{- template "partials/templates/opengraph.html" . }} {{- template "partials/templates/twitter_cards.html" . }} {{- template "partials/templates/schema_json.html" . }} -{{- end }} +{{- end -}} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8fa2dbe9..52d470f2 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,6 +1,6 @@ -{{- /* theme-toggle is enabled */}} +{{- /* theme-toggle is enabled */}} {{- if (not .Site.Params.disableThemeToggle) }} -{{- /* theme is light */}} +{{- /* theme is light */}} {{- if (eq .Site.Params.defaultTheme "light") }} -{{- /* theme is dark */}} +{{- /* theme is dark */}} {{- else if (eq .Site.Params.defaultTheme "dark") }} {{- else }} -{{- /* theme is auto */}} +{{- /* theme is auto */}} {{- end }} -{{- /* theme-toggle is disabled and theme is auto */}} +{{- /* theme-toggle is disabled and theme is auto */}} {{- else if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark"))}} -{{ end }}{{/* .IsPage end */}} +{{- end }}{{/* .IsPage end */}} -{{ end }} +{{- end -}} diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index 4d47b2f4..89b2b7c6 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -7,7 +7,7 @@ {{- $headers := findRE "(.|\n])+?" .Content -}} {{- $has_headers := ge (len $headers) 1 -}} {{- if $has_headers -}} - + {{- $largest := 6 -}} {{- range $headers -}} {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}} @@ -16,9 +16,9 @@ {{- $largest = $headerLevel -}} {{- end -}} {{- end -}} - + {{- $firstHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers 0) 1) 0)) -}} - + {{- $.Scratch.Set "bareul" slice -}} {{- range seq (sub $firstHeaderLevel $largest) -}} @@ -28,14 +28,14 @@ {{- range $i, $header := $headers -}} {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}} {{- $headerLevel := len (seq $headerLevel) -}} - + {{/* get id="xyz" */}} {{- $id := index (findRE "(id=\"(.*?)\")" $header 9) 0 }} - + {{- /* strip id="" to leave xyz, no way to get regex capturing groups in hugo */ -}} {{- $cleanedID := replace (replace $id "id=\"" "") "\"" "" }} {{- $header := replaceRE "((.|\n])+?)" "$1" $header -}} - + {{- if ne $i 0 -}} {{- $prevHeaderLevel := index (findRE "[1-6]" (index $headers (sub $i 1)) 1) 0 -}} {{- $prevHeaderLevel := len (seq $prevHeaderLevel) -}} @@ -66,28 +66,28 @@ {{- end -}} {{- end -}} {{- end -}} - {{- end -}} + {{- end }} {{- $header | safeHTML -}} - {{- else -}} + {{- else }} {{- $header | safeHTML -}} {{- end -}} {{- end -}} {{- $firstHeaderLevel := $largest }} - {{- $lastHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers (sub (len $headers) 1)) 1) 0)) -}} + {{- $lastHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers (sub (len $headers) 1)) 1) 0)) }} {{- range seq (sub $lastHeaderLevel $firstHeaderLevel) -}} - {{- if in ($.Scratch.Get "bareul") (add . $firstHeaderLevel) -}} + {{- if in ($.Scratch.Get "bareul") (add . $firstHeaderLevel) }} - {{- else -}} + {{- else }} {{- end -}} - {{- end -}} + {{- end }} - {{- end -}} + {{- end }} -
{{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList)}} {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }} @@ -72,4 +75,4 @@ {{- end }} {{end}}{{/* end profileMode */}} -{{- end }}{{- /* end main */ -}} +{{- end }}{{- /* end main */ -}} From 1a8e14a8485a615eea260bf6ff24b8ce0ee821dd Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 21:17:40 +0530 Subject: [PATCH 055/483] Use custom paginator's PageNumber for home-info fixes non-mainSections pages from being displayed in the list amend to 143eb18 --- layouts/_default/list.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index bf87ef90..ab98c958 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -16,10 +16,6 @@ {{- end }} -{{- if and .IsHome .Site.Params.homeInfoParams (eq .Paginator.PageNumber 1) }} -{{- partial "home_info.html" . }} -{{- end }} - {{- $pages := union .RegularPages .Sections }} {{- if .IsHome }} @@ -27,6 +23,11 @@ {{- end}} {{ $paginator := .Paginate $pages }} + +{{- if and .IsHome .Site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} +{{- partial "home_info.html" . }} +{{- end }} + {{ $term := .Data.Term}} {{- range $index, $page := $paginator.Pages }} From 034da041800de60cfdfa6dbefc00f479f7c009cb Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Wed, 10 Feb 2021 21:43:45 +0530 Subject: [PATCH 056/483] use local scratch var in breadcrumbs - fix undisplayed breadcrumbs in section pages having pagination --- layouts/partials/breadcrumbs.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index 55320892..71ce58a2 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -4,10 +4,11 @@ {{- $lang_url := replace $url ( printf "%s" .Lang) "" }} {{ i18n "home" | default "Home"}} + {{- $scratch := newScratch }} {{- range $index, $element := split $lang_url "/" }} - {{- $.Scratch.Add "path" (printf "%s/" $element )}} - {{- $bc_pg := $.Site.GetPage ($.Scratch.Get "path") -}} + {{- $scratch.Add "path" (printf "%s/" $element )}} + {{- $bc_pg := $.Site.GetPage ($scratch.Get "path") -}} {{- if (and ($bc_pg) (gt (len . ) 0))}} {{- print " » " | safeHTML -}}{{ $bc_pg.Name }} From 6f8edf1ffa88129a26eddf508e5d1833b86e486e Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:48:04 +0530 Subject: [PATCH 057/483] change theme-switch from 'a' to 'button' and refactor --- assets/css/header.css | 8 +++----- assets/css/reset.css | 1 + layouts/partials/header.html | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/assets/css/header.css b/assets/css/header.css index 910e98ce..beaf5bd6 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -40,11 +40,9 @@ height: 18px; } -a#theme-toggle { - font-size: 24px; - user-select: none; - margin: auto 4px; - cursor: pointer +button#theme-toggle { + font-size: 26px; + margin: auto 4px } body.dark #moon { diff --git a/assets/css/reset.css b/assets/css/reset.css index 4b8e09f8..ee8e77bd 100644 --- a/assets/css/reset.css +++ b/assets/css/reset.css @@ -10,6 +10,7 @@ html { } a, +button, body, h1, h2, diff --git a/layouts/partials/header.html b/layouts/partials/header.html index d91cc6fe..301367c4 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -61,7 +61,7 @@ {{- end }} {{- if (not .Site.Params.disableThemeToggle) }} - + @@ -80,7 +80,7 @@ - + {{- end}} {{ $lang := .Lang}} {{ $separator := or .Title (not .Site.Params.disableThemeToggle)}} From a57641a24b843e9f352299d94d9f353da2071c77 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:49:03 +0530 Subject: [PATCH 058/483] fix theme-toggle shown when js is disabled --- layouts/partials/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 301367c4..00953ec0 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -40,7 +40,7 @@ {{- end }} From b523192b513450ef5748fc9df6e86abb3735f744 Mon Sep 17 00:00:00 2001 From: gsh3ll <64195264+gsh3ll@users.noreply.github.com> Date: Fri, 19 Mar 2021 21:21:20 +0800 Subject: [PATCH 081/483] Fix code block wraps on Safari (#298) --- assets/css/post-single.css | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/assets/css/post-single.css b/assets/css/post-single.css index 16a6c12e..b4307e2f 100644 --- a/assets/css/post-single.css +++ b/assets/css/post-single.css @@ -213,7 +213,8 @@ color: rgba(255, 255, 255, .8); background: 0 0; border-radius: 0; - overflow-x: auto + overflow-x: auto; + word-break: break-all; } .post-content blockquote { @@ -243,20 +244,20 @@ } .post-content figure.align-center { - text-align: center; + text-align: center; } -.post-content figure > figcaption { +.post-content figure>figcaption { color: var(--primary); font-size: 16px; font-weight: bold; margin: 8px 0 16px; } -.post-content figure > figcaption > p { - color: var(--secondary); - font-size: 14px; - font-weight: normal; +.post-content figure>figcaption>p { + color: var(--secondary); + font-size: 14px; + font-weight: normal; } .toc { @@ -428,4 +429,4 @@ h6:hover .anchor { [dir="rtl"] .paginav .next { text-align: left; -} +} \ No newline at end of file From 4b24a94a6a316b17945083cb95acd96f1afae48b Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Fri, 19 Mar 2021 19:35:36 +0530 Subject: [PATCH 082/483] fix reduced motion in search Results amend to e03348c --- assets/css/zmedia.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index b70aa60e..14133f0c 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -66,7 +66,7 @@ } /* search */ - #searchResults .active { + #searchResults .focus { transform: none; } } From 306aa9fbfc9af725a1c1531cb0106917b725c8f5 Mon Sep 17 00:00:00 2001 From: Kian Kasad Date: Mon, 22 Mar 2021 04:04:02 -0700 Subject: [PATCH 083/483] Fix scrollbar track background in dark mode caused by #308 (#313) --- layouts/partials/header.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 0cdd189a..f0e4bd03 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -60,6 +60,12 @@ .list { background: var(--theme); } + .list:not(.dark)::-webkit-scrollbar-track { + background: 0 0; + } + .list:not(.dark)::-webkit-scrollbar-thumb { + border-color: var(--theme); + } } {{- end }} From 80ad6ec2a33082e8c0780e9a955bba7803eca2f4 Mon Sep 17 00:00:00 2001 From: Mohammad Noor Abu Khleif Date: Mon, 22 Mar 2021 13:17:40 +0200 Subject: [PATCH 084/483] Add support for `rtl` and `ltr` shortcodes (#293) refer https://github.com/adityatelange/hugo-PaperMod/pull/293#issue-585979395 for usage guide and examples --- layouts/shortcodes/ltr.html | 15 +++++++++++++++ layouts/shortcodes/rtl.html | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 layouts/shortcodes/ltr.html create mode 100644 layouts/shortcodes/rtl.html diff --git a/layouts/shortcodes/ltr.html b/layouts/shortcodes/ltr.html new file mode 100644 index 00000000..4ad7682b --- /dev/null +++ b/layouts/shortcodes/ltr.html @@ -0,0 +1,15 @@ +{{ $.Scratch.Set "md" false }} + +{{ if .IsNamedParams }} +{{ $.Scratch.Set "md" (.Get "md") }} +{{ else }} +{{ $.Scratch.Set "md" (.Get 0) }} +{{ end }} + + + {{ if eq ($.Scratch.Get "md") false }} + {{ .Inner }} + {{ else }} + {{ .Inner | markdownify }} + {{ end }} + diff --git a/layouts/shortcodes/rtl.html b/layouts/shortcodes/rtl.html new file mode 100644 index 00000000..a69b8ce8 --- /dev/null +++ b/layouts/shortcodes/rtl.html @@ -0,0 +1,15 @@ +{{ $.Scratch.Set "md" false }} + +{{ if .IsNamedParams }} +{{ $.Scratch.Set "md" (.Get "md") }} +{{ else }} +{{ $.Scratch.Set "md" (.Get 0) }} +{{ end }} + + + {{ if eq ($.Scratch.Get "md") false }} + {{ .Inner }} + {{ else }} + {{ .Inner | markdownify }} + {{ end }} + From cb778d8db48676019ff8fc179a1dbe97501c24b4 Mon Sep 17 00:00:00 2001 From: Bassel Cheaib Date: Mon, 22 Mar 2021 13:19:29 +0200 Subject: [PATCH 085/483] Minor adjustments in Arabic translations (#309) --- i18n/ar.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/ar.yaml b/i18n/ar.yaml index 120f9981..11f50a2c 100644 --- a/i18n/ar.yaml +++ b/i18n/ar.yaml @@ -6,17 +6,17 @@ - id: read_time translation: - one: "دقيقة واحده" + one: "دقيقة واحدة" two: "دقيقتان" few: "بضع ثوان" zero: "الآن" other: "دقائق {{ .Count }}" - id: toc - translation: "فهرس المحتوي" + translation: "فهرس المحتوى" - id: translations - translation: "ترجمات اخري" + translation: "ترجمات أخرى" - id: home translation: "الصفحة الرئيسية" From d3813138d7ceb03492bca66de450b79049758c88 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 22 Mar 2021 18:16:26 +0530 Subject: [PATCH 086/483] fix more reduced motion in search Results amend to 4b24a94 & e03348c --- assets/css/zmedia.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index 14133f0c..d69ee62d 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -69,4 +69,8 @@ #searchResults .focus { transform: none; } + + #searchResults li:active { + transform: none; + } } From f3cac6c09e02d9ac2836906368608a4955c1ef42 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Mon, 22 Mar 2021 18:21:07 +0530 Subject: [PATCH 087/483] Refactor media queries reduce code --- assets/css/zmedia.css | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/assets/css/zmedia.css b/assets/css/zmedia.css index d69ee62d..6f63a6df 100644 --- a/assets/css/zmedia.css +++ b/assets/css/zmedia.css @@ -40,36 +40,13 @@ } @media (prefers-reduced-motion) { - /* terms */ - .terms-tags a:active { - transform: none; - } - - /* profile-mode */ - .button:active { - transform: none; - } - - /* post-single */ - .share-buttons svg:active { - transform: none; - } - - /* post-entry */ - .post-entry:active { - transform: none; - } - - /* footer */ - .top-link { - transition: none; - } - - /* search */ - #searchResults .focus { - transform: none; - } - + /* terms; profile-mode; post-single; post-entry; post-entry; search; search */ + .terms-tags a:active, + .button:active, + .share-buttons svg:active, + .post-entry:active, + .top-link, + #searchResults .focus, #searchResults li:active { transform: none; } From abfdb54c92a26dcfaf876d2e06c1059ec9254694 Mon Sep 17 00:00:00 2001 From: Syphdias Date: Tue, 23 Mar 2021 10:28:26 +0100 Subject: [PATCH 088/483] Add option to show link in meta data for editing posts (#278) Usage - in site config => Params: editPost: URL: "https://github.com//content" Text: "Suggest Changes" # edit text appendFilePath: true # to append file path to Edit link - in front-matter vars => --- editPost: URL: "https://github.com//content" Text: "Suggest Changes" # edit text appendFilePath: true # to append file path to Edit link --- - Front-matter vars overrides global ones --- i18n/de.yaml | 3 +++ layouts/_default/single.html | 1 + layouts/partials/edit_post.html | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 layouts/partials/edit_post.html diff --git a/i18n/de.yaml b/i18n/de.yaml index 66412775..fcb53301 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -14,3 +14,6 @@ - id: translations translation: "Übersetzungen" + +- id: edit_post + translation: "Bearbeiten" diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 28689422..117ce7b0 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -16,6 +16,7 @@ {{- partial "post_meta.html" . -}} {{- partial "translation_list.html" . -}} + {{- partial "edit_post.html" . -}} {{- end}} diff --git a/layouts/partials/edit_post.html b/layouts/partials/edit_post.html new file mode 100644 index 00000000..21a33eb5 --- /dev/null +++ b/layouts/partials/edit_post.html @@ -0,0 +1,6 @@ +{{- if or .Params.editPost.URL .Site.Params.editPost.URL -}} +{{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) .IsTranslated }}| {{- end -}} + + {{- .Params.editPost.Text | default (.Site.Params.editPost.Text | default (i18n "edit_post" | default "Edit") ) -}} + +{{- end }} From 0ca760a9b323c42f39285d2c410e75419b3e18a0 Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Tue, 23 Mar 2021 15:10:40 +0530 Subject: [PATCH 089/483] add Description and Summary in JSON schema as in other templates --- layouts/partials/templates/schema_json.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/templates/schema_json.html b/layouts/partials/templates/schema_json.html index df5170b6..6e0a289c 100644 --- a/layouts/partials/templates/schema_json.html +++ b/layouts/partials/templates/schema_json.html @@ -62,7 +62,7 @@ "@type": "BlogPosting", "headline": {{ .Title | plainify}}, "name": "{{ .Title | plainify }}", - "description": {{ .Summary | plainify | truncate 180 | safeHTML }}, + "description": {{ with .Description | plainify }}{{ . }}{{ else }}{{ .Summary | plainify }}{{ end -}}, "keywords": [ {{- if .Params.keywords }} {{ range $i, $e := .Params.keywords }}{{ if $i }}, {{ end }}{{ $e }}{{ end }} From 772f5711614ae93d57358e55875f4b29ec5f74b6 Mon Sep 17 00:00:00 2001 From: Daniel Atwood Date: Tue, 23 Mar 2021 15:44:46 +0530 Subject: [PATCH 090/483] Update internal tempplate from hugo cp from ffd9dac4218b8f1709de04f7131ca661715fc481 & fe77f7434bc0d7a9b54af69014eb28dbea2b236b tpl: Update date logic of opengraph and schema internal templates * Fix: updated date logic in opengraph template * Updated date logic in schema template * Reformatted opengraph and schema * Wrapped PublishDate and Lastmod in with tpl: Make the build green again Co-authored-by: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Signed-off-by: Aditya Telange <21258296+adityatelange@users.noreply.github.com> --- layouts/partials/templates/opengraph.html | 53 ++++++++++------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/layouts/partials/templates/opengraph.html b/layouts/partials/templates/opengraph.html index c0a647df..9c2b8a59 100644 --- a/layouts/partials/templates/opengraph.html +++ b/layouts/partials/templates/opengraph.html @@ -9,57 +9,52 @@ {{- end}} {{- else }} -{{ with $.Params.images }}{{ range first 6 . -}} - -{{ end }}{{ else -}} + +{{- with $.Params.images -}} +{{- range first 6 . }}{{ end -}} +{{- else -}} {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} {{- with $featured -}} -{{ else -}} -{{- with $.Site.Params.images -}} - -{{ end }}{{ end }}{{ end }} +{{- else -}} +{{- with $.Site.Params.images }}{{ end -}} +{{- end -}} +{{- end -}} {{- end }} -{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} {{- if .IsPage }} -{{- if not .PublishDate.IsZero }} -{{ else if not .Date.IsZero }} -{{ end }} -{{- if not .Lastmod.IsZero }}{{ end }} -{{- else }} -{{- if not .Date.IsZero }} -{{- end }} -{{- end }}{{/* .IsPage */}} +{{- $iso8601 := "2006-01-02T15:04:05-07:00" -}} + +{{ with .PublishDate }}{{ end }} +{{ with .Lastmod }}{{ end }} + +{{- range .Site.Authors }} +{{ with .Social.facebook }}{{ end }} +{{ with .Site.Social.facebook }}{{ end }} +{{- with .Params.tags }}{{ range first 6 . }} + +{{- end }}{{ end -}} +{{- end -}} +{{- end -}} {{- with .Params.audio }}{{ end }} {{- with .Params.locale }}{{ end }} {{- with .Site.Params.title }}{{ end }} -{{- with .Params.videos }} -{{- range . }} +{{- with .Params.videos }}{{- range . }} {{ end }}{{ end }} {{- /* If it is part of a series, link to related articles */}} {{- $permalink := .Permalink }} -{{- $siteSeries := .Site.Taxonomies.series }}{{ with .Params.series }} -{{- range $name := . }} +{{- $siteSeries := .Site.Taxonomies.series }} +{{ with .Params.series }}{{- range $name := . }} {{- $series := index $siteSeries ($name | urlize) }} {{- range $page := first 6 $series.Pages }} {{- if ne $page.Permalink $permalink }}{{ end }} {{- end }} {{ end }}{{ end }} -{{- if .IsPage }} -{{- range .Site.Authors }}{{ with .Social.facebook }} -{{ end }}{{ with .Site.Social.facebook }} -{{ end }} - -{{- with .Params.tags }}{{ range first 6 . }} -{{ end }}{{ end }} -{{- end }}{{ end }} - {{- /* Facebook Page Admin ID for Domain Insights */}} {{- with .Site.Social.facebook_admin }}{{ end }} From a2b3be016947538ae60883db01a913865db38e0a Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 25 Mar 2021 10:55:11 +0530 Subject: [PATCH 091/483] Refactor noscript styles to not break with code formatter --- layouts/partials/header.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index f0e4bd03..23f25885 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -44,7 +44,10 @@ .top-link { display: none; } - {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + + + {{- if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark")) }} + + {{- end }} + From ddf004b709578a488a8c1c03478085460ba74cdd Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 25 Mar 2021 11:00:22 +0530 Subject: [PATCH 092/483] Allow disabling ScrollToTop button - refactor corresponding code usage => in site config: params: disableScrollToTop: true closes: #321 --- layouts/partials/footer.html | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 49e6061e..f818e85e 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -9,6 +9,7 @@ · Theme PaperMod +{{- if (not .Site.Params.disableScrollToTop) }} @@ -16,6 +17,7 @@ +{{- end }} {{- partial "extend_footer.html" . -}} {{- $isHLJSdisabled := (.Site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} {{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }} @@ -34,6 +36,11 @@ document.getElementById('menu').scrollLeft = localStorage.getItem("menu-scroll-position"); } } + + function menu_on_scroll() { + localStorage.setItem("menu-scroll-position", document.getElementById('menu').scrollLeft); + } + document.querySelectorAll('a[href^="#"]').forEach(anchor => { anchor.addEventListener("click", function (e) { e.preventDefault(); @@ -52,6 +59,11 @@ } }); }); + + + +{{- if (not .Site.Params.disableScrollToTop) }} + +{{- end }} + {{- if (not .Site.Params.disableThemeToggle) }} -{{- else}} +{{- else }} {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }} -{{- end}} {{- end }} +{{- end }} + -{{- else}} -{{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} +{{- else }} +{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }} -{{- end}} +{{- end }} {{- end -}} - - - - - - +{{- /* Favicons */}} + + + + + - -{{- hugo.Generator }} - -{{- range .AlternativeOutputFormats -}} + +{{- /* Generator */}} +{{ hugo.Generator }} + +{{- /* RSS */}} +{{ range .AlternativeOutputFormats -}} {{ end -}} {{- range .AllTranslations -}} - + {{ end }} {{- partial "extend_head.html" . -}} - + +{{- /* Misc */}} {{- if hugo.IsProduction | or (eq .Site.Params.env "production") }} {{- template "_internal/google_analytics_async.html" . }} {{- template "_internal/google_news.html" . }} {{- template "partials/templates/opengraph.html" . }} {{- template "partials/templates/twitter_cards.html" . }} {{- template "partials/templates/schema_json.html" . }} -{{- end }} +{{- end -}} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8fa2dbe9..52d470f2 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,6 +1,6 @@ -{{- /* theme-toggle is enabled */}} +{{- /* theme-toggle is enabled */}} {{- if (not .Site.Params.disableThemeToggle) }} -{{- /* theme is light */}} +{{- /* theme is light */}} {{- if (eq .Site.Params.defaultTheme "light") }} -{{- /* theme is dark */}} +{{- /* theme is dark */}} {{- else if (eq .Site.Params.defaultTheme "dark") }} {{- else }} -{{- /* theme is auto */}} +{{- /* theme is auto */}} {{- end }} -{{- /* theme-toggle is disabled and theme is auto */}} +{{- /* theme-toggle is disabled and theme is auto */}} {{- else if (and (ne .Site.Params.defaultTheme "light") (ne .Site.Params.defaultTheme "dark"))}} -{{ end }}{{/* .IsPage end */}} +{{- end }}{{/* .IsPage end */}} -{{ end }} +{{- end -}} diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index 4d47b2f4..89b2b7c6 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -7,7 +7,7 @@ {{- $headers := findRE "(.|\n])+?" .Content -}} {{- $has_headers := ge (len $headers) 1 -}} {{- if $has_headers -}} - + {{- $largest := 6 -}} {{- range $headers -}} {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}} @@ -16,9 +16,9 @@ {{- $largest = $headerLevel -}} {{- end -}} {{- end -}} - + {{- $firstHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers 0) 1) 0)) -}} - + {{- $.Scratch.Set "bareul" slice -}} {{- range seq (sub $firstHeaderLevel $largest) -}} @@ -28,14 +28,14 @@ {{- range $i, $header := $headers -}} {{- $headerLevel := index (findRE "[1-6]" . 1) 0 -}} {{- $headerLevel := len (seq $headerLevel) -}} - + {{/* get id="xyz" */}} {{- $id := index (findRE "(id=\"(.*?)\")" $header 9) 0 }} - + {{- /* strip id="" to leave xyz, no way to get regex capturing groups in hugo */ -}} {{- $cleanedID := replace (replace $id "id=\"" "") "\"" "" }} {{- $header := replaceRE "((.|\n])+?)" "$1" $header -}} - + {{- if ne $i 0 -}} {{- $prevHeaderLevel := index (findRE "[1-6]" (index $headers (sub $i 1)) 1) 0 -}} {{- $prevHeaderLevel := len (seq $prevHeaderLevel) -}} @@ -66,28 +66,28 @@ {{- end -}} {{- end -}} {{- end -}} - {{- end -}} + {{- end }} {{- $header | safeHTML -}} - {{- else -}} + {{- else }} {{- $header | safeHTML -}} {{- end -}} {{- end -}} {{- $firstHeaderLevel := $largest }} - {{- $lastHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers (sub (len $headers) 1)) 1) 0)) -}} + {{- $lastHeaderLevel := len (seq (index (findRE "[1-6]" (index $headers (sub (len $headers) 1)) 1) 0)) }} {{- range seq (sub $lastHeaderLevel $firstHeaderLevel) -}} - {{- if in ($.Scratch.Get "bareul") (add . $firstHeaderLevel) -}} + {{- if in ($.Scratch.Get "bareul") (add . $firstHeaderLevel) }} - {{- else -}} + {{- else }} {{- end -}} - {{- end -}} + {{- end }} - {{- end -}} + {{- end }}
+ 
+