From 9082d6eb519974609aa97914f8c382c636758c53 Mon Sep 17 00:00:00 2001 From: Peter Keating Date: Tue, 22 Nov 2022 08:56:39 +0000 Subject: [PATCH] Fix fallback image field not be dismissable --- Views/ResponsiveMediaFieldSettings.Edit.cshtml | 6 ++---- package-lock.json | 12 +----------- wwwroot/Scripts/responsiveMedia/admin.js | 4 ---- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Views/ResponsiveMediaFieldSettings.Edit.cshtml b/Views/ResponsiveMediaFieldSettings.Edit.cshtml index 4a124ff..6888c7f 100644 --- a/Views/ResponsiveMediaFieldSettings.Edit.cshtml +++ b/Views/ResponsiveMediaFieldSettings.Edit.cshtml @@ -93,16 +93,14 @@ initializeResponsiveMediaEditor(document.getElementById('@Html.IdFor(m => m)'),
@T["Select Media"]
- +
- +
diff --git a/package-lock.json b/package-lock.json index 2b0805c..b57fd3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,10 @@ { -<<<<<<< HEAD - "name": "etch.orchardcore.fields", - "version": "1.3.1", -======= "name": "Etch.OrchardCore.Fields", - "version": "1.3.0", ->>>>>>> Fix leftover BS4 to BS5 issues on responsive media field + "version": "1.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { -<<<<<<< HEAD - "name": "etch.orchardcore.fields", - "version": "1.3.1", -======= ->>>>>>> Fix leftover BS4 to BS5 issues on responsive media field "license": "ISC", "dependencies": { "ace-builds": "^1.4.8", diff --git a/wwwroot/Scripts/responsiveMedia/admin.js b/wwwroot/Scripts/responsiveMedia/admin.js index 1d78b5b..3bf059b 100644 --- a/wwwroot/Scripts/responsiveMedia/admin.js +++ b/wwwroot/Scripts/responsiveMedia/admin.js @@ -106,11 +106,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var vue_ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -<<<<<<< HEAD eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! bootstrap */ \"bootstrap\");\n/* harmony import */ var bootstrap__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(bootstrap__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! jquery */ \"jquery\");\n/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vue */ \"vue\");\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var _components_responsiveMediaItem__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./components/responsiveMediaItem */ \"./Assets/ResponsiveMedia/js/components/responsiveMediaEditor/components/responsiveMediaItem/index.ts\");\n/* harmony import */ var _utils_createMediaItem__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./utils/createMediaItem */ \"./Assets/ResponsiveMedia/js/components/responsiveMediaEditor/utils/createMediaItem.ts\");\n/* harmony import */ var _utils_parseFieldValue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./utils/parseFieldValue */ \"./Assets/ResponsiveMedia/js/components/responsiveMediaEditor/utils/parseFieldValue.ts\");\nvar __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {\r\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\r\n return new (P || (P = Promise))(function (resolve, reject) {\r\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\r\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\r\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\r\n step((generator = generator.apply(thisArg, _arguments || [])).next());\r\n });\r\n};\r\n\r\n\r\n\r\n\r\n\r\n\r\nconst selectors = {\r\n mediaApp: '#mediaApp',\r\n mediaFieldSelectButton: '.mediaFieldSelectButton',\r\n modalBody: '.modal-body',\r\n};\r\n/* harmony default export */ __webpack_exports__[\"default\"] = ((el, initialData, modalBodyElement, breakpoints, isMultiple, allowMediaText) => {\r\n return new vue__WEBPACK_IMPORTED_MODULE_2___default.a({\r\n el,\r\n data: {\r\n allowMediaText,\r\n backupMediaText: '',\r\n breakpoints,\r\n isMultiple,\r\n mediaItems: [],\r\n selectedMedia: {\r\n mediaText: '',\r\n },\r\n },\r\n components: {\r\n ResponsiveMediaItem: _components_responsiveMediaItem__WEBPACK_IMPORTED_MODULE_3__[\"default\"],\r\n },\r\n computed: {\r\n canAdd() {\r\n return this.isMultiple || this.mediaItems.length === 0;\r\n },\r\n hasMedia() {\r\n return this.mediaItems.length > 0;\r\n },\r\n value() {\r\n return JSON.stringify(this.mediaItems.map((x) => {\r\n return {\r\n mediaText: x.mediaText,\r\n sources: x.sources.map((source) => {\r\n return {\r\n breakpoint: source.breakpoint,\r\n path: source.path,\r\n };\r\n }),\r\n };\r\n }));\r\n },\r\n },\r\n mounted: function () {\r\n this.mediaItems = Object(_utils_parseFieldValue__WEBPACK_IMPORTED_MODULE_5__[\"default\"])(initialData);\r\n },\r\n methods: {\r\n add: function () {\r\n const self = this;\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(selectors.mediaApp)\r\n .detach()\r\n .appendTo(jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement).find(selectors.modalBody));\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(selectors.mediaApp).show();\r\n const modal = new bootstrap__WEBPACK_IMPORTED_MODULE_0___default.a.Modal(jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement)[0]);\r\n modal.show();\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement)\r\n .find(selectors.mediaFieldSelectButton)\r\n .off('click')\r\n .on('click', function () {\r\n return __awaiter(this, void 0, void 0, function* () {\r\n if (window.mediaApp.selectedMedias.length) {\r\n self.mediaItems.push(yield Object(_utils_createMediaItem__WEBPACK_IMPORTED_MODULE_4__[\"default\"])(self.breakpoints, window.mediaApp.selectedMedias));\r\n }\r\n window.mediaApp.selectedMedias = [];\r\n modal.hide();\r\n return true;\r\n });\r\n });\r\n },\r\n cancelMediaTextModal: function () {\r\n this.selectedMedia.mediaText = this.backupMediaText;\r\n },\r\n remove: function (args) {\r\n this.mediaItems.splice(this.mediaItems.indexOf(args.media), 1);\r\n },\r\n showMediaText: function (args) {\r\n this.selectedMedia = args.media;\r\n const modal = new bootstrap__WEBPACK_IMPORTED_MODULE_0___default.a.Modal(this.$refs.mediaTextModal);\r\n modal.show();\r\n this.backupMediaText = this.selectedMedia.mediaText;\r\n },\r\n update: function (args) {\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(selectors.mediaApp)\r\n .detach()\r\n .appendTo(jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement).find(selectors.modalBody));\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(selectors.mediaApp).show();\r\n const modal = new bootstrap__WEBPACK_IMPORTED_MODULE_0___default.a.Modal(jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement)[0]);\r\n modal.show();\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement)\r\n .find(selectors.mediaFieldSelectButton)\r\n .off('click')\r\n .on('click', function () {\r\n return __awaiter(this, void 0, void 0, function* () {\r\n if (window.mediaApp.selectedMedias.length) {\r\n args.media.addSource(args.breakpoint, window.mediaApp.selectedMedias[0]);\r\n }\r\n window.mediaApp.selectedMedias = [];\r\n modal.hide();\r\n return true;\r\n });\r\n });\r\n },\r\n updatePreview: function () {\r\n this.$nextTick(() => {\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(document).trigger('contentpreview:render');\r\n });\r\n },\r\n },\r\n watch: {\r\n mediaItems: function () {\r\n this.updatePreview();\r\n },\r\n },\r\n });\r\n});\r\n\n\n//# sourceURL=webpack:///./Assets/ResponsiveMedia/js/components/responsiveMediaEditor/index.ts?"); -======= -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! bootstrap */ \"bootstrap\");\n/* harmony import */ var bootstrap__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(bootstrap__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! jquery */ \"jquery\");\n/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vue */ \"vue\");\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var _components_responsiveMediaItem__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./components/responsiveMediaItem */ \"./Assets/ResponsiveMedia/js/components/responsiveMediaEditor/components/responsiveMediaItem/index.ts\");\n/* harmony import */ var _utils_createMediaItem__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./utils/createMediaItem */ \"./Assets/ResponsiveMedia/js/components/responsiveMediaEditor/utils/createMediaItem.ts\");\n/* harmony import */ var _utils_parseFieldValue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./utils/parseFieldValue */ \"./Assets/ResponsiveMedia/js/components/responsiveMediaEditor/utils/parseFieldValue.ts\");\nvar __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {\r\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\r\n return new (P || (P = Promise))(function (resolve, reject) {\r\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\r\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\r\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\r\n step((generator = generator.apply(thisArg, _arguments || [])).next());\r\n });\r\n};\r\n\r\n\r\n\r\n\r\n\r\n\r\nconst selectors = {\r\n mediaApp: '#mediaApp',\r\n mediaFieldSelectButton: '.mediaFieldSelectButton',\r\n modalBody: '.modal-body',\r\n};\r\n/* harmony default export */ __webpack_exports__[\"default\"] = ((el, initialData, modalBodyElement, breakpoints, isMultiple, allowMediaText) => {\r\n return new vue__WEBPACK_IMPORTED_MODULE_2___default.a({\r\n el,\r\n data: {\r\n allowMediaText,\r\n backupMediaText: '',\r\n breakpoints,\r\n isMultiple,\r\n mediaItems: [],\r\n selectedMedia: {\r\n mediaText: '',\r\n },\r\n },\r\n components: {\r\n ResponsiveMediaItem: _components_responsiveMediaItem__WEBPACK_IMPORTED_MODULE_3__[\"default\"],\r\n },\r\n computed: {\r\n canAdd() {\r\n return this.isMultiple || this.mediaItems.length === 0;\r\n },\r\n hasMedia() {\r\n return this.mediaItems.length > 0;\r\n },\r\n value() {\r\n return JSON.stringify(this.mediaItems.map((x) => {\r\n return {\r\n mediaText: x.mediaText,\r\n sources: x.sources.map((source) => {\r\n return {\r\n breakpoint: source.breakpoint,\r\n path: source.path,\r\n };\r\n }),\r\n };\r\n }));\r\n },\r\n },\r\n mounted: function () {\r\n this.mediaItems = Object(_utils_parseFieldValue__WEBPACK_IMPORTED_MODULE_5__[\"default\"])(initialData);\r\n },\r\n methods: {\r\n add: function () {\r\n const self = this;\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(selectors.mediaApp)\r\n .detach()\r\n .appendTo(jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement).find(selectors.modalBody));\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(selectors.mediaApp).show();\r\n const modal = new bootstrap__WEBPACK_IMPORTED_MODULE_0___default.a.Modal(jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement)[0]);\r\n modal.show();\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement)\r\n .find(selectors.mediaFieldSelectButton)\r\n .off('click')\r\n .on('click', function () {\r\n return __awaiter(this, void 0, void 0, function* () {\r\n if (window.mediaApp.selectedMedias.length) {\r\n self.mediaItems.push(yield Object(_utils_createMediaItem__WEBPACK_IMPORTED_MODULE_4__[\"default\"])(self.breakpoints, window.mediaApp.selectedMedias));\r\n }\r\n window.mediaApp.selectedMedias = [];\r\n modal.hide();\r\n return true;\r\n });\r\n });\r\n },\r\n cancelMediaTextModal: function () {\r\n const modal = new bootstrap__WEBPACK_IMPORTED_MODULE_0___default.a.Modal(this.$refs.mediaTextModal);\r\n modal.hide();\r\n this.selectedMedia.mediaText = this.backupMediaText;\r\n },\r\n remove: function (args) {\r\n this.mediaItems.splice(this.mediaItems.indexOf(args.media), 1);\r\n },\r\n showMediaText: function (args) {\r\n this.selectedMedia = args.media;\r\n const modal = new bootstrap__WEBPACK_IMPORTED_MODULE_0___default.a.Modal(this.$refs.mediaTextModal);\r\n modal.show();\r\n this.backupMediaText = this.selectedMedia.mediaText;\r\n },\r\n update: function (args) {\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(selectors.mediaApp)\r\n .detach()\r\n .appendTo(jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement).find(selectors.modalBody));\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(selectors.mediaApp).show();\r\n const modal = new bootstrap__WEBPACK_IMPORTED_MODULE_0___default.a.Modal(jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement)[0]);\r\n modal.show();\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(modalBodyElement)\r\n .find(selectors.mediaFieldSelectButton)\r\n .off('click')\r\n .on('click', function () {\r\n return __awaiter(this, void 0, void 0, function* () {\r\n if (window.mediaApp.selectedMedias.length) {\r\n args.media.addSource(args.breakpoint, window.mediaApp.selectedMedias[0]);\r\n }\r\n window.mediaApp.selectedMedias = [];\r\n modal.hide();\r\n return true;\r\n });\r\n });\r\n },\r\n updatePreview: function () {\r\n this.$nextTick(() => {\r\n jquery__WEBPACK_IMPORTED_MODULE_1___default()(document).trigger('contentpreview:render');\r\n });\r\n },\r\n },\r\n watch: {\r\n mediaItems: function () {\r\n this.updatePreview();\r\n },\r\n },\r\n });\r\n});\r\n\n\n//# sourceURL=webpack:///./Assets/ResponsiveMedia/js/components/responsiveMediaEditor/index.ts?"); ->>>>>>> Fix leftover BS4 to BS5 issues on responsive media field /***/ }),