Merge pull request #1615 from xaylpq/2.1/feature/cropper

add image component and crooper popup
comindware · Jul 24, 2021 · 7975ac9 · 7975ac9
2 parents 9bf55f9 + e2fd313
commit 7975ac9
Show file tree

Hide file tree

Showing 32 changed files with 1,432 additions and 179 deletions.
diff --git a/dist/localization/localization.de.json b/dist/localization/localization.de.json
diff --git a/dist/localization/localization.en.json b/dist/localization/localization.en.json
diff --git a/dist/localization/localization.ru.json b/dist/localization/localization.ru.json
diff --git a/localization/localization.n3 b/localization/localization.n3
@@ -81,6 +81,8 @@
 
 <http://comindware.com/text/core/form/editors#iconEditor> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Pavel Koroteev"; l10n:modifiedBy "Pavel Koroteev"; l10n:creationDate "2018-06-18T13:26:59.3305350Z"; l10n:modificationDate "2018-06-18T13:26:59.3305350Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "iconEditor"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
+<http://comindware.com/text/core/form/editors#image> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anatoly Vasilkov"; l10n:modifiedBy "Anatoly Vasilkov"; l10n:creationDate "2021-07-22T10:06:18.1638623Z"; l10n:modificationDate "2021-07-22T10:06:33.4909420Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "image"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
 <http://comindware.com/text/core/form/editors#memberSelect> a l10n:Resource; l10n:descr ""; l10n:isLocalizable false; l10n:createdBy "Nikita Sushkov"; l10n:modifiedBy "Stepan Burguchev"; l10n:creationDate "2015-04-03T08:28:19.8716374Z"; l10n:modificationDate "2016-01-13T11:27:49.3334398Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data ""].
 
 <http://comindware.com/text/core/form/editors#memberSplit> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Vladislav Smirnov"; l10n:modifiedBy "Vladislav Smirnov"; l10n:creationDate "2017-10-04T05:46:27.8934835Z"; l10n:modificationDate "2017-10-04T05:46:27.8934835Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "memberSplit"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
@@ -203,6 +205,8 @@
 
 <http://comindware.com/text/core/form/editors/date#timeEmptyPlaceholder> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy ""; l10n:modifiedBy ""; l10n:creationDate "2018-12-28T14:07:46.1865255Z"; l10n:modificationDate "2018-12-28T14:07:54.8964798Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Time"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
+<http://comindware.com/text/core/form/editors/document#actions> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anatoly Vasilkov"; l10n:modifiedBy "Anatoly Vasilkov"; l10n:creationDate "2021-07-22T10:10:44.8522245Z"; l10n:modificationDate "2021-07-22T10:10:46.8252343Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Actions"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
 <http://comindware.com/text/core/form/editors/document#add> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Stanislav Guryev"; l10n:modifiedBy "Stanislav Guryev"; l10n:creationDate "2017-09-08T08:12:19.0255774Z"; l10n:modificationDate "2017-09-08T08:12:20.3247034Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Add"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
 <http://comindware.com/text/core/form/editors/document#addDocument> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Vladislav Smirnov"; l10n:modifiedBy "Vladislav Smirnov"; l10n:creationDate "2017-10-04T06:52:27.8250251Z"; l10n:modificationDate "2017-10-04T06:52:34.9735464Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Add document"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
@@ -231,7 +235,7 @@
 
 <http://comindware.com/text/core/form/editors/document#replaceDocument> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy ""; l10n:modifiedBy ""; l10n:creationDate "2019-07-09T10:06:17.7504206Z"; l10n:modificationDate "2019-07-09T10:06:24.9246017Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Replace document"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
-<http://comindware.com/text/core/form/editors/document#showMore> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Stanislav Guryev"; l10n:modifiedBy "Stanislav Guryev"; l10n:creationDate "2017-10-09T08:38:18.2704724Z"; l10n:modificationDate "2017-10-09T08:38:22.2657797Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Show more..."; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+<http://comindware.com/text/core/form/editors/document#showMore> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Stanislav Guryev"; l10n:modifiedBy "Stanislav Guryev"; l10n:creationDate "2017-10-09T08:38:18.2704724Z"; l10n:modificationDate "2017-10-09T08:38:22.2657797Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Show more"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
 <http://comindware.com/text/core/form/editors/document#showRevision> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Stanislav Guryev"; l10n:modifiedBy "Stanislav Guryev"; l10n:creationDate "2017-10-09T08:38:41.7262815Z"; l10n:modificationDate "2017-10-09T08:38:42.9943793Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "History"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
@@ -317,6 +321,16 @@
 
 <http://comindware.com/text/core/form/editors/iconEditor#searchTitle> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Pavel Koroteev"; l10n:modifiedBy "Pavel Koroteev"; l10n:creationDate "2018-06-18T13:27:12.6528671Z"; l10n:modificationDate "2018-06-18T13:27:15.1511169Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Search result"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
