diff --git a/js/core/set_template_engine.js b/js/core/set_template_engine.js new file mode 100644 index 000000000000..2c968a9e1da2 --- /dev/null +++ b/js/core/set_template_engine.js @@ -0,0 +1 @@ +module.exports = require("./templates/template_engine_registry").setTemplateEngine; diff --git a/js/localization/messages/hu.json b/js/localization/messages/hu.json new file mode 100644 index 000000000000..a2d33b1e09a1 --- /dev/null +++ b/js/localization/messages/hu.json @@ -0,0 +1,373 @@ +{ + "hu": { + "Yes": "Igen", + "No": "Nem", + "Cancel": "Mégse", + "Clear": "Törlés", + "Done": "Kész", + "Loading": "Betöltés...", + "Select": "Választás...", + "Search": "Keresés", + "Back": "Vissza", + "OK": "OK", + + "dxCollectionWidget-noDataText": "Nincs megjeleníthető adat", + + "dxDropDownEditor-selectLabel": "Választás", + + "validation-required": "Kötelező", + "validation-required-formatted": "{0} kötelező", + "validation-numeric": "Az érték szám kell legyen", + "validation-numeric-formatted": "{0} szám kell legyen", + "validation-range": "Az érték tartományon kívülre esik", + "validation-range-formatted": "{0} tartományon kívülre esik", + "validation-stringLength": "Az érték hossza helytelen", + "validation-stringLength-formatted": "{0} hossza helytelen", + "validation-custom": "Érvénytelen érték", + "validation-custom-formatted": "{0} érvénytelen", + "validation-async": "Érvénytelen érték", + "validation-async-formatted": "{0} érvénytelen", + "validation-compare": "Az értékek nem egyeznek", + "validation-compare-formatted": "{0} nem egyezik", + "validation-pattern": "Az érték nem illeszthető a mintára", + "validation-pattern-formatted": "{0} nem illeszthető a mintára", + "validation-email": "Érvénytelen email", + "validation-email-formatted": "{0} érvénytelen email", + "validation-mask": "Érvénytelen érték", + + "dxLookup-searchPlaceholder": "Minimum karakterszám: {0}", + + "dxList-pullingDownText": "Húzza le a frissítéshez...", + "dxList-pulledDownText": "Engedje el a frissítéshez...", + "dxList-refreshingText": "Frissítés...", + "dxList-pageLoadingText": "Betöltés...", + "dxList-nextButtonText": "Tovább", + "dxList-selectAll": "Összes kiválasztása", + "dxListEditDecorator-delete": "Törlés", + "dxListEditDecorator-more": "Több", + + "dxScrollView-pullingDownText": "Húzza le a frissítéshez...", + "dxScrollView-pulledDownText": "Engedje el a frissítéshez...", + "dxScrollView-refreshingText": "Frissítés...", + "dxScrollView-reachBottomText": "Betöltés...", + + "dxDateBox-simulatedDataPickerTitleTime": "Válasszon időt", + "dxDateBox-simulatedDataPickerTitleDate": "Válasszon dátumot", + "dxDateBox-simulatedDataPickerTitleDateTime": "Válasszon dátumot és időt", + "dxDateBox-validation-datetime": "Az érték dátum vagy idő kell legyen", + + "dxFileUploader-selectFile": "Válasszon fájlt", + "dxFileUploader-dropFile": "vagy húzza a fájlt ide", + "dxFileUploader-bytes": "bájt", + "dxFileUploader-kb": "kb", + "dxFileUploader-Mb": "Mb", + "dxFileUploader-Gb": "Gb", + "dxFileUploader-upload": "Feltöltés", + "dxFileUploader-uploaded": "Feltöltve", + "dxFileUploader-readyToUpload": "Feltöltésre kész", + "dxFileUploader-uploadFailedMessage": "A feltöltés sikertelen", + "dxFileUploader-invalidFileExtension": "Nem engedélyezett fájltípus", + "dxFileUploader-invalidMaxFileSize": "Túl nagy fájl", + "dxFileUploader-invalidMinFileSize": "Túl kicsi fájl", + + "dxRangeSlider-ariaFrom": "-tól", + "dxRangeSlider-ariaTill": "-ig", + "dxSwitch-switchedOnText": "BE", + "dxSwitch-switchedOffText": "KI", + + "dxForm-optionalMark": "választható", + "dxForm-requiredMessage": "{0} kötelező", + + "dxNumberBox-invalidValueMessage": "Az érték szám kell legyen", + + "dxDataGrid-columnChooserTitle": "Oszlopválasztó", + "dxDataGrid-columnChooserEmptyText": "Húzza ide az oszlopot az elrejtéshez", + "dxDataGrid-groupContinuesMessage": "A következő oldalon folytatódik", + "dxDataGrid-groupContinuedMessage": "Folytatás az előző oldalról", + "dxDataGrid-groupHeaderText": "Csoportosítás ezen oszlop szerint", + "dxDataGrid-ungroupHeaderText": "Csoportbontás", + "dxDataGrid-ungroupAllText": "Összes csoportbontása", + "dxDataGrid-editingEditRow": "Szerkesztés", + "dxDataGrid-editingSaveRowChanges": "Mentés", + "dxDataGrid-editingCancelRowChanges": "Mégse", + "dxDataGrid-editingDeleteRow": "Törlés", + "dxDataGrid-editingUndeleteRow": "Visszaállítás", + "dxDataGrid-editingConfirmDeleteMessage": "Biztosan törli ezt a rekordot?", + "dxDataGrid-validationCancelChanges": "Módosítások elvetése", + "dxDataGrid-groupPanelEmptyText": "Húzzon ide egy oszlopfejlécet a csoportosításhoz", + "dxDataGrid-noDataText": "Nincs adat", + "dxDataGrid-searchPanelPlaceholder": "Keresés...", + "dxDataGrid-filterRowShowAllText": "(Mind)", + "dxDataGrid-filterRowResetOperationText": "Visszaállítás", + "dxDataGrid-filterRowOperationEquals": "Egyenlő", + "dxDataGrid-filterRowOperationNotEquals": "Nem egyenlő", + "dxDataGrid-filterRowOperationLess": "Kisebb", + "dxDataGrid-filterRowOperationLessOrEquals": "Kisebb vagy egyenlő", + "dxDataGrid-filterRowOperationGreater": "Nagyobb", + "dxDataGrid-filterRowOperationGreaterOrEquals": "Nagyobb vagy egyenlő", + "dxDataGrid-filterRowOperationStartsWith": "Kezdődik", + "dxDataGrid-filterRowOperationContains": "Tartalmazza", + "dxDataGrid-filterRowOperationNotContains": "Nem tartalmazza", + "dxDataGrid-filterRowOperationEndsWith": "Végződik", + "dxDataGrid-filterRowOperationBetween": "Között", + "dxDataGrid-filterRowOperationBetweenStartText": "Kezdete", + "dxDataGrid-filterRowOperationBetweenEndText": "Vége", + "dxDataGrid-applyFilterText": "Szűrő alkalmazása", + "dxDataGrid-trueText": "igaz", + "dxDataGrid-falseText": "hamis", + "dxDataGrid-sortingAscendingText": "Növekvő", + "dxDataGrid-sortingDescendingText": "Csökkenő", + "dxDataGrid-sortingClearText": "Rendezés törlése", + "dxDataGrid-editingSaveAllChanges": "Módosítások mentése", + "dxDataGrid-editingCancelAllChanges": "Módosítások elvetése", + "dxDataGrid-editingAddRow": "Sor hozzáadása", + "dxDataGrid-summaryMin": "Minimum: {0}", + "dxDataGrid-summaryMinOtherColumn": "{1} minimuma: {0}", + "dxDataGrid-summaryMax": "Maximum: {0}", + "dxDataGrid-summaryMaxOtherColumn": "{1} maximuma: {0}", + "dxDataGrid-summaryAvg": "Átlag: {0}", + "dxDataGrid-summaryAvgOtherColumn": "{1} átlaga: {0}", + "dxDataGrid-summarySum": "Összeg: {0}", + "dxDataGrid-summarySumOtherColumn": "{1} összege: {0}", + "dxDataGrid-summaryCount": "Darabszám: {0}", + "dxDataGrid-columnFixingFix": "Rögzítés", + "dxDataGrid-columnFixingUnfix": "Feloldás", + "dxDataGrid-columnFixingLeftPosition": "Balra", + "dxDataGrid-columnFixingRightPosition": "Jobbra", + "dxDataGrid-exportTo": "Exportálás", + "dxDataGrid-exportToExcel": "Exportálás Excel fájlba", + "dxDataGrid-excelFormat": "Excel fájl", + "dxDataGrid-selectedRows": "Kiválasztott sorok", + "dxDataGrid-exportSelectedRows": "Kiválasztott sorok exportálása", + "dxDataGrid-exportAll": "Az összes adat exportálása", + "dxDataGrid-headerFilterEmptyValue": "(Üresek)", + "dxDataGrid-headerFilterOK": "OK", + "dxDataGrid-headerFilterCancel": "Mégse", + "dxDataGrid-ariaColumn": "Oszlop", + "dxDataGrid-ariaValue": "Érték", + "dxDataGrid-ariaFilterCell": "Szűrő cella", + "dxDataGrid-ariaCollapse": "Összecsukás", + "dxDataGrid-ariaExpand": "Kibontás", + "dxDataGrid-ariaDataGrid": "Adatrács", + "dxDataGrid-ariaSearchInGrid": "Keresés az adatrácsban", + "dxDataGrid-ariaSelectAll": "Összes kiválasztása", + "dxDataGrid-ariaSelectRow": "Sor kiválasztása", + "dxDataGrid-filterBuilderPopupTitle": "Szűrőkészítő", + "dxDataGrid-filterPanelCreateFilter": "Szűrő létrehozása", + "dxDataGrid-filterPanelClearFilter": "Törlés", + "dxDataGrid-filterPanelFilterEnabledHint": "Szűrő engedélyezése", + + "dxTreeList-ariaTreeList": "Fa lista", + "dxTreeList-editingAddRowToNode": "Hozzáadás", + + "dxPager-infoText": "Oldal: {0}/{1} ({2} elem)", + "dxPager-pagesCountText": "/", + + "dxPivotGrid-grandTotal": "Teljes összeg", + "dxPivotGrid-total": "{0} Összeg", + "dxPivotGrid-fieldChooserTitle": "Mezőválasztó", + "dxPivotGrid-showFieldChooser": "Mezőválasztó megjelenítése", + "dxPivotGrid-expandAll": "Összes kibontása", + "dxPivotGrid-collapseAll": "Összes összecsukása", + "dxPivotGrid-sortColumnBySummary": "Rendezés \"{0}\" ezen oszlop alapján", + "dxPivotGrid-sortRowBySummary": "Rendezés \"{0}\" ezen sor alapján", + "dxPivotGrid-removeAllSorting": "Összes rendezés törlése", + "dxPivotGrid-dataNotAvailable": "N/A", + "dxPivotGrid-rowFields": "Sormező", + "dxPivotGrid-columnFields": "Oszlopmező", + "dxPivotGrid-dataFields": "Adatmező", + "dxPivotGrid-filterFields": "Szűrőmező", + "dxPivotGrid-allFields": "Összes mező", + "dxPivotGrid-columnFieldArea": "Húzza az oszlopmezőket ide", + "dxPivotGrid-dataFieldArea": "Húzza az adatmezőket ide", + "dxPivotGrid-rowFieldArea": "Húzza a sormezőket ide", + "dxPivotGrid-filterFieldArea": "Húzza a szűrőmezőket ide", + + "dxScheduler-editorLabelTitle": "Tárgy", + "dxScheduler-editorLabelStartDate": "Kezdés dátuma", + "dxScheduler-editorLabelEndDate": "Befejezés dátuma", + "dxScheduler-editorLabelDescription": "Leírás", + "dxScheduler-editorLabelRecurrence": "Ismétlődés", + + "dxScheduler-openAppointment": "Találkozó megnyitása", + + "dxScheduler-recurrenceNever": "Soha", + "dxScheduler-recurrenceDaily": "Naponta", + "dxScheduler-recurrenceWeekly": "Hetente", + "dxScheduler-recurrenceMonthly": "Havonta", + "dxScheduler-recurrenceYearly": "Évente", + + "dxScheduler-recurrenceRepeatEvery": "Ismétlődés minden", + "dxScheduler-recurrenceRepeatOn": "Ismétlődés", + "dxScheduler-recurrenceEnd": "Ismétlődés vége", + "dxScheduler-recurrenceAfter": "Után", + "dxScheduler-recurrenceOn": "Ekkor", + + "dxScheduler-recurrenceRepeatDaily": "nap(ok)", + "dxScheduler-recurrenceRepeatWeekly": "hét(ek)", + "dxScheduler-recurrenceRepeatMonthly": "hónap(ok)", + "dxScheduler-recurrenceRepeatYearly": "év(ek)", + + "dxScheduler-switcherDay": "Nap", + "dxScheduler-switcherWeek": "Hét", + "dxScheduler-switcherWorkWeek": "Munkahét", + "dxScheduler-switcherMonth": "Hónap", + + "dxScheduler-switcherAgenda": "Naptár", + + "dxScheduler-switcherTimelineDay": "Idővonal nap", + "dxScheduler-switcherTimelineWeek": "Idővonal hét", + "dxScheduler-switcherTimelineWorkWeek": "Idővonal munkahét", + "dxScheduler-switcherTimelineMonth": "Idővonal hónap", + + "dxScheduler-recurrenceRepeatOnDate": "dátumon", + "dxScheduler-recurrenceRepeatCount": "előfordulás(ok)", + "dxScheduler-allDay": "Egész nap", + + "dxScheduler-confirmRecurrenceEditMessage": "Csak ezt az alkalmat szeretné szerkeszteni, vagy az összes ismétlődést?", + "dxScheduler-confirmRecurrenceDeleteMessage": "Csak ezt az alkalmat szeretné törölni, vagy az összes ismétlődést?", + + "dxScheduler-confirmRecurrenceEditSeries": "Ismétlődés szerkesztése", + "dxScheduler-confirmRecurrenceDeleteSeries": "Ismétlődés törlése", + "dxScheduler-confirmRecurrenceEditOccurrence": "Alkalom szerkesztése", + "dxScheduler-confirmRecurrenceDeleteOccurrence": "Alkalom törlése", + + "dxScheduler-noTimezoneTitle": "Nincs időzóna", + "dxScheduler-moreAppointments": "{0} több", + + "dxCalendar-todayButtonText": "Ma", + "dxCalendar-ariaWidgetName": "Naptár", + + "dxColorView-ariaRed": "Piros", + "dxColorView-ariaGreen": "Zöld", + "dxColorView-ariaBlue": "Kék", + "dxColorView-ariaAlpha": "Átlátszóság", + "dxColorView-ariaHex": "Színkód", + + "dxTagBox-selected": "{0} kiválasztva", + "dxTagBox-allSelected": "Összes kiválasztva ({0})", + "dxTagBox-moreSelected": "{0} több", + + "vizExport-printingButtonText": "Nyomtatás", + "vizExport-titleMenuText": "Exportálás/Nyomtatás", + "vizExport-exportButtonText": "{0} fájl", + + "dxFilterBuilder-and": "És", + "dxFilterBuilder-or": "Vagy", + "dxFilterBuilder-notAnd": "Nem És", + "dxFilterBuilder-notOr": "Nem Vagy", + "dxFilterBuilder-addCondition": "Feltétel hozzáadása", + "dxFilterBuilder-addGroup": "Csoport hozzáadása", + "dxFilterBuilder-enterValueText": "<írjon be egy értéket>", + "dxFilterBuilder-filterOperationEquals": "Egyenlő", + "dxFilterBuilder-filterOperationNotEquals": "Nem egyenlő", + "dxFilterBuilder-filterOperationLess": "Kisebb", + "dxFilterBuilder-filterOperationLessOrEquals": "Kisebb vagy egyenlő", + "dxFilterBuilder-filterOperationGreater": "Nagyobb", + "dxFilterBuilder-filterOperationGreaterOrEquals": "Nagyobb vagy egyenlő", + "dxFilterBuilder-filterOperationStartsWith": "Kezdődik", + "dxFilterBuilder-filterOperationContains": "Tartalmazza", + "dxFilterBuilder-filterOperationNotContains": "Nem tartalmazza", + "dxFilterBuilder-filterOperationEndsWith": "Végződik", + "dxFilterBuilder-filterOperationIsBlank": "Üres", + "dxFilterBuilder-filterOperationIsNotBlank": "Nem üres", + "dxFilterBuilder-filterOperationBetween": "Között", + "dxFilterBuilder-filterOperationAnyOf": "Valamelyik", + "dxFilterBuilder-filterOperationNoneOf": "Egyik sem", + + "dxHtmlEditor-dialogColorCaption": "Betűszín választás", + "dxHtmlEditor-dialogBackgroundCaption": "Háttérszín választás", + "dxHtmlEditor-dialogLinkCaption": "Link hozzáadása", + "dxHtmlEditor-dialogLinkUrlField": "URL", + "dxHtmlEditor-dialogLinkTextField": "Szöveg", + "dxHtmlEditor-dialogLinkTargetField": "Link megnyitása új ablakban", + "dxHtmlEditor-dialogImageCaption": "Kép hozzáadása", + "dxHtmlEditor-dialogImageUrlField": "URL", + "dxHtmlEditor-dialogImageAltField": "Alternatív szöveg", + "dxHtmlEditor-dialogImageWidthField": "Szélesség (px)", + "dxHtmlEditor-dialogImageHeightField": "Magasság (px)", + "dxHtmlEditor-heading": "Fejléc", + "dxHtmlEditor-normalText": "Normál szöveg", + + "dxFileManager-newFolderName": "Névtelen könyvtár", + "dxFileManager-rootFolderName": "Fájlok", + "dxFileManager-errorNoAccess": "Hozzáférés megtagadva. A műveletet nem lehet befejezni.", + "dxFileManager-errorDirectoryExistsFormat": "'{0}' nevű könyvtár már létezik.", + "dxFileManager-errorFileExistsFormat": "'{0}' nevű fájl már létezik.", + "dxFileManager-errorFileNotFoundFormat": "'{0}' nevű fájl nem található", + "dxFileManager-errorDirectoryNotFoundFormat": "'{0}' nevű könyvtár nem található", + "dxFileManager-errorWrongFileExtension": "Nem engedélyezett fájltípus", + "dxFileManager-errorMaxFileSizeExceeded": "A fájlméret meghaladja a megengedett legnagyobb méretet", + "dxFileManager-errorDefault": "Ismeretlen hiba.", + + "dxDiagram-categoryGeneral": "Általános", + "dxDiagram-categoryFlowchart": "Folyamatábra", + "dxDiagram-categoryOrgChart": "Szervezeti ábra", + "dxDiagram-categoryContainers": "Tárolók", + "dxDiagram-categoryCustom": "Egyedi", + "dxDiagram-commandProperties": "Tulajdonságok", + "dxDiagram-commandExport": "Exportálás", + "dxDiagram-commandExportToSvg": "Exportálás SVG-be", + "dxDiagram-commandExportToPng": "Exportálás PNG-be", + "dxDiagram-commandExportToJpg": "Exportálás JPEG-be", + "dxDiagram-commandUndo": "Visszavonás", + "dxDiagram-commandRedo": "Újra", + "dxDiagram-commandFontName": "Betűtípus", + "dxDiagram-commandFontSize": "Betűméret", + "dxDiagram-commandBold": "Félkövér", + "dxDiagram-commandItalic": "Dőlt", + "dxDiagram-commandUnderline": "Aláhúzott", + "dxDiagram-commandTextColor": "Betűszín", + "dxDiagram-commandLineColor": "Sor színe", + "dxDiagram-commandFillColor": "Kitöltő szín", + "dxDiagram-commandAlignLeft": "Balra igazítás", + "dxDiagram-commandAlignCenter": "Középre igazítás", + "dxDiagram-commandAlignRight": "Jobbra igazítás", + "dxDiagram-commandConnectorLineType": "Összekötő vonal típusa", + "dxDiagram-commandConnectorLineStraight": "Egyenes", + "dxDiagram-commandConnectorLineOrthogonal": "Merőleges", + "dxDiagram-commandConnectorLineStart": "Összekötő vonal kezdete", + "dxDiagram-commandConnectorLineEnd": "Összekötő vonal vége", + "dxDiagram-commandConnectorLineNone": "Egyik sem", + "dxDiagram-commandConnectorLineArrow": "Nyíl", + "dxDiagram-commandAutoLayout": "Automatikus elrendezés", + "dxDiagram-commandAutoLayoutTree": "Fa", + "dxDiagram-commandAutoLayoutLayered": "Réteges", + "dxDiagram-commandAutoLayoutHorizontal": "Vízszintes", + "dxDiagram-commandAutoLayoutVertical": "Függőleges", + "dxDiagram-commandFullscreen": "Teljes képernyő", + "dxDiagram-commandUnits": "Egységek", + "dxDiagram-commandPageSize": "Lapméret", + "dxDiagram-commandPageOrientation": "Tájolás", + "dxDiagram-commandPageOrientationLandscape": "Fekvő", + "dxDiagram-commandPageOrientationPortrait": "Álló", + "dxDiagram-commandPageColor": "Oldal színe", + "dxDiagram-commandShowGrid": "Rács megjelenítése", + "dxDiagram-commandSnapToGrid": "Rácshoz igazítás", + "dxDiagram-commandGridSize": "Rács mérete", + "dxDiagram-commandZoomLevel": "Nagyítás", + "dxDiagram-commandAutoZoom": "Automatikus nagyítás", + "dxDiagram-commandSimpleView": "Egyszerűsített nézet", + "dxDiagram-commandCut": "Kivágás", + "dxDiagram-commandCopy": "Másolás", + "dxDiagram-commandPaste": "Beillesztés", + "dxDiagram-commandSelectAll": "Összes kiválasztása", + "dxDiagram-commandDelete": "Törlés", + "dxDiagram-commandBringToFront": "Előre hoz", + "dxDiagram-commandSendToBack": "Hátra küld", + "dxDiagram-commandLock": "Rögzít", + "dxDiagram-commandUnlock": "Felold", + "dxDiagram-commandInsertShapeImage": "Kép beszúrása...", + "dxDiagram-commandEditShapeImage": "Kép cseréje...", + "dxDiagram-commandDeleteShapeImage": "Kép törlése", + "dxDiagram-unitIn": "in", + "dxDiagram-unitCm": "cm", + "dxDiagram-unitPx": "px", + "dxDiagram-dialogButtonOK": "OK", + "dxDiagram-dialogButtonCancel": "Mégse", + "dxDiagram-dialogInsertShapeImageTitle": "Kép beszúrása", + "dxDiagram-dialogEditShapeImageTitle": "Kép cseréje", + "dxDiagram-dialogEditShapeImageSelectButton": "Kép kiválasztása", + "dxDiagram-dialogEditShapeImageLabelText": "vagy húzza a fájlt ide" + } +} diff --git a/js/ui/draggable.js b/js/ui/draggable.js index 41e41e3411a3..6338d681e3a8 100644 --- a/js/ui/draggable.js +++ b/js/ui/draggable.js @@ -553,7 +553,10 @@ var Draggable = DOMComponentWithTemplate.inherit({ template = this._getTemplate(template); result = $(template.render(this._getDragTemplateArgs($element))); } else if(clone) { - result = $element.clone().outerWidth($element.outerWidth()).appendTo(container); + result = $element.clone().css({ + width: $element.css("width"), + height: $element.css("height") + }).appendTo(container); } return result.toggleClass(this._addWidgetPrefix(CLONE_CLASS), result.get(0) !== $element.get(0)); diff --git a/js/ui/file_manager/file_items_controller.js b/js/ui/file_manager/file_items_controller.js index 2a96a9e54c18..aa4260bb0060 100644 --- a/js/ui/file_manager/file_items_controller.js +++ b/js/ui/file_manager/file_items_controller.js @@ -21,6 +21,8 @@ export default class FileItemsController { this._currentDirectoryInfo = this._rootDirectoryInfo; + this._defaultIconMap = this._createDefaultIconMap(); + this._securityController = new FileSecurityController({ allowedFileExtensions: this._options.allowedFileExtensions, maxFileSize: this._options.maxUploadFileSize @@ -249,9 +251,9 @@ export default class FileItemsController { this._fileProvider.downloadItems(items); } - getItemsContent(itemInfos) { + getItemContent(itemInfos) { const items = itemInfos.map(i => i.fileItem); - return when(this._fileProvider.getItemsContent(items)); + return when(this._fileProvider.getItemContent(items)); } _processEditAction(actionInfo, action, completeAction) { @@ -418,34 +420,28 @@ export default class FileItemsController { } const extension = fileItem.getExtension(); - switch(extension) { - case ".txt": - return "doc"; // TODO change icon - case ".rtf": - case ".doc": - case ".docx": - case ".odt": - return "doc"; - case ".xls": - case ".xlsx": - case ".ods": - return "exportxlsx"; - case ".ppt": - case ".pptx": - case ".odp": - return "doc"; // TODO change icon - case ".pdf": - return "exportpdf"; - case ".png": - case ".gif": - case ".jpg": - case ".jpeg": - case ".ico": - case ".bmp": - return "image"; - default: - return "doc"; // TODO change icon - } + const icon = this._defaultIconMap[extension]; + return icon || "doc"; + } + + _createDefaultIconMap() { + const result = { + ".txt": "txtfile", + ".rtf": "rtffile", + ".doc": "docfile", + ".docx": "docxfile", + ".xls": "xlsfile", + ".xlsx": "xlsxfile", + ".ppt": "pptfile", + ".pptx": "pptxfile", + ".pdf": "pdffile" + }; + + [".png", ".gif", ".jpg", ".jpeg", ".ico", ".bmp"].forEach(extension => { + result[extension] = "image"; + }); + + return result; } _createRootDirectory(text) { diff --git a/js/ui/file_manager/file_provider/custom.js b/js/ui/file_manager/file_provider/custom.js index 61f36eb81eed..7135013a459d 100644 --- a/js/ui/file_manager/file_provider/custom.js +++ b/js/ui/file_manager/file_provider/custom.js @@ -129,7 +129,7 @@ export default class CustomFileProvider extends FileProvider { return this._downloadItemsFunction(items); } - getItemsContent(items) { + getItemContent(items) { return this._getItemsContentFunction(items); } diff --git a/js/ui/file_manager/file_provider/file_provider.js b/js/ui/file_manager/file_provider/file_provider.js index 9b4439ab53bb..dc0ac68e00da 100644 --- a/js/ui/file_manager/file_provider/file_provider.js +++ b/js/ui/file_manager/file_provider/file_provider.js @@ -79,7 +79,13 @@ class FileProvider { downloadItems(items) { } - getItemsContent(items) { + /** + * @name FileProviderMethods.getItemContent + * @publicName getItemContent() + * @param1 items:Array + * @return Promise + */ + getItemContent(items) { } getFileUploadChunkSize() { diff --git a/js/ui/file_manager/file_provider/remote.js b/js/ui/file_manager/file_provider/remote.js index 8d794c7fb4e3..6d69b5342089 100644 --- a/js/ui/file_manager/file_provider/remote.js +++ b/js/ui/file_manager/file_provider/remote.js @@ -150,7 +150,7 @@ class RemoteFileProvider extends FileProvider { setTimeout(() => $form.remove()); } - getItemsContent(items) { + getItemContent(items) { const args = this._getDownloadArgs(items); const formData = new window.FormData(); diff --git a/js/ui/file_manager/ui.file_manager.command_manager.js b/js/ui/file_manager/ui.file_manager.command_manager.js index f53f7683638d..acc7acb4650f 100644 --- a/js/ui/file_manager/ui.file_manager.command_manager.js +++ b/js/ui/file_manager/ui.file_manager.command_manager.js @@ -15,24 +15,27 @@ export class FileManagerCommandManager { { name: "create", text: "New folder", - icon: "plus", + icon: "newfolder", enabled: this._permissions.create, noFileItemRequired: true }, { name: "rename", text: "Rename", + icon: "rename", enabled: this._permissions.rename, isSingleFileItemCommand: true }, { name: "move", text: "Move", + icon: "movetofolder", enabled: this._permissions.move }, { name: "copy", text: "Copy", + icon: "copy", enabled: this._permissions.copy }, { diff --git a/js/ui/file_manager/ui.file_manager.editing.js b/js/ui/file_manager/ui.file_manager.editing.js index 7279d06d5d45..0a24bc5a8d1d 100644 --- a/js/ui/file_manager/ui.file_manager.editing.js +++ b/js/ui/file_manager/ui.file_manager.editing.js @@ -168,8 +168,8 @@ class FileManagerEditingControl extends Widget { action: arg => this._download(arg) }, - getItemsContent: { - action: arg => this._getItemsContent(arg) + getItemContent: { + action: arg => this._getItemContent(arg) } }; @@ -303,9 +303,9 @@ class FileManagerEditingControl extends Widget { return this._controller.downloadItems(itemInfos); } - _getItemsContent(itemInfos) { + _getItemContent(itemInfos) { itemInfos = itemInfos || this._model.getMultipleSelectedItems(); - return this._controller.getItemsContent(itemInfos); + return this._controller.getItemContent(itemInfos); } _completeAction(operationInfo, context) { diff --git a/js/ui/file_manager/ui.file_manager.toolbar.js b/js/ui/file_manager/ui.file_manager.toolbar.js index dea0f2eb1737..ea773ce927f3 100644 --- a/js/ui/file_manager/ui.file_manager.toolbar.js +++ b/js/ui/file_manager/ui.file_manager.toolbar.js @@ -53,18 +53,21 @@ const DEFAULT_ITEM_CONFIGS = { move: { location: "before", compactMode: { + showText: "inMenu", locateInMenu: "auto" } }, copy: { location: "before", compactMode: { + showText: "inMenu", locateInMenu: "auto" } }, rename: { location: "before", compactMode: { + showText: "inMenu", locateInMenu: "auto" } }, diff --git a/js/ui/gantt/ui.gantt.dialogs.js b/js/ui/gantt/ui.gantt.dialogs.js index 686b393527ed..205f7464a09f 100644 --- a/js/ui/gantt/ui.gantt.dialogs.js +++ b/js/ui/gantt/ui.gantt.dialogs.js @@ -1,5 +1,6 @@ import Popup from "../popup"; import Form from "../form"; +import "../tag_box"; export class GanttDialog { constructor(owner, $element) { diff --git a/js/ui/gantt/ui.gantt.js b/js/ui/gantt/ui.gantt.js index 7727df3fba9e..06bfc5639090 100644 --- a/js/ui/gantt/ui.gantt.js +++ b/js/ui/gantt/ui.gantt.js @@ -361,7 +361,8 @@ class Gantt extends Widget { } } _updateTreeListDataSource() { - this._setTreeListOption("dataSource", this.option("tasks.dataSource")); + const storeArray = this._tasksOption._getStore()._array; + this._setTreeListOption("dataSource", storeArray ? storeArray : this.option("tasks.dataSource")); } _getLoadPanel() { diff --git a/js/ui/scheduler/ui.scheduler.js b/js/ui/scheduler/ui.scheduler.js index 5796f89f1c31..07cc69d8176c 100644 --- a/js/ui/scheduler/ui.scheduler.js +++ b/js/ui/scheduler/ui.scheduler.js @@ -605,8 +605,7 @@ const Scheduler = Widget.inherit({ * @type_function_param1_field2 cancel:boolean * @type_function_param1_field3 itemData:any * @type_function_param1_field4 itemElement:dxElement - * @type_function_param1_field5 fromIndex:number - * @type_function_param1_field6 fromData:any + * @type_function_param1_field5 fromData:any */ /** * @name dxSchedulerOptions.appointmentDragging.onDragMove @@ -616,13 +615,10 @@ const Scheduler = Widget.inherit({ * @type_function_param1_field2 cancel:boolean * @type_function_param1_field3 itemData:any * @type_function_param1_field4 itemElement:dxElement - * @type_function_param1_field5 fromIndex:number - * @type_function_param1_field6 toIndex:number - * @type_function_param1_field7 fromComponent:dxSortable|dxDraggable - * @type_function_param1_field8 toComponent:dxSortable|dxDraggable - * @type_function_param1_field9 fromData:any - * @type_function_param1_field10 toData:any - * @type_function_param1_field11 dropInsideItem:boolean + * @type_function_param1_field5 fromComponent:dxSortable|dxDraggable + * @type_function_param1_field6 toComponent:dxSortable|dxDraggable + * @type_function_param1_field7 fromData:any + * @type_function_param1_field8 toData:any */ /** * @name dxSchedulerOptions.appointmentDragging.onDragEnd @@ -632,13 +628,10 @@ const Scheduler = Widget.inherit({ * @type_function_param1_field2 cancel:boolean * @type_function_param1_field3 itemData:any * @type_function_param1_field4 itemElement:dxElement - * @type_function_param1_field5 fromIndex:number - * @type_function_param1_field6 toIndex:number - * @type_function_param1_field7 fromComponent:dxSortable|dxDraggable - * @type_function_param1_field8 toComponent:dxSortable|dxDraggable - * @type_function_param1_field9 fromData:any - * @type_function_param1_field10 toData:any - * @type_function_param1_field11 dropInsideItem:boolean + * @type_function_param1_field5 fromComponent:dxSortable|dxDraggable + * @type_function_param1_field6 toComponent:dxSortable|dxDraggable + * @type_function_param1_field7 fromData:any + * @type_function_param1_field8 toData:any */ /** * @name dxSchedulerOptions.appointmentDragging.onAdd @@ -647,12 +640,10 @@ const Scheduler = Widget.inherit({ * @type_function_param1_field1 event:event * @type_function_param1_field2 itemData:any * @type_function_param1_field3 itemElement:dxElement - * @type_function_param1_field4 fromIndex:number - * @type_function_param1_field5 toIndex:number - * @type_function_param1_field6 fromComponent:dxSortable|dxDraggable - * @type_function_param1_field7 toComponent:dxSortable|dxDraggable - * @type_function_param1_field9 fromData:any - * @type_function_param1_field10 toData:any + * @type_function_param1_field4 fromComponent:dxSortable|dxDraggable + * @type_function_param1_field5 toComponent:dxSortable|dxDraggable + * @type_function_param1_field6 fromData:any + * @type_function_param1_field7 toData:any */ /** * @name dxSchedulerOptions.appointmentDragging.onRemove @@ -661,11 +652,9 @@ const Scheduler = Widget.inherit({ * @type_function_param1_field1 event:event * @type_function_param1_field2 itemData:any * @type_function_param1_field3 itemElement:dxElement - * @type_function_param1_field4 fromIndex:number - * @type_function_param1_field5 toIndex:number - * @type_function_param1_field6 fromComponent:dxSortable|dxDraggable - * @type_function_param1_field7 toComponent:dxSortable|dxDraggable - * @type_function_param1_field8 fromData:any + * @type_function_param1_field4 fromComponent:dxSortable|dxDraggable + * @type_function_param1_field5 toComponent:dxSortable|dxDraggable + * @type_function_param1_field6 fromData:any */ showAllDayPanel: true, diff --git a/js/viz/core/themes/generic.carmine.js b/js/viz/core/themes/generic.carmine.js index 8ff04e256fb2..3bb0d19df5b0 100644 --- a/js/viz/core/themes/generic.carmine.js +++ b/js/viz/core/themes/generic.carmine.js @@ -1,5 +1,6 @@ var themeModule = require("../../themes"), registerTheme = themeModule.registerTheme, + registerThemeAlias = themeModule.registerThemeAlias, ACCENT_COLOR = "#f05b41", BACKGROUND_COLOR = "#fff", TITLE_COLOR = "#333", @@ -131,3 +132,5 @@ registerTheme({ } } }, "generic.light"); + +registerThemeAlias("generic.carmine.compact", "generic.carmine"); diff --git a/js/viz/core/themes/generic.contrast.js b/js/viz/core/themes/generic.contrast.js index 1451fd7fa16d..bf0334a5a99d 100644 --- a/js/viz/core/themes/generic.contrast.js +++ b/js/viz/core/themes/generic.contrast.js @@ -1,6 +1,6 @@ var themeModule = require("../../themes"), registerTheme = themeModule.registerTheme, - + registerThemeAlias = themeModule.registerThemeAlias, WHITE = "#ffffff", BLACK = "#000000", CONTRAST_ACTIVE = "#cf00da", @@ -337,6 +337,4 @@ registerTheme({ } }, "generic.light"); -registerTheme({ - name: "generic.contrast.compact" -}, "generic.contrast"); +registerThemeAlias("generic.contrast.compact", "generic.contrast"); diff --git a/js/viz/core/themes/generic.dark.js b/js/viz/core/themes/generic.dark.js index cf066b7998ed..c6ddc5adaad0 100644 --- a/js/viz/core/themes/generic.dark.js +++ b/js/viz/core/themes/generic.dark.js @@ -1,6 +1,6 @@ var themeModule = require("../../themes"), registerTheme = themeModule.registerTheme, - + registerThemeAlias = themeModule.registerThemeAlias, WHITE = "#ffffff", BLACK = "#000000", SOME_GREY = "#2b2b2b", @@ -262,6 +262,4 @@ registerTheme({ } }, "generic.light"); -registerTheme({ - name: "generic.dark.compact" -}, "generic.dark"); +registerThemeAlias("generic.dark.compact", "generic.dark"); diff --git a/js/viz/core/themes/generic.darkmoon.js b/js/viz/core/themes/generic.darkmoon.js index 39574dd586dc..f2ad4a5fb7ac 100644 --- a/js/viz/core/themes/generic.darkmoon.js +++ b/js/viz/core/themes/generic.darkmoon.js @@ -1,5 +1,6 @@ var themeModule = require("../../themes"), registerTheme = themeModule.registerTheme, + registerThemeAlias = themeModule.registerThemeAlias, ACCENT_COLOR = "#3debd3", BACKGROUND_COLOR = "#465672", TITLE_COLOR = "#fff", @@ -173,3 +174,5 @@ registerTheme({ } } }, "generic.dark"); + +registerThemeAlias("generic.darkmoon.compact", "generic.darkmoon"); diff --git a/js/viz/core/themes/generic.darkviolet.js b/js/viz/core/themes/generic.darkviolet.js index a1a4f799b6e8..eaacddb72750 100644 --- a/js/viz/core/themes/generic.darkviolet.js +++ b/js/viz/core/themes/generic.darkviolet.js @@ -1,5 +1,6 @@ var themeModule = require("../../themes"), registerTheme = themeModule.registerTheme, + registerThemeAlias = themeModule.registerThemeAlias, ACCENT_COLOR = "#9c63ff", BACKGROUND_COLOR = "#17171f", TITLE_COLOR = "#f5f6f7", @@ -156,3 +157,5 @@ registerTheme({ } } }, "generic.dark"); + +registerThemeAlias("generic.darkviolet.compact", "generic.darkviolet"); diff --git a/js/viz/core/themes/generic.greenmist.js b/js/viz/core/themes/generic.greenmist.js index 4f668749a6bf..e11f16a07726 100644 --- a/js/viz/core/themes/generic.greenmist.js +++ b/js/viz/core/themes/generic.greenmist.js @@ -1,5 +1,6 @@ var themeModule = require("../../themes"), registerTheme = themeModule.registerTheme, + registerThemeAlias = themeModule.registerThemeAlias, ACCENT_COLOR = "#3cbab2", BACKGROUND_COLOR = "#f5f5f5", TITLE_COLOR = "#28484f", @@ -141,3 +142,5 @@ registerTheme({ } } }, "generic.light"); + +registerThemeAlias("generic.greenmist.compact", "generic.greenmist"); diff --git a/js/viz/core/themes/generic.light.js b/js/viz/core/themes/generic.light.js index 0f687e67e115..0af300728bad 100644 --- a/js/viz/core/themes/generic.light.js +++ b/js/viz/core/themes/generic.light.js @@ -18,7 +18,8 @@ var WHITE = "#ffffff", OUTSIDE = "outside", themeModule = require("../../themes"), - registerTheme = themeModule.registerTheme; + registerTheme = themeModule.registerTheme, + registerThemeAlias = themeModule.registerThemeAlias; registerTheme({ name: "generic.light", @@ -1744,6 +1745,4 @@ registerTheme({ } }); -registerTheme({ - name: "generic.light.compact" -}, "generic.light"); +registerThemeAlias("generic.light.compact", "generic.light"); diff --git a/js/viz/core/themes/generic.softblue.js b/js/viz/core/themes/generic.softblue.js index a425e165c267..9c517cbc37bf 100644 --- a/js/viz/core/themes/generic.softblue.js +++ b/js/viz/core/themes/generic.softblue.js @@ -1,5 +1,6 @@ var themeModule = require("../../themes"), registerTheme = themeModule.registerTheme, + registerThemeAlias = themeModule.registerThemeAlias, ACCENT_COLOR = "#7ab8eb", BACKGROUND_COLOR = "#fff", TITLE_COLOR = "#333", @@ -131,3 +132,5 @@ registerTheme({ } } }, "generic.light"); + +registerThemeAlias("generic.softblue.compact", "generic.softblue"); diff --git a/styles/widgets/base/icons.less b/styles/widgets/base/icons.less index 66ef49daa222..a6f17c38f14b 100644 --- a/styles/widgets/base/icons.less +++ b/styles/widgets/base/icons.less @@ -221,7 +221,7 @@ .dx-icon-columnfield { .dx-font-icon("\f057"); } .dx-icon-rowfield { .dx-font-icon("\f058"); } - .dx-icon-datafield { .dx-font-icon("\f056"); } + .dx-icon-datafield { .dx-font-icon("\f101"); } .dx-icon-fields { .dx-font-icon("\f059"); } .dx-icon-fieldchooser { .dx-font-icon("\f05a"); } .dx-icon-columnchooser { .dx-font-icon("\f04d"); } @@ -276,7 +276,7 @@ .dx-icon-subscript { .dx-font-icon("\f082"); } .dx-icon-header { .dx-font-icon("\f083"); } .dx-icon-blockquote { .dx-font-icon("\f084"); } - .dx-icon-formula { .dx-icon-datafield; } + .dx-icon-formula { .dx-font-icon("\f056"); } .dx-icon-codeblock { .dx-font-icon("\f085"); } .dx-icon-orderedlist { .dx-font-icon("\f086"); } .dx-icon-bulletlist { .dx-font-icon("\f087"); } @@ -317,6 +317,7 @@ .dx-icon-newfolder { .dx-font-icon("\f123"); } .dx-icon-movetofolder { .dx-font-icon("\f121"); } .dx-icon-parentfolder { .dx-font-icon("\f122"); } + .dx-icon-rename { .dx-font-icon("\f109"); } .dx-icon-detailslayout { .dx-font-icon("\f10b"); } .dx-icon-contentlayout { .dx-font-icon("\f11e"); } diff --git a/styles/widgets/generic/list.generic.less b/styles/widgets/generic/list.generic.less index d3649058a9c2..12901695b05f 100644 --- a/styles/widgets/generic/list.generic.less +++ b/styles/widgets/generic/list.generic.less @@ -59,6 +59,8 @@ .dx-list-item-icon-container { width: @GENERIC_BASE_ICON_SIZE + @GENERIC_LIST_ITEM_HORIZONTAL_PADDING; + height: @GENERIC_BASE_ICON_SIZE; + vertical-align: top; } .dx-list-item-icon { diff --git a/styles/widgets/material/list.material.less b/styles/widgets/material/list.material.less index c568c6852d1c..68ec721ed487 100644 --- a/styles/widgets/material/list.material.less +++ b/styles/widgets/material/list.material.less @@ -66,6 +66,8 @@ .dx-list-item-icon-container { width: @MATERIAL_BASE_ICON_SIZE + @MATERIAL_LIST_ITEM_HORIZONTAL_PADDING; + height: @MATERIAL_BASE_ICON_SIZE; + vertical-align: bottom; } .dx-list-item-icon { diff --git a/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js b/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js index 760b7d93549b..ac439d1af9dd 100644 --- a/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js +++ b/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js @@ -154,7 +154,7 @@ const createTestData = () => { operationId: 1, details: [ { commonText: "Folder 3", imageUrl: "folder" }, - { commonText: "File 1.txt", imageUrl: "doc" }, + { commonText: "File 1.txt", imageUrl: "txtfile" }, { commonText: "File 2.jpg", imageUrl: "image" } ], type: "progress-addOperationDetails" @@ -179,7 +179,7 @@ const createTestData = () => { operationId: 1, details: [ { commonText: "Folder 3", imageUrl: "folder" }, - { commonText: "File 1.txt", imageUrl: "doc" }, + { commonText: "File 1.txt", imageUrl: "txtfile" }, { commonText: "File 2.jpg", imageUrl: "image" } ], type: "progress-addOperationDetails" @@ -213,7 +213,7 @@ const createTestData = () => { { operationId: 1, details: [ - { commonText: "File 1.txt", imageUrl: "doc" }, + { commonText: "File 1.txt", imageUrl: "txtfile" }, { commonText: "File 2.jpg", imageUrl: "image" } ], type: "progress-addOperationDetails" @@ -221,7 +221,7 @@ const createTestData = () => { { operationId: 1, index: 0, errorText: "Unspecified error.", type: "progress-addOperationDetailsError" }, { errorText: "Unspecified error.", type: "progress-renderError" }, { - item: { commonText: "File 1.txt", imageUrl: "doc" }, + item: { commonText: "File 1.txt", imageUrl: "txtfile" }, errorText: "Unspecified error.", type: "progress-createErrorDetailsProgressBox" }, @@ -302,8 +302,8 @@ const createTestData = () => { { operationId: 1, details: [ - { commonText: "Upload file 0.txt", imageUrl: "doc" }, - { commonText: "Upload file 1.txt", imageUrl: "doc" } + { commonText: "Upload file 0.txt", imageUrl: "txtfile" }, + { commonText: "Upload file 1.txt", imageUrl: "txtfile" } ], allowCancel: true, type: "progress-addOperationDetails" @@ -328,8 +328,8 @@ const createTestData = () => { { operationId: 1, details: [ - { commonText: "Upload file 0.txt", imageUrl: "doc" }, - { commonText: "Upload file 1.txt", imageUrl: "doc" } + { commonText: "Upload file 0.txt", imageUrl: "txtfile" }, + { commonText: "Upload file 1.txt", imageUrl: "txtfile" } ], allowCancel: true, type: "progress-addOperationDetails" }, @@ -338,7 +338,7 @@ const createTestData = () => { { operationId: 1, index: 1, errorText: "Unspecified error.", type: "progress-addOperationDetailsError" }, { errorText: "Unspecified error.", type: "progress-renderError" }, { - item: { commonText: "Upload file 1.txt", imageUrl: "doc" }, + item: { commonText: "Upload file 1.txt", imageUrl: "txtfile" }, errorText: "Unspecified error.", type: "progress-createErrorDetailsProgressBox" }, @@ -359,8 +359,8 @@ const createTestData = () => { { operationId: 1, details: [ - { commonText: "Upload file 0.txt", imageUrl: "doc" }, - { commonText: "Upload file 1.txt", imageUrl: "doc" } + { commonText: "Upload file 0.txt", imageUrl: "txtfile" }, + { commonText: "Upload file 1.txt", imageUrl: "txtfile" } ], allowCancel: true, type: "progress-addOperationDetails" }, @@ -368,13 +368,13 @@ const createTestData = () => { { operationId: 1, itemIndex: 1, itemProgress: 40, commonProgress: 50, type: "progress-updateOperationItemProgress" }, { operationId: 1, index: 0, errorText: "Unspecified error.", type: "progress-addOperationDetailsError" }, { errorText: "Unspecified error.", type: "progress-renderError" }, - { item: { commonText: "Upload file 0.txt", imageUrl: "doc" }, errorText: "Unspecified error.", type: "progress-createErrorDetailsProgressBox" }, + { item: { commonText: "Upload file 0.txt", imageUrl: "txtfile" }, errorText: "Unspecified error.", type: "progress-createErrorDetailsProgressBox" }, { errorText: "Unspecified error.", type: "progress-renderError" }, { errorMode: true, commonText: "Item wasn't uploaded", detailsText: "Upload file 0.txtUnspecified error.", type: "notification-_showPopup" }, { message: "Item wasn't uploaded", status: "error", type: "notification-onActionProgress" }, { operationId: 1, index: 1, errorText: "Unspecified error.", type: "progress-addOperationDetailsError" }, { errorText: "Unspecified error.", type: "progress-renderError" }, - { item: { commonText: "Upload file 1.txt", imageUrl: "doc" }, errorText: "Unspecified error.", type: "progress-createErrorDetailsProgressBox" }, + { item: { commonText: "Upload file 1.txt", imageUrl: "txtfile" }, errorText: "Unspecified error.", type: "progress-createErrorDetailsProgressBox" }, { errorText: "Unspecified error.", type: "progress-renderError" }, { errorMode: true, commonText: "2 items weren't uploaded", detailsText: "Upload file 1.txtUnspecified error.", type: "notification-_showPopup" }, { message: "2 items weren't uploaded", status: "error", type: "notification-onActionProgress" }, @@ -389,8 +389,8 @@ const createTestData = () => { { operationId: 1, details: [ - { commonText: "Upload file 0.txt", imageUrl: "doc" }, - { commonText: "Upload file 1.txt", imageUrl: "doc" } + { commonText: "Upload file 0.txt", imageUrl: "txtfile" }, + { commonText: "Upload file 1.txt", imageUrl: "txtfile" } ], allowCancel: true, type: "progress-addOperationDetails" }, @@ -411,8 +411,8 @@ const createTestData = () => { { operationId: 1, details: [ - { commonText: "Upload file 0.txt", imageUrl: "doc" }, - { commonText: "Upload file 1.txt", imageUrl: "doc" } + { commonText: "Upload file 0.txt", imageUrl: "txtfile" }, + { commonText: "Upload file 1.txt", imageUrl: "txtfile" } ], allowCancel: true, type: "progress-addOperationDetails" @@ -431,8 +431,8 @@ const createTestData = () => { { operationId: 1, details: [ - { commonText: "Upload file 0.txt", imageUrl: "doc" }, - { commonText: "Upload file 1.txt", imageUrl: "doc" } + { commonText: "Upload file 0.txt", imageUrl: "txtfile" }, + { commonText: "Upload file 1.txt", imageUrl: "txtfile" } ], allowCancel: true, type: "progress-addOperationDetails" @@ -451,8 +451,8 @@ const createTestData = () => { { operationId: 1, details: [ - { commonText: "Upload file 0.txt", imageUrl: "doc" }, - { commonText: "Upload file 1.txt", imageUrl: "doc" } + { commonText: "Upload file 0.txt", imageUrl: "txtfile" }, + { commonText: "Upload file 1.txt", imageUrl: "txtfile" } ], allowCancel: true, type: "progress-addOperationDetails" @@ -461,7 +461,7 @@ const createTestData = () => { { operationId: 1, itemIndex: 1, itemProgress: 40, commonProgress: 50, type: "progress-updateOperationItemProgress" }, { operationId: 1, index: 1, errorText: "Unspecified error.", type: "progress-addOperationDetailsError" }, { errorText: "Unspecified error.", type: "progress-renderError" }, - { item: { commonText: "Upload file 1.txt", imageUrl: "doc" }, errorText: "Unspecified error.", type: "progress-createErrorDetailsProgressBox" }, + { item: { commonText: "Upload file 1.txt", imageUrl: "txtfile" }, errorText: "Unspecified error.", type: "progress-createErrorDetailsProgressBox" }, { errorText: "Unspecified error.", type: "progress-renderError" }, { errorMode: true, commonText: "Item wasn't uploaded", detailsText: "Upload file 1.txtUnspecified error.", type: "notification-_showPopup" }, { message: "Item wasn't uploaded", status: "error", type: "notification-onActionProgress" }, diff --git a/testing/tests/DevExpress.ui.widgets/fileManagerParts/remoteProvider.tests.js b/testing/tests/DevExpress.ui.widgets/fileManagerParts/remoteProvider.tests.js index 8c4cc74ca8e4..93cbe4017b29 100644 --- a/testing/tests/DevExpress.ui.widgets/fileManagerParts/remoteProvider.tests.js +++ b/testing/tests/DevExpress.ui.widgets/fileManagerParts/remoteProvider.tests.js @@ -165,7 +165,7 @@ QUnit.module("Remote Provider", moduleConfig, () => { }); const item = new FileManagerItem(filesPathInfo, "Article.txt"); - this.provider.getItemsContent([ item ]) + this.provider.getItemContent([ item ]) .done(result => { assert.strictEqual(result.byteLength, 5, "item content acquired"); done(); diff --git a/testing/tests/DevExpress.ui.widgets/sortable.tests.js b/testing/tests/DevExpress.ui.widgets/sortable.tests.js index b54dcf964194..3fbd32fc1b3f 100644 --- a/testing/tests/DevExpress.ui.widgets/sortable.tests.js +++ b/testing/tests/DevExpress.ui.widgets/sortable.tests.js @@ -12,15 +12,20 @@ fx.off = true; QUnit.testStart(function() { let markup = - `
-
item1
-
item2
-
item3
+ ` +
+
item1
+
item2
+
item3
-
item4
-
item5
-
item6
+
item4
+
item5
+
item6
@@ -30,23 +35,23 @@ QUnit.testStart(function() {
-
item1
-
item2
-
item3
+
item1
+
item2
+
item3
-
item1
-
item2
-
item3
-
item4
-
item5
-
item6
-
item7
-
item8
-
item9
-
item10
+
item1
+
item2
+
item3
+
item4
+
item5
+
item6
+
item7
+
item8
+
item9
+
item10
`; @@ -144,6 +149,8 @@ QUnit.test("Default drag template", function(assert) { assert.strictEqual($draggingElement.outerHeight(), $items.eq(0).outerHeight(), "height is correct"); assert.strictEqual($items.get(0).style.width, "", "width style does not exist in item"); assert.strictEqual($draggingElement.get(0).style.width, "300px", "width style exists in dragging item"); + assert.strictEqual($items.get(0).style.height, "", "height style does not exist in item"); + assert.strictEqual($draggingElement.get(0).style.height, "30px", "height style exists in dragging item"); }); QUnit.module("allowReordering", moduleConfig); diff --git a/ts/dx.all.d.ts b/ts/dx.all.d.ts index d6e65544038d..3516be12fd9d 100644 --- a/ts/dx.all.d.ts +++ b/ts/dx.all.d.ts @@ -1691,6 +1691,8 @@ declare module DevExpress.fileProvider { /** @name FileProvider */ export class FileProvider { constructor(options?: FileProviderOptions) + /** @name FileProvider.getItemContent() */ + getItemContent(items: Array): Promise & JQueryPromise; } /** @name RemoteFileProvider.Options */ export interface RemoteFileProviderOptions extends FileProviderOptions { @@ -5048,7 +5050,7 @@ declare module DevExpress.ui { /** @name dxScheduler.Options.appointmentCollectorTemplate */ appointmentCollectorTemplate?: DevExpress.core.template | ((data: { appointmentCount?: number, isCompact?: boolean }, collectorElement: DevExpress.core.dxElement) => string | Element | JQuery); /** @name dxScheduler.Options.appointmentDragging */ - appointmentDragging?: { autoScroll?: boolean, data?: any, group?: string, onAdd?: ((e: { event?: event, itemData?: any, itemElement?: DevExpress.core.dxElement, fromIndex?: number, toIndex?: number, fromComponent?: dxSortable | dxDraggable, toComponent?: dxSortable | dxDraggable, fromData?: any, toData?: any }) => any), onDragEnd?: ((e: { event?: event, cancel?: boolean, itemData?: any, itemElement?: DevExpress.core.dxElement, fromIndex?: number, toIndex?: number, fromComponent?: dxSortable | dxDraggable, toComponent?: dxSortable | dxDraggable, fromData?: any, toData?: any, dropInsideItem?: boolean }) => any), onDragMove?: ((e: { event?: event, cancel?: boolean, itemData?: any, itemElement?: DevExpress.core.dxElement, fromIndex?: number, toIndex?: number, fromComponent?: dxSortable | dxDraggable, toComponent?: dxSortable | dxDraggable, fromData?: any, toData?: any, dropInsideItem?: boolean }) => any), onDragStart?: ((e: { event?: event, cancel?: boolean, itemData?: any, itemElement?: DevExpress.core.dxElement, fromIndex?: number, fromData?: any }) => any), onRemove?: ((e: { event?: event, itemData?: any, itemElement?: DevExpress.core.dxElement, fromIndex?: number, toIndex?: number, fromComponent?: dxSortable | dxDraggable, toComponent?: dxSortable | dxDraggable, fromData?: any }) => any), scrollSensitivity?: number, scrollSpeed?: number }; + appointmentDragging?: { autoScroll?: boolean, data?: any, group?: string, onAdd?: ((e: { event?: event, itemData?: any, itemElement?: DevExpress.core.dxElement, fromComponent?: dxSortable | dxDraggable, toComponent?: dxSortable | dxDraggable, fromData?: any, toData?: any }) => any), onDragEnd?: ((e: { event?: event, cancel?: boolean, itemData?: any, itemElement?: DevExpress.core.dxElement, fromComponent?: dxSortable | dxDraggable, toComponent?: dxSortable | dxDraggable, fromData?: any, toData?: any }) => any), onDragMove?: ((e: { event?: event, cancel?: boolean, itemData?: any, itemElement?: DevExpress.core.dxElement, fromComponent?: dxSortable | dxDraggable, toComponent?: dxSortable | dxDraggable, fromData?: any, toData?: any }) => any), onDragStart?: ((e: { event?: event, cancel?: boolean, itemData?: any, itemElement?: DevExpress.core.dxElement, fromData?: any }) => any), onRemove?: ((e: { event?: event, itemData?: any, itemElement?: DevExpress.core.dxElement, fromComponent?: dxSortable | dxDraggable, toComponent?: dxSortable | dxDraggable, fromData?: any }) => any), scrollSensitivity?: number, scrollSpeed?: number }; /** @name dxScheduler.Options.appointmentTemplate */ appointmentTemplate?: DevExpress.core.template | ((model: { appointmentData?: any, targetedAppointmentData?: any }, itemIndex: number, contentElement: DevExpress.core.dxElement) => string | Element | JQuery); /** @name dxScheduler.Options.appointmentTooltipTemplate */