Fix randomUUID, modal dialog and duplicate alerts

* Add a fallback function to crypto.randomUUID (#14371) * Fix modal dialog location * Remove duplicate alert in settings (#14299) Co-authored-by: Hisham Bin Ateya <[email protected]>
OrchardCMS · Oct 3, 2023 · 849a34c · 849a34c
1 parent 6cf70aa
commit 849a34c
Show file tree

Hide file tree

Showing 18 changed files with 251 additions and 218 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Assets.json b/src/OrchardCore.Modules/OrchardCore.Media/Assets.json
@@ -11,7 +11,12 @@
     "inputs": [
       "./node_modules/blueimp-file-upload/js/jquery.fileupload.js",
       "./node_modules/blueimp-file-upload/js/jquery.iframe-transport.js",
-      "Assets/js/**/*.js"
+      "Assets/js/helpers.js",
+      "Assets/js/app/**/*.js"
+    ],
+    "watch": [
+      "Assets/js/helpers.js",
+      "Assets/js/app/**/*.js"
     ],
     "output": "wwwroot/Scripts/media.js"
   }

diff --git a/...chardCore.Media/Assets/js/MediaApp/app.js → ...dCore.Media/Assets/js/app/MediaApp/app.js b/...chardCore.Media/Assets/js/MediaApp/app.js → ...dCore.Media/Assets/js/app/MediaApp/app.js
diff --git a/...re.Media/Assets/js/MediaApp/fileupload.js → ...edia/Assets/js/app/MediaApp/fileupload.js b/...re.Media/Assets/js/MediaApp/fileupload.js → ...edia/Assets/js/app/MediaApp/fileupload.js
@@ -1,5 +1,5 @@
 $(document).on('mediaApp:ready', function () {
-    var chunkedFileUploadId = crypto.randomUUID();
+    var chunkedFileUploadId = randomUUID();
 
     $('#fileupload')
         .fileupload({
@@ -54,5 +54,5 @@ $(document).bind('dragover', function (e) {
             window.dropZoneTimeout = null;
             dropZone.removeClass('in');
         }, 100);
-    }    
-});
+    }
+});
diff --git a/...dia/Assets/js/MediaApp/folderComponent.js → ...Assets/js/app/MediaApp/folderComponent.js b/...dia/Assets/js/MediaApp/folderComponent.js → ...Assets/js/app/MediaApp/folderComponent.js
diff --git a/...ts/js/MediaApp/mediaItemsGridComponent.js → ...s/app/MediaApp/mediaItemsGridComponent.js b/...ts/js/MediaApp/mediaItemsGridComponent.js → ...s/app/MediaApp/mediaItemsGridComponent.js
diff --git a/...s/js/MediaApp/mediaItemsTableComponent.js → .../app/MediaApp/mediaItemsTableComponent.js b/...s/js/MediaApp/mediaItemsTableComponent.js → .../app/MediaApp/mediaItemsTableComponent.js
diff --git a/...edia/Assets/js/MediaApp/pagerComponent.js → .../Assets/js/app/MediaApp/pagerComponent.js b/...edia/Assets/js/MediaApp/pagerComponent.js → .../Assets/js/app/MediaApp/pagerComponent.js
diff --git a/...ets/js/MediaApp/sortIndicatorComponent.js → ...js/app/MediaApp/sortIndicatorComponent.js b/...ets/js/MediaApp/sortIndicatorComponent.js → ...js/app/MediaApp/sortIndicatorComponent.js
diff --git a/...ssets/js/MediaField/attachedMediaField.js → ...s/js/app/MediaField/attachedMediaField.js b/...ssets/js/MediaField/attachedMediaField.js → ...s/js/app/MediaField/attachedMediaField.js
@@ -129,7 +129,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
 
             var selector = '#' + idOfUploadButton;
             var editorId = mediaFieldEditor.attr('id');