+<http://comindware.com/text/core/form/editors/image#addImage> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anatoly Vasilkov"; l10n:modifiedBy "Anatoly Vasilkov"; l10n:creationDate "2021-07-23T10:38:49.8891440Z"; l10n:modificationDate "2021-07-23T10:38:51.3961478Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Add Image"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/image#cancelCrop> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anatoly Vasilkov"; l10n:modifiedBy "Anatoly Vasilkov"; l10n:creationDate "2021-07-22T10:08:13.8034536Z"; l10n:modificationDate "2021-07-22T10:08:55.4416637Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Cancel Crop"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/image#cropper> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anatoly Vasilkov"; l10n:modifiedBy "Anatoly Vasilkov"; l10n:creationDate "2021-07-22T10:06:50.2150262Z"; l10n:modificationDate "2021-07-22T10:06:52.1830353Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Cropper"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/image#cut> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anatoly Vasilkov"; l10n:modifiedBy "Anatoly Vasilkov"; l10n:creationDate "2021-07-22T10:09:13.7787690Z"; l10n:modificationDate "2021-07-22T10:09:15.4408071Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Cut"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
+<http://comindware.com/text/core/form/editors/image#dragfile> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Anatoly Vasilkov"; l10n:modifiedBy "Anatoly Vasilkov"; l10n:creationDate "2021-07-23T10:36:33.9025292Z"; l10n:modificationDate "2021-07-23T10:37:06.9487068Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Drag file for download <br>  or <br>"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
+
 <http://comindware.com/text/core/form/editors/memberSelect#allUsers> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:needsReview true; l10n:createdBy "Vladislav Smirnov"; l10n:modifiedBy "Vladislav Smirnov"; l10n:creationDate "2018-08-14T12:57:49.5459291Z"; l10n:modificationDate "2018-08-14T12:57:51.0947262Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "All users"; l10n:originalData "{62D69EB8-800C-480F-9571-E11F3DF477C0}"].
 
 <http://comindware.com/text/core/form/editors/memberSelect#notSet> a l10n:Resource; l10n:descr ""; l10n:isLocalizable true; l10n:exportToJs true; l10n:createdBy "Nikita Sushkov"; l10n:modifiedBy "Stepan Burguchev"; l10n:creationDate "2015-04-03T08:30:22.5126374Z"; l10n:modificationDate "2016-01-13T11:27:49.3334398Z"; l10n:text [a l10n:Text; l10n:lang l10n:en; l10n:data "Not set"].

diff --git a/localization/localization.ru.n3 b/localization/localization.ru.n3
@@ -108,6 +108,8 @@
 
 <http://comindware.com/text/core/form/editors/date#timeEmptyPlaceholder> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Время"; l10n:originalData "Time"].
 
+<http://comindware.com/text/core/form/editors/document#actions> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Действия"; l10n:originalData "Actions"].
+
 <http://comindware.com/text/core/form/editors/document#add> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Добавить"; l10n:originalData "Add"].
 
 <http://comindware.com/text/core/form/editors/document#addDocument> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Добавить документ"; l10n:originalData "addDocument"].
@@ -130,7 +132,7 @@
 
 <http://comindware.com/text/core/form/editors/document#replaceDocument> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Заменить документ"; l10n:originalData "Replace document"].
 
-<http://comindware.com/text/core/form/editors/document#showMore> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Показать больше..."; l10n:originalData "Show more..."].
+<http://comindware.com/text/core/form/editors/document#showMore> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Показать больше"; l10n:originalData "Show more"].
 
 <http://comindware.com/text/core/form/editors/document#showRevision> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "История"; l10n:originalData "History"].
 
@@ -206,6 +208,16 @@
 
 <http://comindware.com/text/core/form/editors/iconEditor#searchTitle> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Результаты поиска"; l10n:originalData "searchTitle"].
 
+<http://comindware.com/text/core/form/editors/image#addImage> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Добавить изображение"; l10n:originalData "Add Image"].
+
+<http://comindware.com/text/core/form/editors/image#cancelCrop> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Отменить обрезку"; l10n:originalData "Cancel Crop"].
+
+<http://comindware.com/text/core/form/editors/image#cropper> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Кроппер"; l10n:originalData "Cropper"].
+
+<http://comindware.com/text/core/form/editors/image#cut> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Обрезать"; l10n:originalData "Cut"].
+
+<http://comindware.com/text/core/form/editors/image#dragfile> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Перетащите сюда изображение <br> или <br>"; l10n:originalData "Drag file for download <br>  or <br>"].
+
 <http://comindware.com/text/core/form/editors/memberSelect#allUsers> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Все пользователи"; l10n:originalData "allUsers"].
 
 <http://comindware.com/text/core/form/editors/memberSelect#notSet> l10n:text [a l10n:Text; l10n:lang l10n:ru; l10n:data "Не задано"; l10n:originalData "Not set"].

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -146,6 +146,7 @@
         "backbone.radio": "^2.0.0",
         "codemirror": "^5.62.0",
         "core-js": "^3.6.4",
+        "cropperjs": "^1.5.12",
         "css-vars-ponyfill": "^2.2.1",
         "jquery": "^3.5.1",
         "marionette.approuter": "^1.0.2",

diff --git a/resources/styles/applyStyles.css b/resources/styles/applyStyles.css
@@ -382,7 +382,6 @@ input::placeholder {
     padding: 0 5px;
 }
 
-
 .toolbar-btn__text {
     vertical-align: baseline;
 }