@syncfusion/ej2-filemanager 20.1.56 → 20.1.59

package/dist/es6/ej2-filemanager.es5.js

@@ -1449,7 +1449,7 @@ function sortbyClickHandler(parent, args) {
         tick = false;
     }
     if (!tick) {
-        parent.sortBy = getSortField(args.item.id);
+        parent.sortBy = getSortField(args.item.id, parent);
     }
     else {
         parent.sortOrder = getSortField(args.item.id);
@@ -1475,12 +1475,24 @@ function sortbyClickHandler(parent, args) {
  * @returns {string} - returns the sorted fields
  * @private
  */
-function getSortField(id) {
+function getSortField(id, parent) {
     var text = id.substring(id.lastIndexOf('_') + 1);
     var field = text;
+    var column;
+    if (parent) {
+        column = parent.detailsViewSettings.columns;
+    }
     switch (text) {
         case 'date':
-            field = '_fm_modified';
+            for (var i = 0; i < column.length; i++) {
+                if (column[i].field === 'dateModified' || column[i].field === 'dateCreated') {
+                    field = column[i].field;
+                    break;
+                }
+                else {
+                    field = '_fm_modified';
+                }
+            }
             break;
         case 'ascending':
             field = 'Ascending';
@@ -1558,6 +1570,15 @@ function pasteHandler(parent) {
                 parent.enablePaste = false;
                 parent.notify(hidePaste, {});
                 removeBlur(parent);
+                var result = {
+                    files: null,
+                    error: {
+                        code: '402',
+                        message: getLocaleText(parent, 'Same-Folder-Error'),
+                        fileExists: null
+                    }
+                };
+                createDialog(parent, 'Error', result);
             }
         }
     }
@@ -3919,9 +3940,9 @@ var LargeIconsView = /** @__PURE__ @class */ (function () {
             altEnter: 'alt+enter',
             esc: 'escape',
             del: 'delete',
-            ctrlX: 'ctrl+x',
-            ctrlC: 'ctrl+c',
-            ctrlV: 'ctrl+v',
+            ctrlX: this.parent.isMac ? 'cmd+x' : 'ctrl+x',
+            ctrlC: this.parent.isMac ? 'cmd+c' : 'ctrl+c',
+            ctrlV: this.parent.isMac ? 'cmd+v' : 'ctrl+v',
             f2: 'f2',
             shiftdel: 'shift+delete',
             back: 'backspace',
@@ -6585,6 +6606,8 @@ var FileManager = /** @__PURE__ @class */ (function (_super) {
         _this.droppedObjects = [];
         _this.uploadingCount = 0;
         _this.uploadedCount = 0;
+        //Specifies whether the operating system is MAC or not
+        _this.isMac = false;
         FileManager_1.Inject(BreadCrumbBar, LargeIconsView, ContextMenu$2);
         return _this;
     }
@@ -6694,6 +6717,7 @@ var FileManager = /** @__PURE__ @class */ (function (_super) {
             this.allowMultiSelection ? this.selectedItems : this.selectedItems.slice(this.selectedItems.length - 1);
         this.setProperties({ selectedItems: slItems }, true);
         this.fileView = this.view;
+        this.isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
         this.setRtl(this.enableRtl);
         this.addEventListeners();
         read(this, (this.path !== this.originalPath) ? initialEnd : finalizeEnd, this.path);
@@ -7981,7 +8005,12 @@ var Toolbar$1 = /** @__PURE__ @class */ (function () {
                     items[itemCount].iconCss = this.parent.sortBy === 'size' ? TB_OPTION_DOT : '';
                 }
                 else if (items[itemCount].id === this.getPupupId('date')) {
-                    items[itemCount].iconCss = this.parent.sortBy === '_fm_modified' ? TB_OPTION_DOT : '';
+                    if (this.parent.sortBy === 'dateModified' || this.parent.sortBy === 'dateCreated') {
+                        items[itemCount].iconCss = this.parent.sortBy === this.parent.sortBy ? TB_OPTION_DOT : '';
+                    }
+                    else {
+                        items[itemCount].iconCss = this.parent.sortBy === '_fm_modified' ? TB_OPTION_DOT : '';
+                    }
                 }
                 else if (items[itemCount].id === this.getPupupId('ascending')) {
                     items[itemCount].iconCss = this.parent.sortOrder === 'Ascending' ? TB_OPTION_TICK : '';
@@ -8263,6 +8292,7 @@ var NavigationPane = /** @__PURE__ @class */ (function () {
      * @param {IFileManager} parent - specifies the parent element.
      * @hidden
      */
+    /* istanbul ignore next */
     function NavigationPane(parent) {
         this.removeNodes = [];
         this.moveNames = [];
@@ -8284,9 +8314,9 @@ var NavigationPane = /** @__PURE__ @class */ (function () {
             altEnter: 'alt+enter',
             esc: 'escape',
             del: 'delete',
-            ctrlX: 'ctrl+x',
-            ctrlC: 'ctrl+c',
-            ctrlV: 'ctrl+v',
+            ctrlX: this.parent.isMac ? 'cmd+x' : 'ctrl+x',
+            ctrlC: this.parent.isMac ? 'cmd+c' : 'ctrl+c',
+            ctrlV: this.parent.isMac ? 'cmd+v' : 'ctrl+v',
             ctrlShiftN: 'ctrl+shift+n',
             shiftF10: 'shift+F10',
             f2: 'f2'
@@ -9146,9 +9176,9 @@ var DetailsView = /** @__PURE__ @class */ (function () {
             home: 'home',
             moveUp: 'uparrow',
             del: 'delete',
-            ctrlX: 'ctrl+x',
-            ctrlC: 'ctrl+c',
-            ctrlV: 'ctrl+v',
+            ctrlX: this.parent.isMac ? 'cmd+x' : 'ctrl+x',
+            ctrlC: this.parent.isMac ? 'cmd+c' : 'ctrl+c',
+            ctrlV: this.parent.isMac ? 'cmd+v' : 'ctrl+v',
             ctrlShiftN: 'ctrl+shift+n',
             shiftdel: 'shift+delete',
             ctrlD: 'ctrl+d',