-            var chunkedFileUploadId = crypto.randomUUID();
+            var chunkedFileUploadId = randomUUID();
 
             $(selector)
                 .fileupload({
@@ -160,7 +160,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
                     done: function (e, data) {
                         var newMediaItems = [];
                         var errormsg = "";
-                    
+
                         if (data.result.files.length > 0) {
                             for (var i = 0; i < data.result.files.length; i++) {
                                 data.result.files[i].isNew = true;
@@ -173,7 +173,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
                                     errormsg += data.result.files[i].error + "\n";
                             }
                         }
-                    
+
                         if (errormsg !== "") {
                             alert(errormsg);
                             return;
@@ -247,29 +247,29 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
             cancelMediaTextModal: function (event) {
                 this.mediaTextModal.hide();
                 this.selectedMedia.mediaText = this.backupMediaText;
-            }, 
+            },
             showAnchorModal: function (event) {
                 this.anchoringModal = new bootstrap.Modal(this.$refs.anchoringModal);
                 this.anchoringModal.show();
                 // Cause a refresh to recalc heights.
                 this.selectedMedia.anchor = {
-                  x: this.selectedMedia.anchor.x,
-                  y: this.selectedMedia.anchor.y
+                    x: this.selectedMedia.anchor.x,
+                    y: this.selectedMedia.anchor.y
                 }
                 this.backupAnchor = this.selectedMedia.anchor;
-            },           
+            },
             cancelAnchoringModal: function (event) {
                 this.anchoringModal.hide();
                 this.selectedMedia.anchor = this.backupAnchor;
-            },            
+            },
             resetAnchor: function (event) {
                 this.selectedMedia.anchor = { x: 0.5, y: 0.5 };
-            }, 
-            onAnchorDrop: function(event) {
+            },
+            onAnchorDrop: function (event) {
                 var image = this.$refs.anchorImage;
                 this.selectedMedia.anchor = {
-                   x: event.offsetX / image.clientWidth,
-                   y: event.offsetY / image.clientHeight
+                    x: event.offsetX / image.clientWidth,
+                    y: event.offsetY / image.clientHeight
                 }
             },
             anchorLeft: function () {
@@ -286,7 +286,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
                 } else {
                     return '0';
                 }
-            },           
+            },
             anchorTop: function () {
                 if (this.$refs.anchorImage && this.selectedMedia) {
                     var position = this.selectedMedia.anchor.y * this.$refs.anchorImage.clientHeight;
@@ -306,7 +306,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
                     x: event.offsetX / image.clientWidth,
                     y: event.offsetY / image.clientHeight
                 }
-            },         
+            },
             addMediaFiles: function (files) {
                 if ((files.length > 1) && (allowMultiple === false)) {
                     alert($('#onlyOneItemMessage').val());
@@ -330,11 +330,11 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
         watch: {
             mediaItems: {
                 deep: true,
-                handler () {
+                handler() {
                     // Trigger preview rendering
                     setTimeout(function () { $(document).trigger('contentpreview:render'); }, 100);
                 }
-            }, 
+            },
             currentPrefs: function (newPrefs) {
                 localStorage.setItem('mediaFieldPrefs', JSON.stringify(newPrefs));
             }

diff --git a/...s/MediaField/mediaFieldThumbsContainer.js → ...p/MediaField/mediaFieldThumbsContainer.js b/...s/MediaField/mediaFieldThumbsContainer.js → ...p/MediaField/mediaFieldThumbsContainer.js
diff --git a/....Media/Assets/js/MediaField/mediafield.js → ...ia/Assets/js/app/MediaField/mediafield.js b/....Media/Assets/js/MediaField/mediafield.js → ...ia/Assets/js/app/MediaField/mediafield.js
diff --git a/...ets/js/MediaField/mediafieldsAppsArray.js → ...js/app/MediaField/mediafieldsAppsArray.js b/...ets/js/MediaField/mediafieldsAppsArray.js → ...js/app/MediaField/mediafieldsAppsArray.js
diff --git a/...Media/Assets/js/Shared/uploadComponent.js → ...a/Assets/js/app/Shared/uploadComponent.js b/...Media/Assets/js/Shared/uploadComponent.js → ...a/Assets/js/app/Shared/uploadComponent.js
diff --git a/...a/Assets/js/Shared/uploadListComponent.js → ...sets/js/app/Shared/uploadListComponent.js b/...a/Assets/js/Shared/uploadListComponent.js → ...sets/js/app/Shared/uploadListComponent.js
@@ -50,10 +50,10 @@ Vue.component('uploadList', {
         var self = this;
         var uploadInput = document.getElementById(self.uploadInputId ?? 'fileupload');
         $(uploadInput).bind('fileuploadadd', function (e, data) {
-            if (!data.files) { 
+            if (!data.files) {
                 return;
             }
-            data.files.forEach(function (newFile) {                
+            data.files.forEach(function (newFile) {
                 var alreadyInList = self.files.some(function (f) {
                     return f.name == newFile.name;
                 });
@@ -62,8 +62,8 @@ Vue.component('uploadList', {
                     self.files.push({ name: newFile.name, percentage: 0, errorMessage: '' });
                 } else {
                     console.error('A file with the same name is already on the queue:' + newFile.name);
-                }         
-            });            
+                }
+            });
         });
 
         bus.$on('removalRequest', function (fileUpload) {
@@ -88,7 +88,7 @@ Vue.component('uploadList', {
                 this.expanded = false;
             }
         },
-        clearErrors: function () {            
+        clearErrors: function () {
             this.files = this.files.filter(function (item) {
                 return item.errorMessage == '';
             });

diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Assets/js/helpers.js b/src/OrchardCore.Modules/OrchardCore.Media/Assets/js/helpers.js
@@ -0,0 +1,9 @@
+function randomUUID() {
+    if (typeof crypto === 'object' && typeof crypto.randomUUID === 'function') {
+        return crypto.randomUUID();
+    }
+
+    return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+        (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+    );
+}