".concat(external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.FILE_ERROR_UPLOAD, " {{fileName}}
\n").concat(response.message, "") + }); + } + }, { + key: "onDropzoneComplete", + value: function onDropzoneComplete(file) { + if (!file.accepted && !file.rejected) { + var data = { + status: 'error', + message: "".concat(external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.FILE_UNSUPPORTED, ": ").concat(file.name.match(/\..+/).join('')) + }; + return this.handleError({ + file: file, + data: data, + mode: 'removeFile', + msg: "
".concat(external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.FILE_ERROR_ADD, " {{fileName}}
\n").concat(data.message, "") + }); + } + + if (this.options.reloadPage) { + __webpack_require__.g.location.reload(); + } + } + }, { + key: "b64_to_utf8", + value: function b64_to_utf8(str) { + str = str.replace(/\s/g, ''); + return decodeURIComponent(escape(window.atob(str))); + } + }, { + key: "onDropzoneAddedFile", + value: function onDropzoneAddedFile(file) { + return this.dropzone.options.addedfile(file); + } + }, { + key: "onDropzoneRemovedFile", + value: function onDropzoneRemovedFile(file) { + var _this5 = this; + + if (!file.accepted || file.rejected) { + return; + } + + var url = file.removeUrl || this.urls["delete"] || this.options.url; + var path = (url || '').match(/path:(.*)\//); + var body = { + filename: file.name, + uri: this.getURI() + }; + + if (file.sessionParams) { + body.task = 'filessessionremove'; + body.session = file.sessionParams; + } + + var customPost = this.container.data('filePostRemove') || {}; + + if (Object.keys(customPost).length) { + body = {}; + Object.keys(customPost).forEach(function (key) { + body[key] = customPost[key]; + }); + } + + body['filename'] = file.name; + body['admin-nonce'] = external_GravAdmin_namespaceObject.config.admin_nonce; + utils_request(url, { + method: 'post', + body: body + }, function () { + if (!path) { + return; + } + + path = _this5.b64_to_utf8(path[1]); + + var input = _this5.container.find('[name][type="hidden"]'); + + var data = JSON.parse(input.val() || '{}'); + delete data[path]; + input.val(JSON.stringify(data)); + }); + } + }, { + key: "onDropzoneError", + value: function onDropzoneError(file, response, xhr) { + var message = xhr ? response.error.message : response; + external_jQuery_default()(file.previewElement).find('[data-dz-errormessage]').html(message); + return this.handleError({ + file: file, + data: { + status: 'error' + }, + msg: "
".concat(message, "") + }); + } + }, { + key: "handleError", + value: function handleError(options) { + var file = options.file, + data = options.data, + mode = options.mode, + msg = options.msg; + + if (data.status !== 'error' && data.status !== 'unauthorized') { + return; + } + + switch (mode) { + case 'addBack': + if (file instanceof File) { + this.dropzone.addFile.call(this.dropzone, file); + } else { + this.dropzone.files.push(file); + this.dropzone.options.addedfile.call(this.dropzone, file); + this.dropzone.options.thumbnail.call(this.dropzone, file, file.extras.url); + } + + break; + + case 'removeFile': + default: + if (~this.dropzone.files.indexOf(file)) { + file.rejected = true; + this.dropzone.removeFile.call(this.dropzone, file, { + silent: true + }); + } + + break; + } + + var modal = external_jQuery_default()('[data-remodal-id="generic"]'); + var cleanName = file.name.replace('<', '<').replace('>', '>'); + modal.find('.error-content').html(msg.replace('{{fileName}}', cleanName)); + (external_jQuery_default()).remodal.lookup[modal.data('remodal')].open(); + } + }]); + + return FilesField; +}(); + + +function UriToMarkdown(uri) { + uri = uri.replace(/@3x|@2x|@1x/, ''); + uri = uri.replace(/\(/g, '%28'); + uri = uri.replace(/\)/g, '%29'); + var title = uri.split('.').slice(0, -1).join('.'); + return uri.match(/\.(jpe?g|png|gif|svg|webp|mp4|webm|ogv|mov)$/i) ? "![".concat(title, "](").concat(uri, " \"").concat(title, "\")") : "[".concat(decodeURI(uri), "](").concat(uri, ")"); +} +var instances = []; +var cache = external_jQuery_default()(); + +var onAddedNodes = function onAddedNodes(event, target +/* , record, instance */ +) { + var files = external_jQuery_default()(target).find('.dropzone.files-upload'); + + if (!files.length) { + return; + } + + files.each(function (index, file) { + file = external_jQuery_default()(file); + + if (!~cache.index(file)) { + addNode(file); + } + }); +}; + +var addNode = function addNode(container) { + container = external_jQuery_default()(container); + var input = container.find('input[type="file"]'); + var settings = container.data('grav-file-settings') || {}; + + if (settings.accept && ~settings.accept.indexOf('*')) { + settings.accept = ['']; + } + + var options = { + url: container.data('file-url-add') || (container.closest('form').attr('action') || external_GravAdmin_namespaceObject.config.current_url) + '.json', + paramName: settings.paramName || 'file', + dotNotation: settings.name || 'file', + acceptedFiles: settings.accept ? settings.accept.join(',') : input.attr('accept') || container.data('media-types'), + maxFilesize: typeof settings.filesize !== 'undefined' ? settings.filesize : 256, + maxFiles: settings.limit || null, + resizeWidth: settings.resizeWidth || null, + resizeHeight: settings.resizeHeight || null, + resizeQuality: settings.resizeQuality || null, + resolution: settings.resolution || null, + accept: function accept(file, done) { + ACCEPT_FUNC(file, done, settings); + } + }; + cache = cache.add(container); + container = container[0]; + instances.push(new FilesField({ + container: container, + options: options + })); +}; + +var Instance = function () { + external_jQuery_default()('.dropzone.files-upload').each(function (i, container) { + return addNode(container); + }); + external_jQuery_default()('body').on('mutation._grav', onAddedNodes); + return instances; +}(); // EXTERNAL MODULE: ./node_modules/events/events.js var events = __webpack_require__(17187); var events_default = /*#__PURE__*/__webpack_require__.n(events); ;// CONCATENATED MODULE: ./app/utils/gpm.js function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); } -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } +function gpm_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 gpm_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); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; } +function gpm_createClass(Constructor, protoProps, staticProps) { if (protoProps) gpm_defineProperties(Constructor.prototype, protoProps); if (staticProps) gpm_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; } 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 } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); } @@ -887,7 +1390,7 @@ var GPM = /*#__PURE__*/function (_EventEmitter) { var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'getUpdates'; - _classCallCheck(this, GPM); + gpm_classCallCheck(this, GPM); _this = _super.call(this); _this.payload = {}; @@ -896,7 +1399,7 @@ var GPM = /*#__PURE__*/function (_EventEmitter) { return _this; } - _createClass(GPM, [{ + gpm_createClass(GPM, [{ key: "setPayload", value: function setPayload() { var payload = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; @@ -966,7 +1469,7 @@ var GPM = /*#__PURE__*/function (_EventEmitter) { }((events_default())); -var Instance = new GPM(); +var gpm_Instance = new GPM(); ;// CONCATENATED MODULE: ./app/utils/keepalive.js function keepalive_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -1032,48 +1535,6 @@ var KeepAlive = /*#__PURE__*/function () { // EXTERNAL MODULE: ./node_modules/mout/array/unique.js var unique = __webpack_require__(79863); var unique_default = /*#__PURE__*/__webpack_require__.n(unique); -;// CONCATENATED MODULE: ./app/utils/request.js - - -var raw; - -var request = function request(url) { - var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; - var callback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () { - return true; - }; - - if (typeof options === 'function') { - callback = options; - options = {}; - } - - if (options.method && options.method === 'post') { - var data = new FormData(); - options.body = Object.assign({ - 'admin-nonce': external_GravAdmin_namespaceObject.config.admin_nonce - }, options.body || {}); - Object.keys(options.body).map(function (key) { - return data.append(key, options.body[key]); - }); - options.body = data; - } - - options = Object.assign({ - credentials: 'same-origin', - headers: { - 'Accept': 'application/json' - } - }, options); - return fetch(url, options).then(function (response) { - raw = response; - return response; - }).then(parseStatus).then(parseJSON).then(userFeedback).then(function (response) { - return callback(response, raw); - })["catch"](userFeedbackError); -}; - -/* harmony default export */ const utils_request = (request); ;// CONCATENATED MODULE: ./app/updates/notifications.js function notifications_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -1378,7 +1839,7 @@ external_jQuery_default()(document).on('click', '[data-refresh="feed"]', functio external_jQuery_default()('[data-gpm-checkupdates]').on('click', function () { var element = external_jQuery_default()(this); element.find('i').addClass('fa-spin'); - Instance.fetch(function (response) { + gpm_Instance.fetch(function (response) { element.find('i').removeClass('fa-spin'); var payload = response.payload; @@ -1492,7 +1953,7 @@ var Updates = /*#__PURE__*/function () { var _this = this; var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false; - Instance.fetch(function (response) { + gpm_Instance.fetch(function (response) { return _this.setPayload(response); }, force); return this; @@ -1639,13 +2100,13 @@ var Updates = /*#__PURE__*/function () { var updates_Instance = new Updates(); // automatically refresh UI for updates (graph, sidebar, plugin/themes pages) after every fetch -Instance.on('fetched', function (response, raw) { +gpm_Instance.on('fetched', function (response, raw) { updates_Instance.setPayload(response.payload || {}); updates_Instance.grav().resources(); }); if (external_GravAdmin_namespaceObject.config.enable_auto_updates_check === '1') { - Instance.fetch(); + gpm_Instance.fetch(); } // EXTERNAL MODULE: ./node_modules/chartist/dist/chartist.js var chartist = __webpack_require__(69259); @@ -1792,7 +2253,7 @@ var UpdatesChart = /*#__PURE__*/function (_Chart) { return _this2.draw(data); }); - Instance.on('fetched', function (response) { + gpm_Instance.on('fetched', function (response) { if (!response.payload) { return; } @@ -2803,467 +3264,6 @@ var factory = function factory(window) { __webpack_require__.g.Cookies = __webpack_require__.g && cookies_typeof(__webpack_require__.g.document) === 'object' ? factory(__webpack_require__.g) : factory; /* harmony default export */ const cookies = (__webpack_require__.g.Cookies); -// EXTERNAL MODULE: ./node_modules/dropzone/dist/dropzone.js -var dist_dropzone = __webpack_require__(32025); -var dropzone_default = /*#__PURE__*/__webpack_require__.n(dist_dropzone); -;// CONCATENATED MODULE: ./app/forms/fields/files.js -function files_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function files_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 files_createClass(Constructor, protoProps, staticProps) { if (protoProps) files_defineProperties(Constructor.prototype, protoProps); if (staticProps) files_defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; } - - - // import EXIF from 'exif-js'; - - - // translations - -var Dictionary = { - dictCancelUpload: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_CANCEL_UPLOAD, - dictCancelUploadConfirmation: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_CANCEL_UPLOAD_CONFIRMATION, - dictDefaultMessage: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_DEFAULT_MESSAGE, - dictFallbackMessage: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_FALLBACK_MESSAGE, - dictFallbackText: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_FALLBACK_TEXT, - dictFileTooBig: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_FILE_TOO_BIG, - dictInvalidFileType: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_INVALID_FILE_TYPE, - dictMaxFilesExceeded: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_MAX_FILES_EXCEEDED, - dictRemoveFile: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_REMOVE_FILE, - dictResponseError: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROPZONE_RESPONSE_ERROR -}; -(dropzone_default()).autoDiscover = false; -(dropzone_default()).options.gravPageDropzone = {}; - -(dropzone_default()).confirm = function (question, accepted, rejected) { - var doc = external_jQuery_default()(document); - var modalSelector = '[data-remodal-id="delete-media"]'; - - var removeEvents = function removeEvents() { - doc.off('confirmation', modalSelector, accept); - doc.off('cancellation', modalSelector, reject); - external_jQuery_default()(modalSelector).find('.remodal-confirm').removeClass('pointer-events-disabled'); - }; - - var accept = function accept() { - accepted && accepted(); - removeEvents(); - }; - - var reject = function reject() { - rejected && rejected(); - removeEvents(); - }; - - (external_jQuery_default()).remodal.lookup[external_jQuery_default()(modalSelector).data('remodal')].open(); - doc.on('confirmation', modalSelector, accept); - doc.on('cancellation', modalSelector, reject); -}; - -var DropzoneMediaConfig = { - timeout: 0, - thumbnailWidth: 200, - thumbnailHeight: 150, - addRemoveLinks: false, - dictDefaultMessage: external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.DROP_FILES_HERE_TO_UPLOAD.replace(/</g, '<').replace(/>/g, '>'), - dictRemoveFileConfirmation: '[placeholder]', - previewTemplate: "\n
".concat(external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.FILE_ERROR_UPLOAD, " {{fileName}}
\n").concat(response.message, "") - }); - } - }, { - key: "onDropzoneComplete", - value: function onDropzoneComplete(file) { - if (!file.accepted && !file.rejected) { - var data = { - status: 'error', - message: "".concat(external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.FILE_UNSUPPORTED, ": ").concat(file.name.match(/\..+/).join('')) - }; - return this.handleError({ - file: file, - data: data, - mode: 'removeFile', - msg: "
".concat(external_GravAdmin_namespaceObject.translations.PLUGIN_ADMIN.FILE_ERROR_ADD, " {{fileName}}
\n").concat(data.message, "") - }); - } - - if (this.options.reloadPage) { - __webpack_require__.g.location.reload(); - } - } - }, { - key: "b64_to_utf8", - value: function b64_to_utf8(str) { - str = str.replace(/\s/g, ''); - return decodeURIComponent(escape(window.atob(str))); - } - }, { - key: "onDropzoneAddedFile", - value: function onDropzoneAddedFile(file) { - return this.dropzone.options.addedfile(file); - } - }, { - key: "onDropzoneRemovedFile", - value: function onDropzoneRemovedFile(file) { - var _this5 = this; - - if (!file.accepted || file.rejected) { - return; - } - - var url = file.removeUrl || this.urls["delete"] || this.options.url; - var path = (url || '').match(/path:(.*)\//); - var body = { - filename: file.name, - uri: this.getURI() - }; - - if (file.sessionParams) { - body.task = 'filessessionremove'; - body.session = file.sessionParams; - } - - var customPost = this.container.data('filePostRemove') || {}; - - if (Object.keys(customPost).length) { - body = {}; - Object.keys(customPost).forEach(function (key) { - body[key] = customPost[key]; - }); - } - - body['filename'] = file.name; - body['admin-nonce'] = external_GravAdmin_namespaceObject.config.admin_nonce; - utils_request(url, { - method: 'post', - body: body - }, function () { - if (!path) { - return; - } - - path = _this5.b64_to_utf8(path[1]); - - var input = _this5.container.find('[name][type="hidden"]'); - - var data = JSON.parse(input.val() || '{}'); - delete data[path]; - input.val(JSON.stringify(data)); - }); - } - }, { - key: "onDropzoneError", - value: function onDropzoneError(file, response, xhr) { - var message = xhr ? response.error.message : response; - external_jQuery_default()(file.previewElement).find('[data-dz-errormessage]').html(message); - return this.handleError({ - file: file, - data: { - status: 'error' - }, - msg: "
".concat(message, "") - }); - } - }, { - key: "handleError", - value: function handleError(options) { - var file = options.file, - data = options.data, - mode = options.mode, - msg = options.msg; - - if (data.status !== 'error' && data.status !== 'unauthorized') { - return; - } - - switch (mode) { - case 'addBack': - if (file instanceof File) { - this.dropzone.addFile.call(this.dropzone, file); - } else { - this.dropzone.files.push(file); - this.dropzone.options.addedfile.call(this.dropzone, file); - this.dropzone.options.thumbnail.call(this.dropzone, file, file.extras.url); - } - - break; - - case 'removeFile': - default: - if (~this.dropzone.files.indexOf(file)) { - file.rejected = true; - this.dropzone.removeFile.call(this.dropzone, file, { - silent: true - }); - } - - break; - } - - var modal = external_jQuery_default()('[data-remodal-id="generic"]'); - var cleanName = file.name.replace('<', '<').replace('>', '>'); - modal.find('.error-content').html(msg.replace('{{fileName}}', cleanName)); - (external_jQuery_default()).remodal.lookup[modal.data('remodal')].open(); - } - }]); - - return FilesField; -}(); - - -function UriToMarkdown(uri) { - uri = uri.replace(/@3x|@2x|@1x/, ''); - uri = uri.replace(/\(/g, '%28'); - uri = uri.replace(/\)/g, '%29'); - var title = uri.split('.').slice(0, -1).join('.'); - return uri.match(/\.(jpe?g|png|gif|svg|webp|mp4|webm|ogv|mov)$/i) ? "![".concat(title, "](").concat(uri, " \"").concat(title, "\")") : "[".concat(decodeURI(uri), "](").concat(uri, ")"); -} -var instances = []; -var cache = external_jQuery_default()(); - -var onAddedNodes = function onAddedNodes(event, target -/* , record, instance */ -) { - var files = external_jQuery_default()(target).find('.dropzone.files-upload'); - - if (!files.length) { - return; - } - - files.each(function (index, file) { - file = external_jQuery_default()(file); - - if (!~cache.index(file)) { - addNode(file); - } - }); -}; - -var addNode = function addNode(container) { - container = external_jQuery_default()(container); - var input = container.find('input[type="file"]'); - var settings = container.data('grav-file-settings') || {}; - - if (settings.accept && ~settings.accept.indexOf('*')) { - settings.accept = ['']; - } - - var options = { - url: container.data('file-url-add') || (container.closest('form').attr('action') || external_GravAdmin_namespaceObject.config.current_url) + '.json', - paramName: settings.paramName || 'file', - dotNotation: settings.name || 'file', - acceptedFiles: settings.accept ? settings.accept.join(',') : input.attr('accept') || container.data('media-types'), - maxFilesize: typeof settings.filesize !== 'undefined' ? settings.filesize : 256, - maxFiles: settings.limit || null, - resizeWidth: settings.resizeWidth || null, - resizeHeight: settings.resizeHeight || null, - resizeQuality: settings.resizeQuality || null, - resolution: settings.resolution || null, - accept: function accept(file, done) { - ACCEPT_FUNC(file, done, settings); - } - }; - cache = cache.add(container); - container = container[0]; - instances.push(new FilesField({ - container: container, - options: options - })); -}; - -var files_Instance = function () { - external_jQuery_default()('.dropzone.files-upload').each(function (i, container) { - return addNode(container); - }); - external_jQuery_default()('body').on('mutation._grav', onAddedNodes); - return instances; -}(); ;// CONCATENATED MODULE: ./app/forms/fields/editor/buttons.js @@ -4404,7 +4404,7 @@ var PageMedia = /*#__PURE__*/function (_FilesField) { if (status.width) { var input = this.container.closest('.pagemedia-field').find('.media-resizer'); - updateMediaSizes(input, status.width, false); + updateMediaSizes(input[0], status.width, false); } } }, { @@ -4510,9 +4510,10 @@ var PageMedia = /*#__PURE__*/function (_FilesField) { var updateMediaSizes = function updateMediaSizes(input, width) { var store = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true; - var status = JSON.parse(cookies.get('grav-admin-pagemedia') || '{}'); + var storageLocation = input.dataset.storageLocation || 'grav-admin-pagemedia'; + var status = JSON.parse(cookies.get(storageLocation) || '{}'); var height = 150 * width / 200; - var media = input.closest('.pagemedia-field').find('.dz-details, [data-dz-thumbnail]'); + var media = external_jQuery_default()(input).closest('.pagemedia-field').find('.dz-details, [data-dz-thumbnail]'); media.css({ width: width, height: height @@ -4522,14 +4523,15 @@ var updateMediaSizes = function updateMediaSizes(input, width) { var data = Object.assign({}, status, { width: width }); - cookies.set('grav-admin-pagemedia', JSON.stringify(data), { + cookies.set(storageLocation, JSON.stringify(data), { expires: Infinity }); } }; var updateMediaCollapseStatus = function updateMediaCollapseStatus(element) { var store = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; - var status = JSON.parse(cookies.get('grav-admin-pagemedia') || '{}'); + var storageLocation = element.dataset.storageLocation || 'grav-admin-pagemedia'; + var status = JSON.parse(cookies.get(storageLocation) || '{}'); element = external_jQuery_default()(element); var icon = element.find('i.fa'); var container = element.closest('.pagemedia-field'); @@ -4545,7 +4547,7 @@ var updateMediaCollapseStatus = function updateMediaCollapseStatus(element) { var data = Object.assign({}, status, { collapsed: collapsed }); - cookies.set('grav-admin-pagemedia', JSON.stringify(data), { + cookies.set(storageLocation, JSON.stringify(data), { expires: Infinity }); } @@ -4553,20 +4555,20 @@ var updateMediaCollapseStatus = function updateMediaCollapseStatus(element) { external_jQuery_default()(document).on('input', '.media-resizer', function (event) { var target = external_jQuery_default()(event.currentTarget); var width = target.val(); - updateMediaSizes(target, width); + updateMediaSizes(event.currentTarget, width); }); external_jQuery_default()(document).on('click', '.media-collapser', function (event) { updateMediaCollapseStatus(event.currentTarget); }); external_jQuery_default()(document).ready(function () { - var status = JSON.parse(cookies.get('grav-admin-pagemedia') || '{}'); + external_jQuery_default()('.media-resizer').each(function (index, input) { + var storageLocation = input.dataset.storageLocation || 'grav-admin-pagemedia'; + var status = JSON.parse(cookies.get(storageLocation) || '{}'); - if (status.width) { - external_jQuery_default()('.media-resizer').each(function (index, input) { - input = external_jQuery_default()(input); + if (status.width) { updateMediaSizes(input, status.width, false); - }); - } + } + }); }); var media_Instance = new PageMedia(); ;// CONCATENATED MODULE: ./app/pages/page/multilang.js @@ -5869,7 +5871,7 @@ var CollectionsField = /*#__PURE__*/function () { var hasCustomKey = observed.length; var currentKey = item.data('collection-key-backup'); item.attr('data-collection-key', hasCustomKey ? observedValue : index); - ['name', 'data-grav-field-name', 'for', 'id', 'data-grav-file-settings', 'data-file-post-add', 'data-file-post-remove', 'data-grav-array-name'].forEach(function (prop) { + ['name', 'data-grav-field-name', 'for', 'id', 'data-grav-file-settings', 'data-file-post-add', 'data-file-post-remove', 'data-grav-array-name', 'data-grav-elements'].forEach(function (prop) { item.find('[' + prop + '], [_' + prop + ']').each(function () { var element = external_jQuery_default()(this); var indexes = []; @@ -9695,6 +9697,7 @@ external_jQuery_default()(document).on('change', '[data-grav-elements] select', external_jQuery_default()("[id^=\"".concat(id, "_\"]")).css('display', 'none'); external_jQuery_default()("[id=\"".concat(id, "__").concat(value, "\"]")).css('display', 'inherit'); }); +external_jQuery_default()('[data-grav-elements] select').trigger('change'); ;// CONCATENATED MODULE: ./app/forms/fields/index.js @@ -9748,7 +9751,7 @@ external_jQuery_default()(document).on('change', '[data-grav-elements] select', }, FilesField: { FilesField: FilesField, - Instance: files_Instance + Instance: Instance }, FolderField: { Regenerate: fields_folder @@ -10116,7 +10119,7 @@ var Packages = /*#__PURE__*/function () { var current_version = ''; var available_version = ''; var _name = ''; - var resources = Instance.payload.payload.resources; + var resources = gpm_Instance.payload.payload.resources; if (resources.plugins[slug]) { available_version = resources.plugins[slug].available; @@ -10311,7 +10314,7 @@ var Packages = /*#__PURE__*/function () { var current_version = ''; var available_version = ''; var _name2 = ''; - var resources = Instance.payload.payload.resources; + var resources = gpm_Instance.payload.payload.resources; if (resources.plugins[slug]) { available_version = resources.plugins[slug].available; @@ -11796,6 +11799,7 @@ var sidebar_Instance = new Sidebar(); + // bootstrap jQuery extensions @@ -11820,7 +11824,7 @@ external_jQuery_default()(__webpack_require__.g).on('sidebar_state._grav', funct /* harmony default export */ const main = ({ GPM: { GPM: GPM, - Instance: Instance + Instance: gpm_Instance }, KeepAlive: keepalive, Dashboard: dashboard, @@ -11851,7 +11855,8 @@ external_jQuery_default()(__webpack_require__.g).on('sidebar_state._grav', funct Utils: { request: utils_request, toastr: utils_toastr, - Cookies: cookies + Cookies: cookies, + UriToMarkdown: UriToMarkdown } }); diff --git a/plugins/admin/themes/grav/js/vendor.min.js b/plugins/admin/themes/grav/js/vendor.min.js index cb7a17a..686e532 100644 --- a/plugins/admin/themes/grav/js/vendor.min.js +++ b/plugins/admin/themes/grav/js/vendor.min.js @@ -4599,7 +4599,7 @@ return Chartist; // If we're not in Markdown mode, fall back to normal newlineAndIndent var eolState = cm.getStateAfter(pos.line); var inner = CodeMirror.innerMode(cm.getMode(), eolState); - if (inner.mode.name !== "markdown") { + if (inner.mode.name !== "markdown" && inner.mode.helperType !== "markdown") { cm.execCommand("newlineAndIndent"); return; } else { @@ -15331,7 +15331,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) { addLegacyProps(CodeMirror); - CodeMirror.version = "5.65.1"; + CodeMirror.version = "5.65.2"; return CodeMirror; @@ -15840,6 +15840,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) { stream.eatWhile(/[\w\$_]/); return "meta"; + }, + '"': function(stream, state) { + if (!stream.match('""\n')) return false; + state.tokenize = tokenTripleString; + return state.tokenize(stream, state); } }, modeProps: {fold: ["brace", "import"]} @@ -17334,7 +17339,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) { } function getTagRegexp(tagName, anchored) { - return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i"); + return new RegExp((anchored ? "^" : "") + "<\/\\s*" + tagName + "\\s*>", "i"); } function addTags(from, to) { diff --git a/plugins/admin/themes/grav/scss/preset.scss b/plugins/admin/themes/grav/scss/preset.scss index dbf5ba0..2ea1bf9 100644 --- a/plugins/admin/themes/grav/scss/preset.scss +++ b/plugins/admin/themes/grav/scss/preset.scss @@ -2366,3 +2366,7 @@ body .bootstrap-datetimepicker-widget { .jqCron-container.disable .jqCron-selector-title { background: $content-bg !important; } + +.hint-icon { + color: $notice_bg; +} diff --git a/plugins/admin/themes/grav/scss/template/_admin.scss b/plugins/admin/themes/grav/scss/template/_admin.scss index afe9701..4853c70 100644 --- a/plugins/admin/themes/grav/scss/template/_admin.scss +++ b/plugins/admin/themes/grav/scss/template/_admin.scss @@ -1114,7 +1114,7 @@ body.sidebar-quickopen #admin-main { linep-height: 1.2; } - .gravatar { + .avatar { font-size: 0.9rem; padding: 0; } @@ -1220,6 +1220,13 @@ body.sidebar-quickopen #admin-main { } } +// Gumroad +.gumroad { + .cart-button { + display: none !important; + } +} + // Config Side Tabs @include breakpoint(mobile-only) { #admin-main .config-wrapper-system .form-tabs.side-tabs { diff --git a/plugins/admin/themes/grav/scss/template/_buttons.scss b/plugins/admin/themes/grav/scss/template/_buttons.scss index be89c22..897502d 100644 --- a/plugins/admin/themes/grav/scss/template/_buttons.scss +++ b/plugins/admin/themes/grav/scss/template/_buttons.scss @@ -124,8 +124,17 @@ font-family: inherit !important; border-radius: 4px !important; box-shadow: inherit !important; + border-color: transparent !important; + + &:hover { + transform: inherit; + } .gumroad-button-logo { display: none !important; background-image: none !important; } + .logo-full { + display: none; + } + } diff --git a/plugins/admin/themes/grav/scss/template/_forms.scss b/plugins/admin/themes/grav/scss/template/_forms.scss index 36a20aa..a798527 100644 --- a/plugins/admin/themes/grav/scss/template/_forms.scss +++ b/plugins/admin/themes/grav/scss/template/_forms.scss @@ -164,6 +164,14 @@ form { display: inline; } + .hint-icon { + opacity: 0.7; + transition: 0.5s opacity; + } + &:hover .hint-icon { + opacity: 1.0; + } + &.inline { display: inline; vertical-align: middle; @@ -484,7 +492,6 @@ form { position: relative; padding: 0 0 0 2rem; margin-right: 15px; - } label:before { content:""; diff --git a/plugins/admin/themes/grav/templates/forms/field.html.twig b/plugins/admin/themes/grav/templates/forms/field.html.twig index e6c16b2..25a793c 100644 --- a/plugins/admin/themes/grav/templates/forms/field.html.twig +++ b/plugins/admin/themes/grav/templates/forms/field.html.twig @@ -4,7 +4,7 @@ {% set default = field.default %} {% set toggleable = field.toggleable ?? false %} {% if toggleable %} - {% set originalValue = originalValue is defined ? originalValue : value %} + {% set originalValue = originalValue ?? value %} {% set toggleableChecked = originalValue is not null %} {% endif %} @@ -48,7 +48,7 @@ {% if field.markdown %} {{ field.label|t|markdown(false)|raw }} {% else %} - {{ field.label|t|raw }} + {{ field.label|t|raw }} {% endif %} {% else %} {% if field.markdown %} diff --git a/plugins/admin/themes/grav/templates/forms/fields/colorpicker/colorpicker.html.twig b/plugins/admin/themes/grav/templates/forms/fields/colorpicker/colorpicker.html.twig index 163d355..e6bcf30 100644 --- a/plugins/admin/themes/grav/templates/forms/fields/colorpicker/colorpicker.html.twig +++ b/plugins/admin/themes/grav/templates/forms/fields/colorpicker/colorpicker.html.twig @@ -1,6 +1,5 @@ {% extends "forms/field.html.twig" %} -{% set originalValue = originalValue is defined ? originalValue : value %} -{% set value = (value is null ? field.default : value) %} + {% set pattern = '^#([a-fA-F0-9]{6})|(rgba\\(\\s*(0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])\\s*,\\s*(0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])\\s*,\\s*(0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])\\s*,\\s*((0.[0-9]+)|(1.00)|1.0|1)\\s*\\))$' %} {% block input %} diff --git a/plugins/admin/themes/grav/templates/forms/fields/colorscheme/colorscheme.html.twig b/plugins/admin/themes/grav/templates/forms/fields/colorscheme/colorscheme.html.twig index e0276ae..be1084b 100644 --- a/plugins/admin/themes/grav/templates/forms/fields/colorscheme/colorscheme.html.twig +++ b/plugins/admin/themes/grav/templates/forms/fields/colorscheme/colorscheme.html.twig @@ -1,8 +1,5 @@ {% extends "forms/field.html.twig" %} -{% set originalValue = value %} -{% set value = (value is null ? field.default : value) %} - {% block input %}
' ~ field.t ~ '
')|raw }} + {{ field.markdown ? field.text|t|markdown : ('' ~ field.text|t ~ '
')|raw }} {% endif %} {% if field.fields %} @@ -70,10 +70,7 @@ {% endif %} {% set field_templates = include_form_field(child.type, field_layout, default_layout) %} - {% if default_layout != 'key' %} - {% set originalValue = child_value %} - {% endif %} - {% include field_templates with { field: child, value: child_value } %} + {% include field_templates with { field: child, value: child_value, originalValue: null } %} {% endif %} {% endfor %} {% endif %} diff --git a/plugins/admin/themes/grav/templates/forms/fields/iconpicker/iconpicker.html.twig b/plugins/admin/themes/grav/templates/forms/fields/iconpicker/iconpicker.html.twig index 08d3c2f..03541f8 100644 --- a/plugins/admin/themes/grav/templates/forms/fields/iconpicker/iconpicker.html.twig +++ b/plugins/admin/themes/grav/templates/forms/fields/iconpicker/iconpicker.html.twig @@ -1,6 +1,4 @@ {% extends "forms/field.html.twig" %} -{% set originalValue = originalValue is defined ? originalValue : value %} -{% set value = (value is null ? field.default : value) %} {% block global_attributes %} data-grav-iconpicker diff --git a/plugins/admin/themes/grav/templates/forms/fields/list/list.html.twig b/plugins/admin/themes/grav/templates/forms/fields/list/list.html.twig index 71c722e..66aed31 100644 --- a/plugins/admin/themes/grav/templates/forms/fields/list/list.html.twig +++ b/plugins/admin/themes/grav/templates/forms/fields/list/list.html.twig @@ -90,17 +90,20 @@ {% set child_value = val %} {% else %} {% set child_value = form ? form.value(child.name) : data.value(child.name) %} + {# Look for a default value for that field #} + {% if child_value is null and val[child_name|trim('.', 'left')] is defined %} + {% set child_value = val[child_name|trim('.', 'left')] %} + {% endif %} {% endif %} {% set field_templates = include_form_field(child.type, field_layout, default_layout) %} - {% set template_data = { field: child, value: child_value } %} + {% set template_data = { field: child, value: child_value, originalValue: null } %} {% if default_layout != 'key' %} - {% set originalValue = child_value %} {% if child.type == 'fieldset' %} {% set template_data = template_data|merge({val: child_value}) %} {% endif %} {% endif %} - + {%- include field_templates with template_data -%} {% endif %} {% endfor %} diff --git a/plugins/admin/themes/grav/templates/forms/fields/mediapicker/mediapicker.html.twig b/plugins/admin/themes/grav/templates/forms/fields/mediapicker/mediapicker.html.twig index 4f976f0..cb9f6e7 100644 --- a/plugins/admin/themes/grav/templates/forms/fields/mediapicker/mediapicker.html.twig +++ b/plugins/admin/themes/grav/templates/forms/fields/mediapicker/mediapicker.html.twig @@ -1,8 +1,5 @@ {% extends "forms/fields/text/text.html.twig" %} -{% set originalValue = value %} -{% set value = (value is null ? field.default : value) %} - {% set unique_identifier = random_string() %} {% block global_attributes %} diff --git a/plugins/admin/themes/grav/templates/partials/dashboard-pages.html.twig b/plugins/admin/themes/grav/templates/partials/dashboard-pages.html.twig index 7f3b492..501e211 100644 --- a/plugins/admin/themes/grav/templates/partials/dashboard-pages.html.twig +++ b/plugins/admin/themes/grav/templates/partials/dashboard-pages.html.twig @@ -1,4 +1,4 @@ -{% if authorize(['admin.pages', 'admin.super']) %} +{% if authorize(['admin.pages.list', 'admin.pages', 'admin.super']) %}{{ "PLUGIN_ADMIN.AVATAR_BY"|t }} gravatar.com. {{ "PLUGIN_ADMIN.AVATAR_UPLOAD_OWN"|t }}
++{{ "PLUGIN_ADMIN.AVATAR_BY"|t }} + +{% if config.system.accounts.avatar == 'gravatar' %} +gravatar.com. +{% else %} +Multiavatar. +{% endif %} + +{{ "PLUGIN_ADMIN.AVATAR_UPLOAD_OWN"|t }}
diff --git a/plugins/admin/themes/grav/templates/partials/userinfo-avatar.html.twig b/plugins/admin/themes/grav/templates/partials/userinfo-avatar.html.twig index 47240dd..b9d5d9f 100644 --- a/plugins/admin/themes/grav/templates/partials/userinfo-avatar.html.twig +++ b/plugins/admin/themes/grav/templates/partials/userinfo-avatar.html.twig @@ -1,5 +1,2 @@ -{% if data.avatar %} - -{% else %} - -{% endif %} \ No newline at end of file +{% set user_avatar = data.getAvatarUrl() %} + diff --git a/plugins/admin/themes/grav/watch.sh b/plugins/admin/themes/grav/watch.sh old mode 100755 new mode 100644 diff --git a/plugins/admin/vendor/autoload.php b/plugins/admin/vendor/autoload.php index 442a0b9..b4fe0ef 100644 --- a/plugins/admin/vendor/autoload.php +++ b/plugins/admin/vendor/autoload.php @@ -2,6 +2,11 @@ // autoload.php @generated by Composer +if (PHP_VERSION_ID < 50600) { + echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL; + exit(1); +} + require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit38a448a612c5797456d245c809d4a914::getLoader(); +return ComposerAutoloaderInit98c98c1c3d67f21a128f935fe4a74897::getLoader(); diff --git a/plugins/admin/vendor/bin/picofeed b/plugins/admin/vendor/bin/picofeed old mode 100755 new mode 100644 index c94d6a3..e6a8a4a --- a/plugins/admin/vendor/bin/picofeed +++ b/plugins/admin/vendor/bin/picofeed @@ -66,6 +66,16 @@ if (PHP_VERSION_ID < 80000) { return $operation ? flock($this->handle, $operation) : true; } + public function stream_seek($offset, $whence) + { + if (0 === fseek($this->handle, $offset, $whence)) { + $this->position = ftell($this->handle); + return true; + } + + return false; + } + public function stream_tell() { return $this->position; @@ -98,7 +108,10 @@ if (PHP_VERSION_ID < 80000) { } } - if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) { + if ( + (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true)) + || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) + ) { include("phpvfscomposer://" . __DIR__ . '/..'.'/p3k/picofeed/picofeed'); exit(0); } diff --git a/plugins/admin/vendor/bin/pscss b/plugins/admin/vendor/bin/pscss old mode 100755 new mode 100644 index b33931e..9743992 --- a/plugins/admin/vendor/bin/pscss +++ b/plugins/admin/vendor/bin/pscss @@ -66,6 +66,16 @@ if (PHP_VERSION_ID < 80000) { return $operation ? flock($this->handle, $operation) : true; } + public function stream_seek($offset, $whence) + { + if (0 === fseek($this->handle, $offset, $whence)) { + $this->position = ftell($this->handle); + return true; + } + + return false; + } + public function stream_tell() { return $this->position; @@ -98,7 +108,10 @@ if (PHP_VERSION_ID < 80000) { } } - if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) { + if ( + (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true)) + || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) + ) { include("phpvfscomposer://" . __DIR__ . '/..'.'/scssphp/scssphp/bin/pscss'); exit(0); } diff --git a/plugins/admin/vendor/composer/InstalledVersions.php b/plugins/admin/vendor/composer/InstalledVersions.php index d50e0c9..c6b54af 100644 --- a/plugins/admin/vendor/composer/InstalledVersions.php +++ b/plugins/admin/vendor/composer/InstalledVersions.php @@ -21,12 +21,14 @@ use Composer\Semver\VersionParser; * See also https://getcomposer.org/doc/07-runtime.md#installed-versions * * To require its presence, you can require `composer-runtime-api ^2.0` + * + * @final */ class InstalledVersions { /** * @var mixed[]|null - * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array