Compare commits

...

357 commits

Author SHA1 Message Date
SergeyEzhin d2bb8869ba [DE mobile] Correct the display and hide of the notification window 2022-10-31 18:37:09 +04:00
SergeyEzhin edaa81b086 [DE mobile] For Bug 49836 2022-10-28 21:16:03 +04:00
Maxim Kadushkin 1c66765645 [desktop] changed supported features info 2022-10-26 12:29:48 +03:00
Julia Radzhabova 1fad3f9da3
Merge pull request #2028 from ONLYOFFICE/fix/bug-59288
Bug 59288
2022-10-25 23:58:29 +03:00
Julia Radzhabova 2311fd7975
Merge pull request #2027 from ONLYOFFICE/feature/save-as-picture
[DE] Added item "Show as picture" in context menu
2022-10-25 22:13:58 +03:00
Julia Radzhabova 4a4d4d0832 [PE] Refactoring 2022-10-25 22:12:37 +03:00
Julia Radzhabova 52b16899d5 [DE] Fix button name for offline files 2022-10-25 21:50:44 +03:00
maxkadushkin a0bb8ee115
Merge pull request #2026 from ONLYOFFICE/feateure/changed-icons
Changed icons
2022-10-25 21:22:03 +03:00
Kirill Volkov 8de0da306a Changed icons
Changed  home, print, save icons
2022-10-25 18:27:09 +03:00
Alexei Koshelev 36c3aeb576 [DE] Added item "Show as picture" in context menu 2022-10-25 17:11:56 +03:00
OVSharova 97d106c3fa bug 59288 2022-10-25 15:50:27 +03:00
Julia Radzhabova 36e40891dd
Merge pull request #2024 from ONLYOFFICE/fix/bug-lock-comments
Fix/bug lock comments
2022-10-24 21:21:44 +03:00
Julia Radzhabova 3ab4211953
Merge pull request #2023 from ONLYOFFICE/feature/search-in-menu
Feature/search in menu
2022-10-24 20:58:03 +03:00
Julia Radzhabova 9a6034b611 [DE] Fix opening protected document (show comment buttons after unprotect) 2022-10-24 20:55:55 +03:00
JuliaSvinareva ea0d07ad89 [SSE] Fix bug 59466 2022-10-24 20:52:46 +03:00
Alexei Koshelev e9b04b91fb [SSE] Lock comments when selected not a cell for comment editor 2022-10-24 18:49:15 +03:00
maxkadushkin e6a459ac53
Merge pull request #2021 from ONLYOFFICE/feature/for-bug-45489
Feature/for bug 45489
2022-10-24 16:55:45 +03:00
Maxim Kadushkin d7f64f49dd Merge branch 'develop' into feature/for-bug-45489 2022-10-24 16:43:54 +03:00
Julia Radzhabova e525e97ede [Mobile] Update translation 2022-10-24 12:00:08 +03:00
Julia Radzhabova 2870705ddf Update translation 2022-10-24 11:51:44 +03:00
Alexei Koshelev db8816c05f [SSE] Lock comments when selected not a cell 2022-10-22 21:33:14 +03:00
maxkadushkin a49071c6e3
Merge pull request #2020 from ONLYOFFICE/feature/update-webpack-config
Feature/update webpack config
2022-10-20 17:14:30 +03:00
maxkadushkin 411de187d5
Merge pull request #2016 from ONLYOFFICE/feature/fix-bugs
[SSE mobile] For Bug 59015
2022-10-20 15:06:00 +03:00
Alexei Koshelev 3b2162dc61 Updating search in Combobox component 2022-10-20 14:49:59 +03:00
SergeyEzhin b9b7a9d7e3 [PE SSE mobile] Corrected imports 2022-10-20 15:04:07 +04:00
Julia Radzhabova 8b438a0c15 [PE] Fix position for special paste button (handle paste to slide list) 2022-10-20 12:57:48 +03:00
SergeyEzhin a067234b87 [DE mobile] Correct imports f7 and searchbar 2022-10-20 12:46:24 +04:00
Julia Radzhabova c6ac57592f
Merge pull request #2018 from ONLYOFFICE/fix/bug-55070
Bug 55070
2022-10-20 01:02:05 +03:00
OVSharova dd01e61d7d bug 55070 2022-10-19 22:37:51 +03:00
OVSharova 0ff0ed3a15 bug 55070 2022-10-19 22:32:08 +03:00
OVSharova 9ee9022c9e bug 55070 2022-10-19 21:46:51 +03:00
Julia Radzhabova db9040247a
Merge pull request #2017 from ONLYOFFICE/fix/bug-59179
bug 59179
2022-10-19 16:54:32 +03:00
Julia Radzhabova 6f1d3f03a9 [DE] Lock document info for protected document and for other preview modes (view form, final/original) 2022-10-19 14:49:24 +03:00
OVSharova a01b33e66a bug 59179 2022-10-19 12:08:29 +03:00
SergeyEzhin 3bfca10bcd [DE mobile] Correct creating searchbar 2022-10-18 21:51:12 +04:00
Alexei Koshelev 4d87c6d817 Updating search in menu component 2022-10-18 16:41:55 +03:00
OVSharova 6314ed452c bug 55070 2022-10-18 16:00:45 +03:00
Julia Radzhabova b9c5b2b014
Merge pull request #2015 from ONLYOFFICE/feature/tags
[SSE DE PE] Added tag field in the file menu
2022-10-17 18:52:16 +03:00
SergeyEzhin b65436ed34 [SSE mobile] For Bug 59015 2022-10-17 19:28:21 +04:00
maxkadushkin 9238abfab6
Merge pull request #2005 from ONLYOFFICE/feature/fix-bugs
[DE mobile] Fix Bug 56709
2022-10-17 12:01:44 +03:00
Julia Radzhabova fcba6435a9
Merge pull request #2013 from ONLYOFFICE/feature/multiselect-for-DataView
Multiselect for data view
2022-10-17 11:58:04 +03:00
Julia Radzhabova 72b8f3434f Refactoring 2022-10-17 11:51:59 +03:00
OVSharova b21a33601e removed check for multiselect 2022-10-15 16:16:42 +03:00
Alexei Koshelev 65c57c8907 [SSE DE PE] Added tag field in the file menu 2022-10-15 14:54:16 +03:00
OVSharova 4ac240a7b1 fix bugs 2022-10-15 14:48:58 +03:00
Julia Radzhabova 9416f27fbc Merge branch 'hotfix/v7.2.1' into develop 2022-10-15 14:10:35 +03:00
JuliaSvinareva 5b29700cc5 [DE] Update smart art locks 2022-10-14 19:21:51 +03:00
Julia Radzhabova e0a41415db Update translation 2022-10-14 17:49:05 +03:00
JuliaSvinareva adaf850a07
Merge pull request #2010 from ONLYOFFICE/feature/smart-arts
Feature/smart arts
2022-10-14 16:11:50 +03:00
JuliaSvinareva b18d2731c5
Merge branch 'develop' into feature/smart-arts 2022-10-14 15:58:15 +03:00
Julia Radzhabova c739605f27 Fix Bug 59140 2022-10-14 12:34:28 +03:00
Julia Radzhabova cdd90486ed
Merge pull request #2006 from ONLYOFFICE/feature/de-protect
Feature/de protect
2022-10-13 19:25:29 +03:00
Julia Radzhabova ef395c554a Add translation 2022-10-13 19:13:23 +03:00
Julia Radzhabova 5c0b841223 [DE] Set max length of password for document protection 2022-10-13 18:56:03 +03:00
SergeyEzhin 5edf90c839 Change config and imports to es modules and update framework7 2022-10-13 19:19:39 +04:00
JuliaSvinareva 06e4830a4b [DE PE SSE] Fix align position of smart arts menu 2022-10-13 12:13:20 +03:00
JuliaSvinareva 69a3409a42 [DE PE SSE] Add translations 2022-10-13 11:38:37 +03:00
JuliaSvinareva fbff110ab6 [DE PE SSE] Fix locking of insert smart art button 2022-10-13 11:09:10 +03:00
OVSharova 3d7df44625 refactoring 2022-10-13 08:14:19 +03:00
SergeyEzhin d5a269975c [DE mobile] Fix Bug 56709 2022-10-13 02:00:13 +04:00
JuliaSvinareva 47afd293fc [PE SSE] Add smartarts 2022-10-12 21:17:43 +03:00
Julia Radzhabova c03c7638d9 Fix bug 2022-10-12 19:41:17 +03:00
Julia Radzhabova 9feabc6ac3 Refactoring 2022-10-12 18:40:35 +03:00
Julia Radzhabova 8d28f72669 [PE] Fix first markers loading 2022-10-12 18:08:52 +03:00
Julia Radzhabova b33739c8b2 Fix active menu items in help panel in IE11 2022-10-12 16:53:08 +03:00
JuliaSvinareva 72886c7837 [DE PE SSE] Fix smart arts 2022-10-12 15:28:33 +03:00
Julia Radzhabova 548ea8f2e6
Merge pull request #2003 from ONLYOFFICE/fix/sse-table-styles
[SSE] Fix bug in template table for right menu
2022-10-12 15:25:37 +03:00
Alexei Koshelev cec32c8470 [SSE] Fix bug in template table for right menu 2022-10-12 15:15:39 +03:00
Julia Radzhabova bd6b1c9ab3 Remove unused icons 2022-10-11 20:54:21 +03:00
Julia Radzhabova b024ca02a1 [PE] Add translation 2022-10-11 20:51:44 +03:00
Julia Radzhabova bf6e8931cd
Merge pull request #2002 from ONLYOFFICE/feature/pe-viewtab
Feature/pe viewtab
2022-10-11 20:43:12 +03:00
Julia Radzhabova 011e141c76 Merge branch 'develop' into feature/pe-viewtab 2022-10-11 18:55:56 +03:00
Julia Radzhabova c984d62e9a [PE] Show guides when new guide is added 2022-10-11 18:55:06 +03:00
JuliaSvinareva aacbfa787e
Merge pull request #2000 from ONLYOFFICE/fix/hints-mac
Fix/hints mac
2022-10-11 17:18:35 +03:00
JuliaSvinareva d243e2b6d6
Merge branch 'develop' into fix/hints-mac 2022-10-11 17:10:18 +03:00
JuliaSvinareva 0d2359bdb6 [DE PE SSE] Turn off alt hints on mac in FireFox (there is shortcut F6 to select link in address bar) 2022-10-11 17:01:54 +03:00
Julia Radzhabova e276fad40c
Merge pull request #1999 from ONLYOFFICE/feature/textbox
Feature/textbox
2022-10-11 16:43:55 +03:00
Alexei Koshelev b50d78c212 [SSE PE DE] Change icons for textbox 2022-10-11 16:13:17 +03:00
Julia Radzhabova 51eec23f3f Merge branch 'develop' into feature/textbox 2022-10-11 15:48:49 +03:00
Julia Radzhabova 127efb3216 Remove unused icons. Fix sprite css (menu icons inside huge buttons, when have same names) 2022-10-11 15:47:14 +03:00
Julia Radzhabova 617ba207bf Remove unused icons 2022-10-11 12:26:55 +03:00
OVSharova 8ca9e3831f ctrl with arrows 2022-10-11 01:53:22 +03:00
Kirill Volkov 1b718a516e Add new icons
Added new icons. Changed btn-text icon.
2022-10-10 22:50:14 +03:00
Julia Radzhabova b17377a916 [DE] Add icon cls 2022-10-10 22:47:34 +03:00
Kirill Volkov 412f616526 Add new icons
Added new icons. Changed btn-text icon.
2022-10-10 22:44:51 +03:00
Julia Radzhabova 520762cc68 [SSE] Add icon cls 2022-10-10 22:17:17 +03:00
Julia Radzhabova 3b325b4cf5 [PE] Add icons 2022-10-10 22:12:58 +03:00
Kirill Volkov 8ca56d8aa2 Add new icons
Added new icons. Changed btn-text icon.
2022-10-10 21:15:46 +03:00
Julia Radzhabova 52a22a3daf
Merge pull request #1995 from ONLYOFFICE/feature/add-new-icons
Add new icons
2022-10-10 21:02:45 +03:00
Julia Radzhabova b393904138 Merge branch 'hotfix/v7.2.1' into develop 2022-10-10 19:05:14 +03:00
JuliaSvinareva 32e477f3e6 [DE PE SSE] Fix translation 2022-10-10 18:54:57 +03:00
Kirill Volkov f013939b4d Add new icons
Added new icons. Changed btn-text icon.
2022-10-10 16:29:59 +03:00
Julia Radzhabova 0f2568e5b1 [DE] Update hint in protected document 2022-10-10 15:09:46 +03:00
OVSharova cd64a361ba fix for Ctrl 2022-10-10 12:11:01 +03:00
OVSharova c2a7198713 fix bug 2022-10-10 11:45:31 +03:00
Julia Radzhabova 022c65cf3d [DE] Fix protection 2022-10-07 16:21:31 +03:00
Julia Radzhabova 6041671b5f Merge remote-tracking branch 'origin/develop' into develop 2022-10-07 15:49:51 +03:00
Julia Radzhabova c88be9df33 [Mobile] Update translation 2022-10-07 15:49:31 +03:00
Maxim Kadushkin c8ae3cc9c0 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2022-10-07 14:07:35 +03:00
Maxim Kadushkin ef1471e9b6 [deploy] updated dependencies 2022-10-07 14:07:09 +03:00
Julia Radzhabova 92e1a57ca3 Update translation 2022-10-07 13:42:55 +03:00
maxkadushkin 58c3ca396c
Merge pull request #1973 from ONLYOFFICE/dependabot/npm_and_yarn/build/sprites/jpeg-js-0.4.4
Bump jpeg-js from 0.4.3 to 0.4.4 in /build/sprites
2022-10-07 12:59:41 +03:00
maxkadushkin 43f7d68d6f
Merge pull request #1974 from ONLYOFFICE/dependabot/npm_and_yarn/build/terser-5.14.2
Bump terser from 5.12.1 to 5.14.2 in /build
2022-10-07 12:44:31 +03:00
maxkadushkin 90a2fb56de
Merge pull request #1804 from ONLYOFFICE/dependabot/npm_and_yarn/build/jpeg-js-0.4.4
Bump jpeg-js from 0.4.3 to 0.4.4 in /build
2022-10-07 12:42:36 +03:00
maxkadushkin f04c3937ce
Merge pull request #1975 from ONLYOFFICE/dependabot/npm_and_yarn/build/ejs-3.1.8
Bump ejs from 3.1.6 to 3.1.8 in /build
2022-10-07 12:40:32 +03:00
Julia Radzhabova 7672e7069d Merge branch 'feature/update-external-data' into develop 2022-10-07 12:18:24 +03:00
Julia Radzhabova 528f48d098 [DE] Change protect methods 2022-10-07 12:08:51 +03:00
maxkadushkin 23bf9a3395
Merge pull request #1976 from ONLYOFFICE/dependabot/npm_and_yarn/build/minimist-and-mkdirp-1.2.6
Bump minimist and mkdirp in /build
2022-10-07 00:06:02 +03:00
Alexei Koshelev e2a2052cdc [PE DE] [SSE] Improvement for textbox 2022-10-06 23:52:57 +03:00
Julia Radzhabova ed621f0921 [DE] Handle protection lock 2022-10-06 20:14:13 +03:00
JuliaSvinareva 4b32e904e3 [DE PE SSE] Change shortcut for alt hints on mac 2022-10-06 19:03:16 +03:00
maxkadushkin 14ae928ce4
Merge pull request #1992 from ONLYOFFICE/feature/fix-bugs
Feature/fix bugs
2022-10-06 16:58:05 +03:00
Julia Radzhabova 52283a3d2e [DE] Fix saving protection to document 2022-10-06 15:55:53 +03:00
SergeyEzhin be5f7b31bf
Merge branch 'develop' into feature/fix-bugs 2022-10-06 17:06:27 +05:00
SergeyEzhin eb6bc50a01 [DE PE SSE mobile] Fix Bug 59230 2022-10-06 17:04:20 +05:00
SergeyEzhin a1bddbb845 [DE PE SSE mobile] Fix Bug 59272 2022-10-06 17:03:49 +05:00
Julia Radzhabova b73380ba27 [DE] Handle PasswordIsNotCorrect error 2022-10-06 15:03:38 +03:00
SergeyEzhin 198df57eaf [DE mobile] Fix Bug 58321 2022-10-06 17:03:02 +05:00
Julia Radzhabova b19aca6235 Refactoring 2022-10-06 12:58:39 +03:00
Alexei Koshelev 857578864d [SSE] Improvement for textbox 2022-10-06 00:01:02 +03:00
OVSharova c7ffd9b8b5 fix showLastSelected 2022-10-05 14:49:08 +03:00
OVSharova 1b21757754 fix bugs 2022-10-05 14:31:55 +03:00
Julia Radzhabova 68fa3649fb Revert changes 2022-10-04 18:54:24 +03:00
Julia Radzhabova 70540b1eb5 [PE] Add gridline presets for pt metric 2022-10-04 18:45:40 +03:00
Julia Radzhabova 66259ebf51 [DE] Fix restrictions 2022-10-04 14:52:47 +03:00
Julia Radzhabova 0f1a07cb94 [DE] Fix 2022-10-04 14:36:16 +03:00
Julia Radzhabova e07e1305a4 [DE] Apply edit restrictions for protected document 2022-10-04 14:17:08 +03:00
Julia Radzhabova 064fc09574 [DE] Fix protection 2022-10-03 23:36:58 +03:00
Julia Radzhabova 621fe72930 [PE] Add gridlines presets for inch metric 2022-10-03 21:22:51 +03:00
Julia Radzhabova b9d8d1ee8a [PE] Fix tip for guide position 2022-10-03 16:29:30 +03:00
OVSharova d1d92cc97c WatchDialog with multiseect 2022-10-03 13:59:15 +03:00
Julia Radzhabova 96cc66875e [DE] Use sdk methods 2022-10-03 13:44:27 +03:00
Julia Radzhabova 291c29706e [PE] Show guide position 2022-10-03 11:28:30 +03:00
OVSharova 560ecfc366 add currentSelectedRec 2022-10-03 09:42:45 +03:00
OVSharova 8fa0319f5e when lastSelectedRec is null 2022-10-03 03:01:40 +03:00
OVSharova caeae837e0 fix multiselect 2022-10-03 02:49:31 +03:00
Alexei Koshelev 15f495ee58 [SSE PE DE] For the button on the toolbar added the option to create vertical text 2022-10-02 21:31:12 +03:00
Julia Radzhabova d92096f2a6 [PE] Delete guides 2022-10-01 23:23:46 +03:00
Julia Radzhabova 5eeadb99a4 Add translation 2022-10-01 22:59:51 +03:00
Julia Radzhabova f598a93033 [PE] Add view settings to context menu 2022-10-01 22:41:48 +03:00
Julia Radzhabova 83c888729e [PE] Add advanced grid settings 2022-09-30 23:26:02 +03:00
Julia Radzhabova cfb73f7cb4 [PE] Fix grid settings 2022-09-30 22:02:06 +03:00
JuliaSvinareva a2e62b7545 [DE] Fix other group in smart arts 2022-09-30 20:10:10 +03:00
Julia Radzhabova b4950b3681
Merge pull request #1987 from ONLYOFFICE/fix/open-edit-diagram
[SSE] Fix bug with opening chart editor
2022-09-30 18:31:09 +03:00
Julia Radzhabova 12b205629f
Merge pull request #1986 from ONLYOFFICE/fix/bug-58524
[SSE] Added option to update all pivot tables
2022-09-30 17:32:28 +03:00
Alexei Koshelev 0c2a96d618 [SSE] Fix bug with opening chart editor 2022-09-30 17:05:01 +03:00
Maxim Kadushkin 1663f8a367 [desktop] send js mouse events to native app 2022-09-30 10:15:22 +03:00
Julia Radzhabova ee1c093ac9 Refactoring 2022-09-30 00:12:04 +03:00
Julia Radzhabova 493a6b53b5 [PE] Add gridlines settings 2022-09-30 00:05:36 +03:00
Julia Radzhabova 7ed283a202 [PE] Add guides settings to context menu 2022-09-29 18:26:54 +03:00
Julia Radzhabova dfeea528ac [PE] Fix guides 2022-09-29 14:58:43 +03:00
Maxim Kadushkin 20f348ac9d [desktop] fix "home" button disabled state 2022-09-29 13:15:41 +03:00
JuliaSvinareva e59a832756 [DE] Fix smart art icon on 1.25x 2022-09-29 12:50:10 +03:00
Julia Radzhabova c67d30f897 [PE] Add guides settings 2022-09-29 10:55:41 +03:00
Maxim Kadushkin 27ff2a57e7 [desktop] added button 'home' in app header 2022-09-28 23:43:03 +03:00
Maxim Kadushkin fd961d81a2 [desktop] refactoring 2022-09-28 22:58:50 +03:00
Alexei Koshelev 2388608e54 [SSE] Added option to update all pivot tables 2022-09-28 22:55:30 +03:00
Julia Radzhabova 041557e6a3 Lock edit plugins when document is protected 2022-09-28 17:29:24 +03:00
SergeyEzhin 13cedf86f1 [DE mobile] For Bug 58655 2022-09-28 02:03:02 +03:00
Julia Radzhabova 6f1ee48c6d [DE] Refactoring document protection 2022-09-28 01:01:27 +03:00
JuliaSvinareva e99f6b494e [DE] Fix doubling of smart arts 2022-09-27 17:32:22 +03:00
Julia Radzhabova 9adcc64e9b [DE] Fix protection for restricted modes 2022-09-27 14:32:41 +03:00
Julia Radzhabova 00d7a665e6 [DE] Refactoring review changes 2022-09-27 13:23:20 +03:00
Julia Radzhabova 0d54c6d31e [DE] Protect settings depend on permissions 2022-09-27 11:34:47 +03:00
Maxim Kadushkin 8908af2153 Merge branch 'hotfix/v7.2.1' into develop 2022-09-27 10:41:56 +03:00
Julia Radzhabova 8f1f89ee31 [DE] Lock controls when document is protected (review only) 2022-09-26 23:34:59 +03:00
Julia Radzhabova 7f703b6294 Fix disabled styles 2022-09-26 18:37:47 +03:00
Julia Radzhabova f8b95b54ab [DE] Refactoring document protection 2022-09-26 18:37:20 +03:00
maxkadushkin f0c85f7135
Merge pull request #1978 from ONLYOFFICE/fix/bug_59088
Fix/bug 59088
2022-09-26 13:04:11 +03:00
maxkadushkin 8b052cef5a
Merge pull request #1980 from ONLYOFFICE/feature/fix-bugs
Feature/fix bugs
2022-09-26 13:02:22 +03:00
Julia Radzhabova 0c2502056d
Merge pull request #1979 from ONLYOFFICE/feature/cell-style-groups
Feature/cell style groups
2022-09-24 22:15:07 +03:00
Julia Radzhabova cd8211ffde Fix min width for styles components 2022-09-24 20:48:45 +03:00
Julia Radzhabova fba576115c [DE] Lock controls when document is protected (comments only) 2022-09-23 23:43:09 +03:00
SergeyEzhin 9f37a4c70d [DE SSE mobile] Fix Bug 59034 2022-09-23 23:05:33 +03:00
Alexei Koshelev d920705316 [PE] Removed auto change width for Animation and Transitions components 2022-09-23 22:36:44 +03:00
Alexei Koshelev d5f1e8899c To previous commit 2022-09-23 22:20:36 +03:00
Julia Radzhabova 9aeffb19c5 [DE] Lock controls when document is protected (fill forms only) 2022-09-23 22:07:05 +03:00
JuliaSvinareva 91dc833ec8 [DE PE SSE] Fix width of plugin buttons, fix translation 2022-09-23 21:25:40 +03:00
Julia Radzhabova c6cd767264 [DE] Lock review changes and comments when document is protected 2022-09-23 21:00:18 +03:00
Julia Radzhabova 71434d517d Handle Asc.c_oAscError.ID.DirectUrl error 2022-09-23 17:38:45 +03:00
Julia Radzhabova b898aee927 [DE] Lock controls when document is protected (read only mode) 2022-09-23 15:13:58 +03:00
SergeyEzhin 8b1bf6f3b6 [DE mobile] Fix Bug 59096 2022-09-23 00:38:13 +03:00
JuliaSvinareva f48fb32eac [DE PE SSE] By bug 59088 (fix captions with &, fix long captions) 2022-09-22 22:52:18 +03:00
Alexei Koshelev 7fbce6170b [SSE] Added cell styles menu in Ole editor 2022-09-22 22:06:58 +03:00
JuliaSvinareva 4dcd91e106
Merge pull request #1977 from ONLYOFFICE/fix/hints-ie
[DE PE SSE] Hide alt hints on ie
2022-09-22 20:17:36 +03:00
JuliaSvinareva 9e8d0e1159 [DE PE SSE] Hide alt hints on ie 2022-09-22 20:12:05 +03:00
dependabot[bot] 5e1f09c9e2
Bump jpeg-js from 0.4.3 to 0.4.4 in /build
Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.3...v0.4.4)

---
updated-dependencies:
- dependency-name: jpeg-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-22 12:24:07 +00:00
dependabot[bot] 5b6de14a9a
Bump minimist and mkdirp in /build
Bumps [minimist](https://github.com/substack/minimist) and [mkdirp](https://github.com/isaacs/node-mkdirp). These dependencies needed to be updated together.

Updates `minimist` from 1.2.5 to 1.2.6
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/commits)

Updates `mkdirp` from 0.5.5 to 1.0.4
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/compare/v0.5.5...v1.0.4)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
- dependency-name: mkdirp
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-22 12:24:02 +00:00
dependabot[bot] 5654841e93
Bump ejs from 3.1.6 to 3.1.8 in /build
Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.8.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.8)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-22 12:24:01 +00:00
dependabot[bot] adefdded97
Bump terser from 5.12.1 to 5.14.2 in /build
Bumps [terser](https://github.com/terser/terser) from 5.12.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.12.1...v5.14.2)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-22 12:23:57 +00:00
dependabot[bot] ebb58299b7
Bump jpeg-js from 0.4.3 to 0.4.4 in /build/sprites
Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.3...v0.4.4)

---
updated-dependencies:
- dependency-name: jpeg-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-22 12:23:53 +00:00
JuliaSvinareva 238cc71760 [DE] Make getting of smart arts by groups, add office group 2022-09-22 00:02:20 +03:00
Alexei Koshelev 5660dd8cfd Refactoring 2022-09-21 23:22:38 +03:00
Maxim Kadushkin 0b877a165a [common] remove unused resources 2022-09-21 21:40:19 +03:00
Julia Radzhabova ca9b1bcf22 [DE] Add document protection 2022-09-21 17:15:33 +03:00
SergeyEzhin 5b0ccb21e4 [DE mobile] Fix Bug 57989 2022-09-20 17:48:45 +03:00
Julia Radzhabova aa28b7eeca Merge branch 'release/v7.2.0' into develop 2022-09-20 16:22:14 +03:00
JuliaSvinareva 1feaa1b7ae [DE PE SSE] By bug 59088 (fix four-words captions) 2022-09-20 14:18:45 +03:00
Alexei Koshelev 0b2476ecab To previous commit 2022-09-20 00:48:50 +03:00
Alexei Koshelev 8c39eb234b [SSE PE DE] Fix style for components used ComboDataView 2022-09-20 00:37:50 +03:00
Alexei Koshelev 789305ac87 Fix bug in ComboDataView 2022-09-20 00:34:44 +03:00
JuliaSvinareva 32c754c9fe [DE PE SSE] Fix bug 59088 2022-09-19 19:48:14 +03:00
Alexei Koshelev a98c4e82bc [SSE] Added auto width change in PivotTable component 2022-09-19 01:24:46 +03:00
Alexei Koshelev 9d61b0a2d8 [PE] Added auto width change in Animation and Transition components 2022-09-19 01:23:25 +03:00
Alexei Koshelev 0841aa0e5f Optimization of the component ComboDataView 2022-09-19 01:17:32 +03:00
Alexei Koshelev af8715bb46 Hiding only open buttons in Mixtbar 2022-09-19 01:04:52 +03:00
SergeyEzhin 96cb176b85 [DE mobile] Fix Bug 59083 2022-09-18 16:52:27 +03:00
JuliaSvinareva 6fe53f9357 [DE] Fix handler of insert smart art 2022-09-16 18:46:31 +03:00
maxkadushkin 11f115cac4
Merge pull request #1961 from ONLYOFFICE/feature/fix-bugs
Feature/fix bugs
2022-09-15 10:23:08 +03:00
SergeyEzhin 7b951da71d [PE mobile] Fix Bug 59022 2022-09-14 15:41:47 +03:00
SergeyEzhin ff10121f7b [DE mobile] Fix Bug 59000 2022-09-14 15:34:14 +03:00
Alexei Koshelev c130f79e7f [SSE] Change the width of the template menu in the right menu to match the width of the window 2022-09-14 14:40:47 +03:00
Alexei Koshelev 6e5de0c8c1 Auto change width for an integer number of elements for ComboDataView 2022-09-14 14:37:40 +03:00
JuliaSvinareva 4e4f6f94bc [DE] Add icons to smart arts 2022-09-13 19:05:22 +03:00
Julia Radzhabova 4db83376dd Merge branch 'feature/3d-rotation' into develop 2022-09-13 17:05:05 +03:00
Julia Radzhabova ea2bffa8c2 [PE] Fix 3d rotation settings for charts 2022-09-13 16:48:04 +03:00
Julia Radzhabova 36873dc3bc [DE] Fix 3d settings for charts 2022-09-13 15:34:01 +03:00
Maxim Kadushkin 397b700573 [all] fix IE huge button's icon 2022-09-13 11:14:25 +03:00
Julia Radzhabova 066aca3d07 [PE] Add 3d settings for charts 2022-09-12 20:10:15 +03:00
Julia Radzhabova 5d14293056 [DE] Add 3d rotation settings for charts 2022-09-12 19:57:16 +03:00
JuliaSvinareva 7c5761c07a
Merge pull request #1958 from ONLYOFFICE/feature/smart-arts-add-icons
Add icons
2022-09-12 17:41:03 +03:00
Julia Radzhabova 8e0c9709e1 [SSE] Update icons 2022-09-12 17:39:28 +03:00
Kirill Volkov 0ae9d95980 add icons
add smartart icon for toolbar.
changed 1,5x smart-process icon
2022-09-12 16:54:50 +03:00
Julia Radzhabova 12450625cc
Merge pull request #1957 from ONLYOFFICE/feature/3d-rotation-add-icons
add icons
2022-09-12 16:09:59 +03:00
Kirill Volkov 60ba55c840 Add icons
add icons for smart art
2022-09-12 15:45:09 +03:00
Kirill Volkov 67a0104d73 add icons
add icons 3d rotation
2022-09-12 15:39:19 +03:00
maxkadushkin 350db57523
Merge pull request #1953 from ONLYOFFICE/feature/fix-bugs
Feature/fix bugs
2022-09-09 23:52:20 +03:00
Alexei Koshelev 832641ec5f [SSE] Change style dropdown menu of style cell 2022-09-09 23:21:45 +03:00
Alexei Koshelev a7f0d259c4 Fix style ComboDataView 2022-09-09 20:25:23 +03:00
JuliaSvinareva aa7e70eac2 [DE] Fix smart arts 2022-09-09 20:11:52 +03:00
Julia Radzhabova 3e89118f42 Fix Bug 58963 2022-09-09 17:39:28 +03:00
SergeyEzhin bf4b5faddb [SSE mobile] Fix Bug 57730 2022-09-09 16:29:32 +03:00
Julia Radzhabova 897f9e606f
Merge pull request #1951 from ONLYOFFICE/release/v7.2.0
Release/v7.2.0
2022-09-09 12:57:34 +03:00
Alexei Koshelev b70b9eb243 [SSE] Fix dropdown menu of styles cell 2022-09-09 11:54:54 +03:00
Alexei Koshelev f2cc301d7e [SSE] Change width dropdown menu tamplates pivot table 2022-09-09 11:49:17 +03:00
Julia Radzhabova 39ca6a7e87 Merge branch 'develop' into feature/cell-style-groups 2022-09-08 23:59:53 +03:00
Alexei Koshelev 8d6efb6c39 [SSE] Change width of the style list 2022-09-08 18:12:17 +03:00
SergeyEzhin 8bdc8762da [SSE mobile] Fix Bug 58642 2022-09-08 16:13:44 +03:00
JuliaSvinareva ae4813a5d8
Merge pull request #1945 from ONLYOFFICE/fix/fix-bugs
[DE PE] Disable searching for whole words when there are punctuation …
2022-09-08 14:42:41 +03:00
SergeyEzhin 1788a579c3 Merged release/v7.2.0 and resolved conflicts 2022-09-08 13:06:00 +03:00
JuliaSvinareva fdc0e5038d [DE] Make smart arts 2022-09-08 01:48:54 +03:00
Julia Radzhabova b8419707bf [SSE] Fix 3d rotation settings 2022-09-07 23:58:22 +03:00
Alexei Koshelev 2221747813 [SSE] Change cell styles 2022-09-07 20:24:58 +03:00
Julia Radzhabova d824f9dd61 [SSE] Add 3d rotation settings for charts 2022-09-07 15:44:27 +03:00
Sergey Konovalov d73cf9051e
[wopi] Add template for wopi discovery action "convert" 2022-09-07 13:58:16 +03:00
JuliaSvinareva 7af5548157 [DE PE] Disable searching for whole words when there are punctuation marks 2022-09-06 17:04:56 +03:00
JuliaSvinareva 221f138ae1 [DE] Fill smart arts in groups 2022-09-05 22:52:19 +03:00
Julia Radzhabova 330549d850 Refactoring sign settings dialog, set default values 2022-09-05 21:52:13 +03:00
Julia Radzhabova 9debf2511e Set encrypt button pressed when file is protected 2022-09-05 20:26:53 +03:00
JuliaSvinareva a964a622b4 [DE] Add smartarts 2022-09-05 11:29:37 +03:00
Julia Radzhabova 37a6d9568b [SSE] Update/Delete external links 2022-08-31 23:31:17 +03:00
Julia Radzhabova 9b36d4274f [SSE] Fix updating external references 2022-08-30 22:23:14 +03:00
Julia Radzhabova a7c0bcade1
Merge pull request #1909 from Basher03/feature/cell-style-groups
Groups table templates in documenteditor and presentationeditor
2022-08-24 01:55:21 +03:00
Alexei Koshelev ea57a8a361 Refactoring groups for table in presentationeditor 2022-08-23 15:31:40 +03:00
Alexei Koshelev dd6b532a56 Refactoring 2022-08-19 14:32:54 +03:00
Alexei Koshelev fd6bc63637 Refactoring groups for table in documenteditor 2022-08-17 15:58:38 +03:00
Alexei Koshelev 20a25d1c98
Merge pull request #1 from ONLYOFFICE/feature/cell-style-groups
Feature/cell style groups
2022-08-14 17:26:42 +03:00
Julia Radzhabova 75cf200670 Add group to dataview 2022-08-13 12:35:31 +03:00
Alexei Koshelev 5a9016928c Fix Bug
Store overwrite when adding a new batch of templates.
2022-08-12 01:27:40 +03:00
Julia Radzhabova 3dcf0f6f4f Merge branch 'release/v7.2.0' into develop 2022-08-12 01:04:50 +03:00
Alexei Koshelev 4ab46feb43 Update groups for table in documenteditor 2022-08-10 16:31:28 +03:00
maxkadushkin c8350c575a
Merge pull request #1890 from ONLYOFFICE/feature/Bug_47800
[DE PE SSE mobile] Fix Bug 47800
2022-08-09 17:46:45 +03:00
SergeyEzhin 1afb2c7abb [DE PE SSE mobile] Fix Bug 47800 2022-08-09 01:55:41 +03:00
maxkadushkin 3bd82d5253
Merge pull request #1887 from ONLYOFFICE/feature/Bug_51540
Feature/bug 51540
2022-08-08 10:44:21 +03:00
Basher 93af069409 Added groups for table in documenteditor 2022-08-07 22:28:11 +03:00
SergeyEzhin 1cf8b0c9c7 [PE SSE mobile] Fix Bug 51540 2022-08-05 14:54:48 +03:00
maxkadushkin 35655c5546
Merge pull request #1886 from ONLYOFFICE/feature/add-sharing-settings
[common] Add sharing settings
2022-08-05 08:28:02 +03:00
SergeyEzhin 3e508e7de3 [DE mobile] Fix Bug 51540 2022-08-04 01:20:46 +03:00
SergeyEzhin 62fc23f32f [DE mobile] Correct translation 2022-08-02 18:32:46 +03:00
SergeyEzhin e6ee9e9ba7 Removed unused translation 2022-08-02 12:20:58 +03:00
SergeyEzhin bd011121c6 Correct translation 2022-08-02 02:04:53 +03:00
SergeyEzhin 6edc78adc3 [common] Removed sharing settings controller 2022-08-01 15:18:11 +03:00
Basher 98b44ced4e Added groups for table in presentationeditor 2022-07-31 03:08:52 +03:00
Basher 47048623e2 Added groups fot pivot table templates 2022-07-30 14:04:45 +03:00
SergeyEzhin 75f01aca9a [common] Add sharing settings 2022-07-29 22:25:44 +03:00
Julia Radzhabova d1dfb29cc9
Merge pull request #1880 from Basher03/feature/cell-style-groups
Groups for cell styles and table templates in spreadsheeteditor
2022-07-29 16:47:14 +03:00
Julia Radzhabova 8227926d6d Merge branch 'release/v7.2.0' into develop 2022-07-27 21:53:24 +03:00
Julia Radzhabova 82ba32c2ec [SSE] Update external links 2022-07-26 15:04:14 +03:00
Basher 34979a046a Fixing a broken key control in the menu 2022-07-23 16:15:32 +03:00
Julia Radzhabova d440ec5872 Merge branch 'develop' into feature/update-external-data 2022-07-23 12:25:28 +03:00
Basher 00ef0d4e9e Added groups for table templates 2022-07-22 15:51:54 +03:00
Julia Radzhabova 5bc35f0941 [PE] Bug 58182 2022-07-21 23:18:22 +03:00
Julia Radzhabova bb5d6cf388
Merge pull request #1864 from ONLYOFFICE/feature/equation-settings
Feature/equation settings
2022-07-21 14:40:02 +03:00
Basher c75c9941c0 Changed expanded list style 2022-07-20 19:16:55 +03:00
Basher 9c143ec001 Revert "Fix ComboDataView"
This reverts commit 3ee304d12c.
2022-07-20 17:37:35 +03:00
Basher 3ee304d12c Fix ComboDataView
The size is now taken from the element that is in the fieldPicker, instead of the menuPicker
2022-07-19 20:51:24 +03:00
Basher b4dd4a4f91 Added group "No Name"
If a style does not have a group, it is added to the group "No name"
2022-07-19 20:45:41 +03:00
Basher bb7613bd44 Changed the calculation of the expanded list width 2022-07-15 16:02:02 +03:00
Basher 381791b62b Added English localization for group names 2022-07-15 16:00:15 +03:00
Basher dcd7fb90f7 Refactoring 2022-07-15 15:56:54 +03:00
Basher 8e896a40d3 Changed border style for the expanded list 2022-07-15 15:46:52 +03:00
Basher 4236ed0ee7 Added style groups for table cells 2022-07-13 19:22:06 +03:00
Basher b62144a886 Revert "Added groups for cell styles in the table"
This reverts commit 6e298a9582.
2022-07-12 12:30:07 +03:00
Basher 6e298a9582 Added groups for cell styles in the table 2022-07-12 12:05:24 +03:00
Julia Radzhabova e0df9797a0 [SSE] Add icon for cell watch 2022-07-12 11:23:21 +03:00
Julia Radzhabova 22c9fddfa8 [SSE] Add icons for cell watch 2022-07-12 10:52:59 +03:00
Julia Radzhabova a1be884b34
Merge pull request #1834 from ONLYOFFICE/feature/cell-watches
Feature/cell watches
2022-07-01 16:17:25 +03:00
Julia Radzhabova faf7c75f6e [SSE] Update watches list 2022-07-01 13:57:19 +03:00
Julia Radzhabova 9475364cfb [SSE] Remove all cell watches 2022-06-29 20:24:40 +03:00
Julia Radzhabova 0800af0484 [SSE] Limit for cell watches 2022-06-29 18:21:21 +03:00
Julia Radzhabova c5669995c6 [SSE] Add warning when add cell watches 2022-06-29 16:42:12 +03:00
Julia Radzhabova 22f765387f Fix Bug 57652 2022-06-27 14:01:01 +03:00
Julia Radzhabova 39914c9d22 Add translation 2022-06-24 23:39:01 +03:00
Julia Radzhabova 70cc425501 [SSE] Fix deleting cell watches 2022-06-24 23:35:42 +03:00
Julia Radzhabova 8be25036a9 [SSE] Set not-modal watch window 2022-06-24 22:37:11 +03:00
Julia Radzhabova 5b0769f326 [SSE] Fix current cell when watch is added 2022-06-24 17:50:28 +03:00
Julia Radzhabova 4e2af2ab44 [SSE] Refactoring watch dialog 2022-06-24 17:41:37 +03:00
Julia Radzhabova fbc99d7b5e [SSE] For Bug 52363: add watch dialog 2022-06-24 16:18:26 +03:00
Julia Radzhabova 7975609bd4 Merge branch 'release/v7.2.0' into develop 2022-06-22 23:13:24 +03:00
Julia Radzhabova be9c744100
Merge pull request #1818 from ONLYOFFICE/feature/sse-internal-resize
Feature/sse internal resize
2022-06-22 21:48:16 +03:00
Julia Radzhabova cb51144092 Remove unused 2022-06-22 20:31:46 +03:00
Julia Radzhabova 8dfa0e4d3a Make merge editor resizable 2022-06-22 19:37:33 +03:00
Julia Radzhabova 30d7928104 Fix resize internal editors 2022-06-22 19:32:44 +03:00
Julia Radzhabova ce7bacd50f Bug 36870 2022-06-22 19:18:39 +03:00
Julia Radzhabova b9698ae77b Remove unused 2022-06-22 19:17:45 +03:00
Julia Radzhabova da327e5168 Refactoring internal editors. Make diagramm editor resizable 2022-06-22 18:18:13 +03:00
Julia Radzhabova c8c05cf38d Fix ole editor 2022-06-22 14:26:24 +03:00
Julia Radzhabova 89636b7099 [SSE] Save last size of the ole editor 2022-06-22 14:06:46 +03:00
Julia Radzhabova 8ddb38a5b8 Merge branch 'feature/sse-ole-resize' into feature/sse-internal-resize 2022-06-22 13:26:49 +03:00
Julia Radzhabova 49dc558158 Merge branch 'release/v7.2.0' into develop 2022-06-21 16:14:21 +03:00
maxkadushkin 650f208543
Merge pull request #1806 from ONLYOFFICE/feature/Bug_49506
Feature/bug 49506
2022-06-20 11:23:15 +03:00
SergeyEzhin 1800336973 [SSE mobile] Added positioning for tooltip 2022-06-17 17:51:57 +04:00
SergeyEzhin 0d5daecadd [SSE mobile] Add tooltip for data cell 2022-06-15 19:57:45 +04:00
Maxim Kadushkin f8d4a3c93b Merge branch 'release/v7.2.0' into develop 2022-06-14 13:48:56 +03:00
Julia Radzhabova b59b8b6d66 Merge branch 'release/v7.2.0' into feature/equation-settings 2022-06-10 22:37:15 +03:00
maxkadushkin e848d63afd
Merge pull request #1792 from ONLYOFFICE/feature/Bug_47718
[DE PE SSE mobile] Changed order edit tabs
2022-06-09 15:55:35 +03:00
SergeyEzhin 6394f4e110
Merge branch 'develop' into feature/Bug_47718 2022-06-09 15:40:24 +04:00
SergeyEzhin 09512d4c4f [DE PE SSE mobile] Changed order edit tabs 2022-06-09 15:37:57 +04:00
maxkadushkin b6ffd88e79
Merge pull request #1781 from ONLYOFFICE/feature/add-list-settings
[PE] Adding an image to a list item
2022-06-08 10:43:19 +03:00
Julia Radzhabova 4e5c30c46d [SSE] Refactoring 2022-06-08 00:06:44 +03:00
Julia Radzhabova a10d566162 Fix bug 2022-06-07 23:59:50 +03:00
Julia Radzhabova 5c4242f454 [SSE] Handle external data event 2022-06-07 23:29:14 +03:00
maxkadushkin de58289ceb
Merge pull request #1785 from ONLYOFFICE/feature/Bug_47753
Feature/bug 47753
2022-06-07 18:35:07 +03:00
maxkadushkin c61a957ec7
Merge pull request #1783 from ONLYOFFICE/feature/fix-bugs
Feature/fix bugs
2022-06-07 18:32:02 +03:00
Julia Radzhabova 398691700b [SSE] Update external data 2022-06-07 17:43:17 +03:00
SergeyEzhin 454878d3d7 [DE PE SSE mobile] Changed adding and editing link 2022-06-07 00:53:07 +04:00
Andrey Shimagin f15891cd04 [PE] Adding 'image-menu' for mobiles and refactoring 2022-06-06 11:03:59 +03:00
Andrey Shimagin 9ffbcf8e9a [PE] Adding an image to a list item 2022-06-06 09:18:07 +03:00
maxkadushkin f60c3552c6
Merge pull request #1778 from ONLYOFFICE/feature/fix-bug-react
[DE] Fix Bug 57306
2022-06-04 11:00:46 +03:00
Julia Radzhabova 0f5a22ebe7
Merge pull request #1776 from ONLYOFFICE/release/v7.2.0
Release/v7.2.0
2022-06-02 17:58:10 +03:00
SergeyEzhin 4d8fde7ea1 [DE mobile] Changed adding and editing link 2022-06-01 23:24:13 +04:00
SergeyEzhin 838eac4b8c [DE PE SSE mobile] Change view adding and editing link 2022-05-31 01:11:25 +04:00
Julia Radzhabova e086acd52f [SSE] Refactoring (remove resize callback) 2022-05-30 18:06:01 +03:00
Julia Radzhabova f2eddc5126 Merge branch 'develop' into feature/sse-ole-resize 2022-05-27 13:11:36 +03:00
ShimaginAndrey 0dd313c7d0 [DE] Fix Bug 57306 2022-05-25 12:14:54 +03:00
SergeyEzhin 49ded5c542 [DE PE mobile] For Bug 57125 2022-05-12 21:23:02 +04:00
SergeyEzhin d460ee980c [PE SSE mobile] Fix Bug 57113 2022-05-11 19:23:19 +04:00
SergeyEzhin 284e697090 [common] For Bug 56305 2022-05-11 18:55:02 +04:00
SergeyEzhin 830b4944ce Fix Bug 53424 2022-05-11 14:46:55 +04:00
Julia Radzhabova c0c6a03279 Fix ole editor resizing 2022-04-04 21:10:04 +03:00
Julia Radzhabova 77abebdf60 [DE] Update icons for equation settings 2022-04-01 18:40:06 +03:00
Julia Radzhabova 6c15d65919 Merge branch 'develop' into feature/equation-settings 2022-04-01 18:32:51 +03:00
Julia Radzhabova 6e197c53c8 [PE] Add ole object 2022-04-01 17:58:01 +03:00
Julia Radzhabova eef4f52565 [DE] Add ole object 2022-04-01 17:49:24 +03:00
Julia Radzhabova d3719967dd Set initial size for ole object 2022-04-01 17:48:31 +03:00
Julia Radzhabova 0c040cec70 Resize ole editor 2022-04-01 16:12:20 +03:00
Julia Radzhabova 8df803bac1 [DE] Add conversions for equation 2022-03-30 23:19:46 +03:00
618 changed files with 16310 additions and 4769 deletions

View file

@ -23,6 +23,7 @@
options: <advanced options>,
key: 'key',
vkey: 'vkey',
referenceData: 'data for external paste',
info: {
owner: 'owner name',
folder: 'path to document',
@ -264,6 +265,7 @@
'onRequestCompareFile': <request file to compare>,// must call setRevisedFile method
'onRequestSharingSettings': <request sharing settings>,// must call setSharingSettings method
'onRequestCreateNew': <try to create document>,
'onRequestReferenceData': <try to refresh external data>,
}
}
@ -327,6 +329,7 @@
_config.editorConfig.canRequestCompareFile = _config.events && !!_config.events.onRequestCompareFile;
_config.editorConfig.canRequestSharingSettings = _config.events && !!_config.events.onRequestSharingSettings;
_config.editorConfig.canRequestCreateNew = _config.events && !!_config.events.onRequestCreateNew;
_config.editorConfig.canRequestReferenceData = _config.events && !!_config.events.onRequestReferenceData;
_config.frameEditorId = placeholderId;
_config.parentOrigin = window.location.origin;
@ -736,6 +739,13 @@
});
};
var _setReferenceData = function(data) {
_sendCommand({
command: 'setReferenceData',
data: data
});
};
var _serviceCommand = function(command, data) {
_sendCommand({
command: 'internalCommand',
@ -770,7 +780,8 @@
setFavorite : _setFavorite,
requestClose : _requestClose,
grabFocus : _grabFocus,
blurFocus : _blurFocus
blurFocus : _blurFocus,
setReferenceData : _setReferenceData
}
};

View file

@ -0,0 +1,174 @@
<!DOCTYPE html>
<html>
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="mobile-web-app-capable" content="yes" />
<!--
*
* (c) Copyright Ascensio System SIA 2021
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
-->
<title>ONLYOFFICE</title>
<style type="text/css">
html {
height: 100%;
width: 100%;
}
body {
background: #fff;
color: #333;
font-family: Arial, Tahoma,sans-serif;
font-size: 12px;
font-weight: normal;
height: 100%;
margin: 0;
overflow-y: hidden;
padding: 0;
text-decoration: none;
}
.form {
height: 100%;
}
div {
margin: 0;
padding: 0;
}
.app-error-panel {
position: absolute;
width: 100%;
height: 100%;
top: 0;
background-color: #f4f4f4;
z-index: 10;
}
.message-block {
display: inline-block;
vertical-align: middle;
width: 100%;
}
.message-inner {
width: 550px;
margin: auto;
padding: 30px;
background-color: #e3e3e3;
text-align: center;
}
.title {
font-size: 24px;
margin: 0 0 14px;
}
.text {
font-size: 16px;
}
</style>
</head>
<body>
<div id="progress">
Converting your file so you can edit it...
<a id="btn_end" style="display: none;">
<button type="button">Click here to open the converted file</button>
</a>
</div>
<div id="error" style="display: none;">
Conversion failed<br/>Sorry, we weren't able to convert the file for editing.<br/>Try again Go back
</div>
<script type="text/javascript" language="javascript">
function redirect(url) {
try {
window.top.location.replace(url);
}
catch (err) {
console.err(err);
}
}
function makeXHRRequest(url, success, error) {
var xhr = new XMLHttpRequest;
xhr.onreadystatechange = function() {
if (xhr.readyState == 4)
if (xhr.status == 200) {
success(xhr.responseText)
} else {
error()
}
}
;
xhr.open("GET", url, !0);
xhr.send();
}
function checkStatus(url, success, error) {
makeXHRRequest(url, function(responseText) {
let data = JSON.parse(responseText);
if(undefined !== data.error) {
error();
} else if(data.endConvert) {
success(data.fileUrl);
} else {
setTimeout(function(){
checkStatus(url, success, error);
}, 1000);
}
}, error);
}
function success(url) {
// redirect(url);
let btn = document.getElementById('btn_end');
btn.style.display = 'block';
btn.onclick = function() {
redirect(url);
};
}
function error() {
document.getElementById('progress').style.display = 'none';
document.getElementById('error').style.display = 'block';
}
var convertFile = function () {
let statusHandler = <%- JSON.stringify(statusHandler) %>;
if(!statusHandler) {
error();
}
checkStatus(statusHandler, success, error);
};
if (window.addEventListener) {
window.addEventListener("load", convertFile);
} else if (window.attachEvent) {
window.attachEvent("onload", convertFile);
}
</script>
</body>
</html>

View file

@ -312,7 +312,7 @@ div {
"events": {
"onAppReady": onAppReady,
"onDocumentStateChange": fileInfo.EditNotificationPostMessage ? onDocumentStateChange : undefined,
'onRequestEditRights': fileInfo.EditModePostMessage || fileInfo.HostEditUrl ? onRequestEditRights : undefined,
'onRequestEditRights': fileInfo.EditModePostMessage || (fileInfo.HostEditUrl && !fileInfo.UserCanNotWriteRelative) ? onRequestEditRights : undefined,
"onError": onError,
"onRequestClose": fileInfo.ClosePostMessage || fileInfo.CloseUrl ? onRequestClose : undefined,
"onRequestRename": fileInfo.SupportsRename && fileInfo.UserCanRename ? onRequestRename : undefined,

View file

@ -138,6 +138,10 @@ if (window.Common === undefined) {
'grabFocus': function(data) {
$me.trigger('grabfocus', data);
},
'setReferenceData': function(data) {
$me.trigger('setreferencedata', data);
}
};
@ -347,6 +351,10 @@ if (window.Common === undefined) {
_postMessage({event:'onRequestCreateNew'});
},
requestReferenceData: function (data) {
_postMessage({event:'onRequestReferenceData', data: data});
},
pluginsReady: function() {
_postMessage({ event: 'onPluginsReady' });
},

View file

@ -589,6 +589,7 @@
height: 100%;
&.disabled {
opacity: @component-disabled-opacity-ie;
opacity: @component-disabled-opacity;
cursor: default !important;
}

View file

@ -351,22 +351,37 @@ define([
getCaptionWithBreaks: function (caption) {
var words = caption.split(' '),
newCaption = null,
maxWidth = 85 - 4;
maxWidth = 160 - 4, //85 - 4
containAnd = words.indexOf('&');
if (containAnd > -1) { // add & to previous word
words[containAnd - 1] += ' &';
words.splice(containAnd, 1);
}
if (words.length > 1) {
maxWidth = !!this.menu || this.split === true ? maxWidth - 10 : maxWidth;
if (words.length < 3) {
words[0] = getShortText(words[0], !!this.menu ? maxWidth + 10 : maxWidth);
words[1] = getShortText(words[1], maxWidth);
newCaption = words[0] + '<br>' + words[1];
} else {
var otherWords = '';
if (getWidthOfCaption(words[0] + ' ' + words[1]) < maxWidth) { // first and second words in first line
words[2] = getShortText(words[2], maxWidth);
newCaption = words[0] + ' ' + words[1] + '<br>' + words[2];
} else if (getWidthOfCaption(words[1] + ' ' + words[2]) < maxWidth) { // second and third words in second line
words[2] = getShortText(words[2], maxWidth);
newCaption = words[0] + '<br>' + words[1] + ' ' + words[2];
for (var i = 2; i < words.length; i++) {
otherWords += words[i] + ' ';
}
if (getWidthOfCaption(otherWords + (!!this.menu ? 10 : 0))*2 < getWidthOfCaption(words[0] + ' ' + words[1])) {
otherWords = getShortText((words[1] + ' ' + otherWords).trim(), maxWidth);
newCaption = words[0] + '<br>' + otherWords;
} else {
words[1] = getShortText(words[1] + ' ' + words[2], maxWidth);
newCaption = words[0] + '<br>' + words[1];
otherWords = getShortText(otherWords.trim(), maxWidth);
newCaption = words[0] + ' ' + words[1] + '<br>' + otherWords;
}
} else { // only first word is in first line
for (var j = 1; j < words.length; j++) {
otherWords += words[j] + ' ';
}
otherWords = getShortText(otherWords.trim(), maxWidth);
newCaption = words[0] + '<br>' + otherWords;
}
}
} else {
@ -754,7 +769,7 @@ define([
return (this.cmpEl) ? this.cmpEl.is(":visible") : $(this.el).is(":visible");
},
updateHint: function(hint) {
updateHint: function(hint, isHtml) {
this.options.hint = hint;
if (!this.rendered) return;
@ -780,10 +795,12 @@ define([
this.btnMenuEl.removeData('bs.tooltip');
this.btnEl.tooltip({
html: !!isHtml,
title : (typeof hint == 'string') ? hint : hint[0],
placement : this.options.hintAnchor||'cursor'
});
this.btnMenuEl && this.btnMenuEl.tooltip({
html: !!isHtml,
title : hint[1],
placement : this.options.hintAnchor||'cursor'
});

View file

@ -407,8 +407,9 @@ define([
},
selectCandidate: function() {
var index = this._search.index || 0,
var index = (this._search.index && this._search.index != -1) ? this._search.index : 0,
re = new RegExp('^' + ((this._search.full) ? this._search.text : this._search.char), 'i'),
isFirstCharsEqual = re.test(this.store.at(index).get(this.displayField)),
itemCandidate, idxCandidate;
for (var i=0; i<this.store.length; i++) {
@ -417,6 +418,8 @@ define([
if (!itemCandidate) {
itemCandidate = item;
idxCandidate = i;
if(!isFirstCharsEqual)
break;
}
if (this._search.full && i==index || i>index) {
itemCandidate = item;

View file

@ -56,6 +56,7 @@ define([
itemWidth : 80,
itemHeight : 40,
menuMaxHeight : 300,
autoWidth : false,
enableKeyEvents : false,
beforeOpenHandler : null,
additionalMenuItems : null,
@ -87,11 +88,13 @@ define([
this.menuMaxHeight = this.options.menuMaxHeight;
this.beforeOpenHandler = this.options.beforeOpenHandler;
this.showLast = this.options.showLast;
this.wrapWidth = 0;
this.rootWidth = 0;
this.rootHeight = 0;
this.rendered = false;
this.needFillComboView = false;
this.minWidth = this.options.minWidth;
this.autoWidth = this.initAutoWidth = (Common.Utils.isIE10 || Common.Utils.isIE11) ? false : this.options.autoWidth;
this.delayRenderTips = this.options.delayRenderTips || false;
this.itemTemplate = this.options.itemTemplate || _.template([
'<div class="style" id="<%= id %>">',
@ -208,6 +211,8 @@ define([
me.fieldPicker.el.addEventListener('contextmenu', _.bind(me.onPickerComboContextMenu, me), false);
me.menuPicker.el.addEventListener('contextmenu', _.bind(me.onPickerComboContextMenu, me), false);
Common.NotificationCenter.on('more:toggle', _.bind(this.onMoreToggle, this));
me.onResize();
me.rendered = true;
@ -221,8 +226,26 @@ define([
return this;
},
onMoreToggle: function(btn, state) {
if(state) {
this.checkSize();
}
},
checkSize: function() {
if (this.cmpEl && this.cmpEl.is(':visible')) {
if(this.autoWidth && this.menuPicker.store.length > 0) {
var wrapWidth = this.$el.width();
if(wrapWidth != this.wrapWidth || this.needFillComboView){
this.wrapWidth = wrapWidth;
this.autoChangeWidth();
var picker = this.menuPicker;
var record = picker.getSelectedRec();
this.fillComboView(record || picker.store.at(0), !!record, true);
}
}
var me = this,
width = this.cmpEl.width(),
height = this.cmpEl.height();
@ -266,6 +289,45 @@ define([
this.trigger('resize', this);
},
autoChangeWidth: function() {
if(this.menuPicker.dataViewItems[0]){
var wrapEl = this.$el;
var wrapWidth = wrapEl.width();
var itemEl = this.menuPicker.dataViewItems[0].$el;
var itemWidth = this.itemWidth + parseFloat(itemEl.css('padding-left')) + parseFloat(itemEl.css('padding-right')) + 2 * parseFloat(itemEl.css('border-width'));
var itemMargins = parseFloat(itemEl.css('margin-left')) + parseFloat(itemEl.css('margin-right'));
var fieldPickerEl = this.fieldPicker.$el;
var fieldPickerPadding = parseFloat(fieldPickerEl.css('padding-right'));
var fieldPickerBorder = parseFloat(fieldPickerEl.css('border-width'));
var dataviewPaddings = parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-left')) + parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-right'));
var cmbDataViewEl = this.cmpEl;
var cmbDataViewPaddings = parseFloat(cmbDataViewEl.css('padding-left')) + parseFloat(cmbDataViewEl.css('padding-right'));
var itemsCount = Math.floor((wrapWidth - fieldPickerPadding - dataviewPaddings - 2 * fieldPickerBorder - cmbDataViewPaddings) / (itemWidth + itemMargins));
if(itemsCount > this.store.length)
itemsCount = this.store.length;
var widthCalc = Math.ceil((itemsCount * (itemWidth + itemMargins) + fieldPickerPadding + dataviewPaddings + 2 * fieldPickerBorder + cmbDataViewPaddings) * 10) / 10;
var maxWidth = parseFloat(cmbDataViewEl.css('max-width'));
if(widthCalc > maxWidth)
widthCalc = maxWidth;
cmbDataViewEl.css('width', widthCalc);
if(this.initAutoWidth) {
this.initAutoWidth = false;
cmbDataViewEl.css('position', 'absolute');
cmbDataViewEl.css('top', '50%');
cmbDataViewEl.css('bottom', '50%');
cmbDataViewEl.css('margin', 'auto 0');
}
}
},
onBeforeShowMenu: function(e) {
var me = this;

View file

@ -328,6 +328,7 @@ define([
if (this.listenStoreEvents) {
this.listenTo(this.store, 'add', this.onAddItem);
this.listenTo(this.store, 'reset', this.onResetItems);
this.groups && this.listenTo(this.groups, 'add', this.onAddGroup);
}
this.onResetItems();
@ -392,18 +393,36 @@ define([
if (suspendEvents)
this.suspendEvents();
if (!this.multiSelect) {
this.extremeSeletedRec = record;
if (!this.multiSelect || ( !this.pressedShift && !this.pressedCtrl) || !this.currentSelectedRec || (this.pressedShift && this.currentSelectedRec == record)) {
_.each(this.store.where({selected: true}), function(rec){
rec.set({selected: false});
});
if (record) {
record.set({selected: true});
this.currentSelectedRec = record;
}
} else {
if (record)
if (record) {
if(this.pressedCtrl) {
record.set({selected: !record.get('selected')});
this.currentSelectedRec = record;
}
else if(this.pressedShift){
var me =this;
var inRange=false;
_.each(me.store.models, function(rec){
if(me.currentSelectedRec == rec || record == rec){
inRange = !inRange;
rec.set({selected: true});
}
else {
rec.set({selected: (inRange)});
}
});
}
}
}
if (suspendEvents)
@ -510,6 +529,35 @@ define([
}
},
onAddGroup: function(group) {
var el = $(_.template([
'<% if (group.headername !== undefined) { %>',
'<div class="header-name"><%= group.headername %></div>',
'<% } %>',
'<div class="grouped-data <% if (group.inline) { %> group.inline <% } %> <% if (!_.isEmpty(group.caption)) { %> margin <% } %>" id="<%= group.id %>">',
'<% if (!_.isEmpty(group.caption)) { %>',
'<div class="group-description">',
'<span><%= group.caption %></span>',
'</div>',
'<% } %>',
'<div class="group-items-container">',
'</div>',
'</div>'
].join(''))({
group: group.toJSON()
}));
var innerEl = $(this.el).find('.inner').addBack().filter('.inner');
if (innerEl) {
var idx = _.indexOf(this.groups.models, group);
var innerDivs = innerEl.find('.grouped-data');
if (idx > 0)
$(innerDivs.get(idx - 1)).after(el);
else {
(innerDivs.length > 0) ? $(innerDivs[idx]).before(el) : innerEl.append(el);
}
}
},
onResetItems: function() {
_.each(this.dataViewItems, function(item) {
var tip = item.$el.data('bs.tooltip');
@ -678,13 +726,22 @@ define([
onKeyDown: function (e, data) {
if ( this.disabled ) return;
if (data===undefined) data = e;
if(this.multiSelect) {
if (data.keyCode == Common.UI.Keys.CTRL) {
this.pressedCtrl = true;
} else if (data.keyCode == Common.UI.Keys.SHIFT) {
this.pressedShift = true;
}
}
if (_.indexOf(this.moveKeys, data.keyCode)>-1 || data.keyCode==Common.UI.Keys.RETURN) {
data.preventDefault();
data.stopPropagation();
var rec = this.getSelectedRec();
if (this.lastSelectedRec===null)
var rec =(this.multiSelect) ? this.extremeSeletedRec : this.getSelectedRec();
if (this.lastSelectedRec === null)
this.lastSelectedRec = rec;
if (data.keyCode==Common.UI.Keys.RETURN) {
if (data.keyCode == Common.UI.Keys.RETURN) {
this.lastSelectedRec = null;
if (this.selectedBeforeHideRec) // only for ComboDataView menuPicker
rec = this.selectedBeforeHideRec;
@ -694,6 +751,7 @@ define([
if (this.parentMenu)
this.parentMenu.hide();
} else {
this.pressedCtrl=false;
var idx = _.indexOf(this.store.models, rec);
if (idx<0) {
if (data.keyCode==Common.UI.Keys.LEFT) {
@ -774,12 +832,20 @@ define([
}
},
onKeyUp: function(e){
if(e.keyCode == Common.UI.Keys.SHIFT)
this.pressedShift = false;
if(e.keyCode == Common.UI.Keys.CTRL)
this.pressedCtrl = false;
},
attachKeyEvents: function() {
if (this.enableKeyEvents && this.handleSelect) {
var el = $(this.el).find('.inner').addBack().filter('.inner');
el.addClass('canfocused');
el.attr('tabindex', this.tabindex.toString());
el.on((this.parentMenu && this.useBSKeydown) ? 'dataview:keydown' : 'keydown', _.bind(this.onKeyDown, this));
el.on((this.parentMenu && this.useBSKeydown) ? 'dataview:keyup' : 'keyup', _.bind(this.onKeyUp, this));
}
},
@ -789,7 +855,11 @@ define([
this.scrollToRecord(this.lastSelectedRec);
this.lastSelectedRec = null;
} else {
this.scrollToRecord(this.getSelectedRec());
var selectedRec = this.getSelectedRec();
if (!this.multiSelect)
this.scrollToRecord(selectedRec);
else if(selectedRec && selectedRec.length > 0)
this.scrollToRecord(selectedRec[selectedRec.length - 1]);
}
},

View file

@ -472,8 +472,9 @@ define([
},
selectCandidate: function() {
var index = this._search.index || 0,
var index = (this._search.index && this._search.index != -1) ? this._search.index : 0,
re = new RegExp('^' + ((this._search.full) ? this._search.text : this._search.char), 'i'),
isFirstCharsEqual = re.test(this.items[index].caption),
itemCandidate, idxCandidate;
for (var i=0; i<this.items.length; i++) {
@ -482,6 +483,8 @@ define([
if (!itemCandidate) {
itemCandidate = item;
idxCandidate = i;
if(!isFirstCharsEqual)
break;
}
if (this._search.full && i==index || i>index) {
itemCandidate = item;
@ -1051,8 +1054,9 @@ define([
},
selectCandidate: function() {
var index = this._search.index || 0,
var index = (this._search.index && this._search.index != -1) ? this._search.index : 0,
re = new RegExp('^' + ((this._search.full) ? this._search.text : this._search.char), 'i'),
isFirstCharsEqual = re.test(this.items[index].caption),
itemCandidate, idxCandidate;
for (var i=0; i<this.items.length; i++) {
@ -1061,6 +1065,8 @@ define([
if (!itemCandidate) {
itemCandidate = item;
idxCandidate = i;
if(!isFirstCharsEqual)
break;
}
if (this._search.full && i==index || i>index) {
itemCandidate = item;

View file

@ -793,7 +793,7 @@ define([
hideMoreBtns: function() {
for (var btn in btnsMore) {
btnsMore[btn] && btnsMore[btn].toggle(false);
btnsMore[btn] && btnsMore[btn].isActive() && btnsMore[btn].toggle(false);
}
}
};

View file

@ -144,10 +144,20 @@ define([
}
}, this, area);
}.bind(this));
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
onLaunch: function () {
var filter = Common.localStorage.getKeysFilter();
this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
this._state = {
disableEditing: false, // disable editing when disconnect/signed file/mail merge preview/review final or original/forms preview
docProtection: {
isReadOnly: false,
isReviewOnly: false,
isFormsOnly: false,
isCommentsOnly: false
}
};
this.collection = this.getApplication().getCollection('Common.Collections.Comments');
this.setComparator();
@ -1645,16 +1655,25 @@ define([
},
setPreviewMode: function(mode) {
if (this.viewmode === mode) return;
this.viewmode = mode;
if (mode)
this._state.disableEditing = mode;
this.updatePreviewMode();
},
updatePreviewMode: function() {
var docProtection = this._state.docProtection;
var viewmode = this._state.disableEditing || docProtection.isReadOnly || docProtection.isFormsOnly;
if (this.viewmode === viewmode) return;
this.viewmode = viewmode;
if (viewmode)
this.prevcanComments = this.mode.canComments;
this.mode.canComments = (mode) ? false : this.prevcanComments;
this.mode.canComments = (viewmode) ? false : this.prevcanComments;
this.closeEditing();
this.setMode(this.mode);
this.updateComments(true);
if (this.getPopover())
mode ? this.getPopover().hide() : this.getPopover().update(true);
viewmode ? this.getPopover().hide() : this.getPopover().update(true);
},
clearCollections: function() {
@ -1718,6 +1737,27 @@ define([
}
}
this.updateComments(true);
},
onAppReady: function (config) {
var me = this;
(new Promise(function (accept, reject) {
accept();
})).then(function(){
me.onChangeProtectDocument();
Common.NotificationCenter.on('protect:doclock', _.bind(me.onChangeProtectDocument, me));
});
},
onChangeProtectDocument: function(props) {
if (!props) {
var docprotect = this.getApplication().getController('DocProtection');
props = docprotect ? docprotect.getDocProps() : null;
}
if (props) {
this._state.docProtection = props;
this.updatePreviewMode();
}
}
}, Common.Controllers.Comments || {}));

View file

@ -45,7 +45,8 @@ define([
version: '{{PRODUCT_VERSION}}',
eventloading: true,
titlebuttons: true,
uithemes: true
uithemes: true,
btnhome: true,
};
var native = window.desktop || window.AscDesktopEditor;
@ -90,14 +91,12 @@ define([
$('.asc-window.modal').css('top', obj.skiptoparea);
Common.Utils.InternalSettings.set('window-inactive-area-top', obj.skiptoparea);
} else
if ( obj.lockthemes != undefined ) {
// TODO: remove after 7.0.2. depricated. used is_win_xp variable instead
// Common.UI.Themes.setAvailable(!obj.lockthemes);
}
if ( obj.singlewindow !== undefined ) {
$('#box-document-title .hedset')[obj.singlewindow ? 'hide' : 'show']();
// $('#box-document-title .hedset')[obj.singlewindow ? 'hide' : 'show']();
native.features.singlewindow = obj.singlewindow;
titlebuttons.home && titlebuttons.home.btn.setVisible(obj.singlewindow);
}
} else
if (/editor:config/.test(cmd)) {
@ -248,6 +247,40 @@ define([
titlebuttons = {};
if ( mode.isEdit ) {
var header = webapp.getController('Viewport').getView('Common.Views.Header');
{
header.btnHome = (new Common.UI.Button({
cls: 'btn-header',
iconCls: 'toolbar__icon icon--inverse btn-home',
visible: false,
hint: 'Show Main window',
dataHint:'0',
dataHintDirection: 'right',
dataHintOffset: '10, -18',
dataHintTitle: 'K'
})).render($('#box-document-title #slot-btn-dt-home'));
titlebuttons['home'] = {btn: header.btnHome};
header.btnHome.on('click', event => {
native.execCommand('title:button', JSON.stringify({click: "home"}));
});
$('#id-box-doc-name').on({
'dblclick': e => {
native.execCommand('title:dblclick', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
},
'mousedown': e => {
native.execCommand('title:mousedown', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
},
'mousemove': e => {
native.execCommand('title:mousemove', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
},
'mouseup': e => {
native.execCommand('title:mouseup', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
}
});
}
if (!!header.btnSave) {
titlebuttons['save'] = {btn: header.btnSave};
@ -281,7 +314,8 @@ define([
}
if ( native.features.singlewindow !== undefined ) {
$('#box-document-title .hedset')[native.features.singlewindow ? 'hide' : 'show']();
// $('#box-document-title .hedset')[native.features.singlewindow ? 'hide' : 'show']();
!!titlebuttons.home && titlebuttons.home.btn.setVisible(native.features.singlewindow);
}
});

View file

@ -98,12 +98,14 @@ define([
'drag': _.bind(function(o, state){
externalEditor && externalEditor.serviceCommand('window:drag', state == 'start');
},this),
'resize': _.bind(function(o, state){
externalEditor && externalEditor.serviceCommand('window:resize', state == 'start');
},this),
'show': _.bind(function(cmp){
var h = this.diagramEditorView.getHeight(),
innerHeight = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
if (innerHeight>h && h<700 || innerHeight<h) {
h = Math.min(innerHeight, 700);
this.diagramEditorView.setHeight(h);
if (innerHeight<h) {
this.diagramEditorView.setHeight(innerHeight);
}
if (externalEditor) {
@ -227,13 +229,21 @@ define([
if (eventData.type == "processMouse") {
if (eventData.data.event == 'mouse:up') {
this.diagramEditorView.binding.dragStop();
if (this.diagramEditorView.binding.resizeStop) this.diagramEditorView.binding.resizeStop();
} else
if (eventData.data.event == 'mouse:move') {
var x = parseInt(this.diagramEditorView.$window.css('left')) + eventData.data.pagex,
y = parseInt(this.diagramEditorView.$window.css('top')) + eventData.data.pagey + 34;
this.diagramEditorView.binding.drag({pageX:x, pageY:y});
if (this.diagramEditorView.binding.resize) this.diagramEditorView.binding.resize({pageX:x, pageY:y});
}
} else
if (eventData.type == "resize") {
var w = eventData.data.width,
h = eventData.data.height;
if (w>0 && h>0)
this.diagramEditorView.setInnerSize(w, h);
} else
if (eventData.type == "frameToGeneralData") {
this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
} else

View file

@ -51,7 +51,8 @@ define([
var appLang = '{{DEFAULT_LANG}}',
customization = undefined,
targetApp = '',
externalEditor = null;
externalEditor = null,
isAppFirstOpened = true;
var createExternalEditor = function() {
@ -96,16 +97,22 @@ define([
'drag': _.bind(function(o, state){
externalEditor && externalEditor.serviceCommand('window:drag', state == 'start');
},this),
'resize': _.bind(function(o, state){
externalEditor && externalEditor.serviceCommand('window:resize', state == 'start');
},this),
'show': _.bind(function(cmp){
var h = this.mergeEditorView.getHeight(),
innerHeight = Common.Utils.innerHeight();
if (innerHeight>h && h<700 || innerHeight<h) {
h = Math.min(innerHeight, 700);
this.mergeEditorView.setHeight(h);
if (innerHeight<h) {
this.mergeEditorView.setHeight(innerHeight);
}
if (externalEditor) {
externalEditor.serviceCommand('setAppDisabled',false);
if (isAppFirstOpened && this.mergeEditorView._isExternalDocReady) {
isAppFirstOpened = false;
this.mergeEditorView._mergeData && this.setMergeData();
}
if (this.needDisableEditing && this.mergeEditorView._isExternalDocReady) {
this.onMergeEditingDisabled();
}
@ -114,6 +121,7 @@ define([
createExternalEditor.apply(this);
}
this.isExternalEditorVisible = true;
this.isHandlerCalled = false;
}, this),
'hide': _.bind(function(cmp){
if (externalEditor) {
@ -139,14 +147,22 @@ define([
},
handler: function(result, value) {
if (this.isHandlerCalled) return;
this.isHandlerCalled = true;
if (this.mergeEditorView._isExternalDocReady)
externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
return true;
else {
this.mergeEditorView.hide();
this.isHandlerCalled = false;
}
},
setMergeData: function() {
if (!isAppFirstOpened) {
externalEditor && externalEditor.serviceCommand('setMergeData', this.mergeEditorView._mergeData);
this.mergeEditorView.setEditMode(true);
this.mergeEditorView._mergeData = null;
}
},
loadConfig: function(data) {
@ -185,6 +201,7 @@ define([
if (this.mergeEditorView) {
if (eventData.type == 'documentReady') {
this.mergeEditorView._isExternalDocReady = true;
this.isExternalEditorVisible && (isAppFirstOpened = false);
this.mergeEditorView.setControlsDisabled(false);
if (this.mergeEditorView._mergeData) {
externalEditor && externalEditor.serviceCommand('setMergeData', this.mergeEditorView._mergeData);
@ -207,17 +224,26 @@ define([
}
this.mergeEditorView.hide();
}
this.isHandlerCalled = false;
} else
if (eventData.type == "processMouse") {
if (eventData.data.event == 'mouse:up') {
this.mergeEditorView.binding.dragStop();
if (this.mergeEditorView.binding.resizeStop) this.mergeEditorView.binding.resizeStop();
} else
if (eventData.data.event == 'mouse:move') {
var x = parseInt(this.mergeEditorView.$window.css('left')) + eventData.data.pagex,
y = parseInt(this.mergeEditorView.$window.css('top')) + eventData.data.pagey + 34;
this.mergeEditorView.binding.drag({pageX:x, pageY:y});
if (this.mergeEditorView.binding.resize) this.mergeEditorView.binding.resize({pageX:x, pageY:y});
}
} else
if (eventData.type == "resize") {
var w = eventData.data.width,
h = eventData.data.height;
if (w>0 && h>0)
this.mergeEditorView.setInnerSize(w, h);
} else
if (eventData.type == "frameToGeneralData") {
this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
} else

View file

@ -98,12 +98,14 @@ define([
'drag': _.bind(function(o, state){
externalEditor && externalEditor.serviceCommand('window:drag', state == 'start');
},this),
'resize': _.bind(function(o, state){
externalEditor && externalEditor.serviceCommand('window:resize', state == 'start');
},this),
'show': _.bind(function(cmp){
var h = this.oleEditorView.getHeight(),
innerHeight = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
if (innerHeight>h && h<700 || innerHeight<h) {
h = Math.min(innerHeight, 700);
this.oleEditorView.setHeight(h);
if (innerHeight<h) {
this.oleEditorView.setHeight(innerHeight);
}
if (externalEditor) {
@ -131,8 +133,6 @@ define([
}, this)
}
});
},
onLaunch: function() {
@ -228,13 +228,21 @@ define([
if (eventData.type == "processMouse") {
if (eventData.data.event == 'mouse:up') {
this.oleEditorView.binding.dragStop();
if (this.oleEditorView.binding.resizeStop) this.oleEditorView.binding.resizeStop();
} else
if (eventData.data.event == 'mouse:move') {
var x = parseInt(this.oleEditorView.$window.css('left')) + eventData.data.pagex,
y = parseInt(this.oleEditorView.$window.css('top')) + eventData.data.pagey + 34;
this.oleEditorView.binding.drag({pageX:x, pageY:y});
if (this.oleEditorView.binding.resize) this.oleEditorView.binding.resize({pageX:x, pageY:y});
}
} else
if (eventData.type == "resize") {
var w = eventData.data.width,
h = eventData.data.height;
if (w>0 && h>0)
this.oleEditorView.setInnerSize(w, h);
} else
if (eventData.type == "frameToGeneralData") {
this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
} else

View file

@ -121,7 +121,7 @@ Common.UI.HintManager = new(function() {
_usedTitles = [],
_appPrefix,
_staticHints = { // for desktop buttons
"btnhome": 'K'
// "btnhome": 'K'
};
var _api;
@ -457,6 +457,8 @@ Common.UI.HintManager = new(function() {
};
var _init = function(api) {
if (Common.Utils.isIE || Common.UI.isMac && Common.Utils.isGecko) // turn off hints on IE and FireFox (shortcut F6 selects link in address bar)
return;
_api = api;
var filter = Common.localStorage.getKeysFilter();
@ -478,7 +480,7 @@ Common.UI.HintManager = new(function() {
_clearHints();
});
$(document).on('keyup', function(e) {
if (e.keyCode == Common.UI.Keys.ALT && _needShow && !(window.SSE && window.SSE.getController('Statusbar').getIsDragDrop())) {
if ((e.keyCode == Common.UI.Keys.ALT || e.keyCode === 91) && _needShow && !(window.SSE && window.SSE.getController('Statusbar').getIsDragDrop())) {
e.preventDefault();
if (!_hintVisible) {
$('input:focus').blur(); // to change value in inputField
@ -620,10 +622,11 @@ Common.UI.HintManager = new(function() {
}
}
_needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT &&
_needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !e.shiftKey &&
(!Common.Utils.isMac && e.keyCode == Common.UI.Keys.ALT || Common.Utils.isMac && e.metaKey && e.keyCode === Common.UI.Keys.F6) &&
!Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0 &&
!(window.PE && $('#pe-preview').is(':visible')));
if (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && e.altKey && e.keyCode !== 115) {
if (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !Common.Utils.isMac && e.altKey && e.keyCode !== 115) {
e.preventDefault();
}
});
@ -661,6 +664,8 @@ Common.UI.HintManager = new(function() {
};
var _clearHints = function (isComplete) {
if (Common.Utils.isIE || Common.UI.isMac && Common.Utils.isGecko)
return;
_hintVisible && _hideHints();
if (_currentHints.length > 0) {
_resetToDefault();

View file

@ -105,6 +105,7 @@ define([
Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
Common.NotificationCenter.on('uitheme:changed', this.updatePluginsButtons.bind(this));
Common.NotificationCenter.on('window:resize', this.updatePluginsButtons.bind(this));
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
loadConfig: function(data) {
@ -151,6 +152,16 @@ define([
onAppShowed: function (config) {
},
onAppReady: function (config) {
var me = this;
(new Promise(function (accept, reject) {
accept();
})).then(function(){
me.onChangeProtectDocument();
Common.NotificationCenter.on('protect:doclock', _.bind(me.onChangeProtectDocument, me));
});
},
setApi: function(api) {
this.api = api;
@ -225,6 +236,10 @@ define([
var _group = $('> .group', me.$toolbarPanelPlugins);
var $slot = $('<span class="btn-slot text x-huge"></span>').appendTo(_group);
btn.render($slot);
var docProtection = me.panelPlugins._state.docProtection;
Common.Utils.lockControls(Common.enumLock.docLockView, docProtection.isReadOnly, {array: btn});
Common.Utils.lockControls(Common.enumLock.docLockForms, docProtection.isFormsOnly, {array: btn});
Common.Utils.lockControls(Common.enumLock.docLockComments, docProtection.isCommentsOnly, {array: btn});
}
},
@ -259,6 +274,10 @@ define([
rank = new_rank;
});
_group.appendTo(me.$toolbarPanelPlugins);
var docProtection = me.panelPlugins._state.docProtection;
Common.Utils.lockControls(Common.enumLock.docLockView, docProtection.isReadOnly, {array: me.panelPlugins.lockedControls});
Common.Utils.lockControls(Common.enumLock.docLockForms, docProtection.isFormsOnly, {array: me.panelPlugins.lockedControls});
Common.Utils.lockControls(Common.enumLock.docLockComments, docProtection.isCommentsOnly, {array: me.panelPlugins.lockedControls});
} else {
console.error('toolbar panel isnot created');
}
@ -518,10 +537,13 @@ define([
}
var variationsArr = [],
pluginVisible = false;
pluginVisible = false,
isDisplayedInViewer = false;
item.variations.forEach(function(itemVar){
var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !itemVar.isSystem;
if ( visible ) pluginVisible = true;
if (itemVar.isViewer && (itemVar.isDisplayedInViewer!==false))
isDisplayedInViewer = true;
if (item.isUICustomizer ) {
visible && arrUI.push({
@ -571,7 +593,8 @@ define([
groupName: (item.group) ? item.group.name : '',
groupRank: (item.group) ? item.group.rank : 0,
minVersion: item.minVersion,
original: item
original: item,
isDisplayedInViewer: isDisplayedInViewer
}));
}
});
@ -720,6 +743,19 @@ define([
}, funcComplete);
} else
funcComplete();
},
onChangeProtectDocument: function(props) {
if (!props) {
var docprotect = this.getApplication().getController('DocProtection');
props = docprotect ? docprotect.getDocProps() : null;
}
if (props && this.panelPlugins) {
this.panelPlugins._state.docProtection = props;
Common.Utils.lockControls(Common.enumLock.docLockView, props.isReadOnly, {array: this.panelPlugins.lockedControls});
Common.Utils.lockControls(Common.enumLock.docLockForms, props.isFormsOnly, {array: this.panelPlugins.lockedControls});
Common.Utils.lockControls(Common.enumLock.docLockComments, props.isCommentsOnly, {array: this.panelPlugins.lockedControls});
}
}
}, Common.Controllers.Plugins || {}));
});

View file

@ -82,7 +82,8 @@ define([
'reviewchange:view': _.bind(this.onReviewViewClick, this),
'reviewchange:compare': _.bind(this.onCompareClick, this),
'lang:document': _.bind(this.onDocLanguage, this),
'collaboration:coauthmode': _.bind(this.onCoAuthMode, this)
'collaboration:coauthmode': _.bind(this.onCoAuthMode, this),
'protect:update': _.bind(this.onChangeProtectDocument, this)
},
'Common.Views.ReviewChangesDialog': {
'reviewchange:accept': _.bind(this.onAcceptClick, this),
@ -102,7 +103,15 @@ define([
this.userCollection = this.getApplication().getCollection('Common.Collections.Users');
this.viewmode = false;
this._state = {posx: -1000, posy: -1000, popoverVisible: false, previewMode: false, compareSettings: null, wsLock: false, wsProps: []};
this._state = { posx: -1000, posy: -1000, popoverVisible: false, previewMode: false, compareSettings: null, wsLock: false, wsProps: [],
disableEditing: false, // disable editing when disconnect/signed file/mail merge preview/review final or original/forms preview
docProtection: {
isReadOnly: false,
isReviewOnly: false,
isFormsOnly: false,
isCommentsOnly: false
}
};
Common.NotificationCenter.on('reviewchanges:turn', this.onTurnPreview.bind(this));
Common.NotificationCenter.on('spelling:turn', this.onTurnSpelling.bind(this));
@ -164,26 +173,35 @@ define([
SetDisabled: function(state, reviewMode, fillFormMode) {
if (this.dlgChanges)
this.dlgChanges.close();
if (reviewMode)
if (reviewMode) {
this.lockToolbar(Common.enumLock.previewReviewMode, state);
else if (fillFormMode)
this.dlgChanges && Common.Utils.lockControls(Common.enumLock.previewReviewMode, state, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
} else if (fillFormMode) {
this.lockToolbar(Common.enumLock.viewFormMode, state);
else
this.dlgChanges && Common.Utils.lockControls(Common.enumLock.viewFormMode, state, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
} else {
this.lockToolbar(Common.enumLock.viewMode, state);
}
this.setPreviewMode(state);
},
lockToolbar: function (causes, lock, opts) {
Common.Utils.lockControls(causes, lock, opts, this.view.getButtons());
this.view && Common.Utils.lockControls(causes, lock, opts, this.view.getButtons());
},
setPreviewMode: function(mode) { //disable accept/reject in popover
if (this.viewmode === mode) return;
this.viewmode = mode;
if (mode)
this._state.disableEditing = mode;
this.updatePreviewMode();
},
updatePreviewMode: function() {
var viewmode = this._state.disableEditing || this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly || this._state.docProtection.isCommentsOnly;
if (this.viewmode === viewmode) return;
this.viewmode = viewmode;
if (viewmode)
this.prevcanReview = this.appConfig.canReview;
this.appConfig.canReview = (mode) ? false : this.prevcanReview;
this.appConfig.canReview = (viewmode) ? false : this.prevcanReview;
var me = this;
this.popoverChanges && this.popoverChanges.each(function (model) {
model.set('hint', !me.appConfig.canReview);
@ -207,17 +225,14 @@ define([
onApiShowChange: function (sdkchange, isShow) {
var btnlock = true,
changes;
if (this.appConfig.canReview && !this.appConfig.isReviewOnly) {
if (this.appConfig.canReview && !(this.appConfig.isReviewOnly || this._state.docProtection.isReviewOnly)) {
if (sdkchange && sdkchange.length>0) {
changes = this.readSDKChange(sdkchange);
btnlock = this.isSelectedChangesLocked(changes, isShow);
}
if (this._state.lock !== btnlock) {
Common.Utils.lockControls(Common.enumLock.reviewChangelock, btnlock, {array: [this.view.btnAccept, this.view.btnReject]});
if (this.dlgChanges) {
this.dlgChanges.btnAccept.setDisabled(btnlock);
this.dlgChanges.btnReject.setDisabled(btnlock);
}
this.dlgChanges && Common.Utils.lockControls(Common.enumLock.reviewChangelock, btnlock, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
this._state.lock = btnlock;
Common.Utils.InternalSettings.set(this.view.appPrefix + "accept-reject-lock", btnlock);
}
@ -485,6 +500,7 @@ define([
}
var date = (item.get_DateTime() == '') ? new Date() : new Date(item.get_DateTime()),
user = me.userCollection.findOriginalUser(item.get_UserId()),
isProtectedReview = me._state.docProtection.isReviewOnly,
change = new Common.Models.ReviewChange({
uid : Common.UI.getId(),
userid : item.get_UserId(),
@ -499,8 +515,9 @@ define([
changedata : item,
scope : me.view,
hint : !me.appConfig.canReview,
docProtection: me._state.docProtection,
goto : (item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveTo || item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveFrom),
editable : me.appConfig.isReviewOnly && (item.get_UserId() == me.currentUserId) || !me.appConfig.isReviewOnly && (!me.appConfig.canUseReviewPermissions || AscCommon.UserInfoParser.canEditReview(item.get_UserName()))
editable : (me.appConfig.isReviewOnly || isProtectedReview) && (item.get_UserId() == me.currentUserId) || !(me.appConfig.isReviewOnly || isProtectedReview) && (!me.appConfig.canUseReviewPermissions || AscCommon.UserInfoParser.canEditReview(item.get_UserName()))
});
arr.push(change);
@ -589,7 +606,7 @@ define([
},
onTurnPreview: function(state, global, fromApi) {
if ( this.appConfig.isReviewOnly ) {
if ( this.appConfig.isReviewOnly) {
this.view.turnChanges(true);
} else
if ( this.appConfig.canReview ) {
@ -603,7 +620,7 @@ define([
},
onApiTrackRevisionsChange: function(localFlag, globalFlag, userId) {
if ( this.appConfig.isReviewOnly ) {
if ( this.appConfig.isReviewOnly || this._state.docProtection.isReviewOnly) {
this.view.turnChanges(true);
} else
if ( this.appConfig.canReview ) {
@ -634,8 +651,10 @@ define([
this.turnDisplayMode(item.value);
if (!this.appConfig.isEdit && !this.appConfig.isRestrictedEdit)
Common.localStorage.setItem(this.view.appPrefix + "review-mode", item.value); // for viewer
else if (item.value=='markup' || item.value=='simple')
else if (item.value=='markup' || item.value=='simple') {
Common.localStorage.setItem(this.view.appPrefix + "review-mode-editor", item.value); // for editor save only markup modes
Common.Utils.InternalSettings.set(this.view.appPrefix + "review-mode-editor", item.value);
}
Common.NotificationCenter.trigger('edit:complete', this.view);
},
@ -805,7 +824,7 @@ define([
rightMenu: {clear: disable, disable: true},
statusBar: true,
leftMenu: {disable: false, previewMode: true},
fileMenu: {protect: true},
fileMenu: {protect: true, info: true},
navigation: {disable: false, previewMode: true},
comments: {disable: false, previewMode: true},
chat: false,
@ -829,10 +848,10 @@ define([
onAppReady: function (config) {
var me = this;
if ( config.canReview ) {
(new Promise(function (resolve) {
resolve();
})).then(function () {
if ( config.canReview ) {
// function _setReviewStatus(state, global) {
// me.view.turnChanges(state, global);
// !global && me.api.asc_SetLocalTrackRevisions(state);
@ -854,7 +873,7 @@ define([
!val && (val = me.appConfig.customization ? me.appConfig.customization.reviewDisplay : undefined);
val = /^(original|final|markup|simple)$/i.test(val) ? val.toLocaleLowerCase() : 'markup';
}
Common.Utils.InternalSettings.set(me.view.appPrefix + "review-mode-editor", val);
me.turnDisplayMode(val); // load display mode for all modes (viewer or editor)
me.view.turnDisplayMode(val);
@ -862,13 +881,13 @@ define([
(!me.appConfig.customization.review || me.appConfig.customization.review.showReviewChanges===undefined) && me.appConfig.customization.showReviewChanges==true) ) {
me.dlgChanges = (new Common.Views.ReviewChangesDialog({
popoverChanges : me.popoverChanges,
mode : me.appConfig
mode : me.appConfig,
docProtection : me._state.docProtection
}));
var sdk = $('#editor_sdk'),
offset = sdk.offset();
me.dlgChanges.show(Math.max(10, offset.left + sdk.width() - 300), Math.max(10, offset.top + sdk.height() - 150));
}
});
} else if (config.canViewReview) {
config.canViewReview = (config.isEdit || me.api.asc_HaveRevisionsChanges(true)); // check revisions from all users
if (config.canViewReview) {
@ -892,7 +911,7 @@ define([
me.onChangeProtectSheet();
if (me.view) {
me.lockToolbar(Common.enumLock.hideComments, !Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true), {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
me.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects'], {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
me.lockToolbar(Common.enumLock['Objects'], !!me._state.wsProps['Objects'], {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
}
var val = Common.localStorage.getItem(me.view.appPrefix + "settings-review-hover-mode");
@ -902,6 +921,9 @@ define([
val = !!parseInt(val);
Common.Utils.InternalSettings.set(me.view.appPrefix + "settings-review-hover-mode", val);
me.appConfig.reviewHoverMode = val;
me.view && me.view.onAppReady(config);
});
},
applySettings: function(menu) {
@ -971,7 +993,8 @@ define([
},
onCoAuthoringDisconnect: function() {
this.lockToolbar(Common.enumLock.lostConnect, true)
this.lockToolbar(Common.enumLock.lostConnect, true);
this.dlgChanges && Common.Utils.lockControls(Common.enumLock.lostConnect, true, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
},
onUpdateUsers: function() {
@ -1011,6 +1034,37 @@ define([
this.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects'], {array: [this.view.btnCommentRemove, this.view.btnCommentResolve]});
},
onChangeProtectDocument: function(props) {
if (!props) {
var docprotect = this.getApplication().getController('DocProtection');
props = docprotect ? docprotect.getDocProps() : null;
}
if (props) {
this._state.docProtection = props;
this.lockToolbar(Common.enumLock.docLockView, props.isReadOnly);
this.lockToolbar(Common.enumLock.docLockForms, props.isFormsOnly);
this.lockToolbar(Common.enumLock.docLockReview, props.isReviewOnly);
this.lockToolbar(Common.enumLock.docLockComments, props.isCommentsOnly);
if (this.dlgChanges) {
Common.Utils.lockControls(Common.enumLock.docLockView, props.isReadOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
Common.Utils.lockControls(Common.enumLock.docLockForms, props.isFormsOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
Common.Utils.lockControls(Common.enumLock.docLockReview, props.isReviewOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
Common.Utils.lockControls(Common.enumLock.docLockComments, props.isCommentsOnly, {array: [this.dlgChanges.btnAccept, this.dlgChanges.btnReject]});
}
if (this.appConfig.canReview) {
if (props.isReviewOnly) {
this.onTurnPreview(true);
this.onApiShowChange();
} else if (this._state.prevReviewProtected) {
this.onTurnPreview(false);
this.onApiShowChange();
}
this._state.prevReviewProtected = props.isReviewOnly;
}
this.updatePreviewMode();
}
},
textInserted: '<b>Inserted:</b>',
textDeleted: '<b>Deleted:</b>',
textParaInserted: '<b>Paragraph Inserted</b> ',

View file

@ -9,7 +9,7 @@
<div class="btn-goto img-commonctrl"></div>
<% } %>
<% if (!hint) { %>
<% if (scope.appConfig.isReviewOnly) { %>
<% if (scope.appConfig.isReviewOnly || docProtection.isReviewOnly) { %>
<% if (editable) { %>
<div class="btn-delete img-commonctrl"></div>
<% } %>

File diff suppressed because it is too large Load diff

View file

@ -39,59 +39,29 @@
*/
define([
'common/main/lib/component/Window'
'common/main/lib/view/ExternalEditor'
], function () { 'use strict';
Common.Views.ExternalDiagramEditor = Common.UI.Window.extend(_.extend({
Common.Views.ExternalDiagramEditor = Common.Views.ExternalEditor.extend(_.extend({
initialize : function(options) {
var _options = {};
var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
_.extend(_options, {
title: this.textTitle,
width: 910,
height: (_inner_height - 700)<0 ? _inner_height : 700,
cls: 'advanced-settings-dlg',
header: true,
toolclose: 'hide',
toolcallback: _.bind(this.onToolClose, this)
storageName: 'diagram-editor',
sdkplaceholder: 'id-diagram-editor-placeholder',
initwidth: 900,
initheight: 700,
minwidth: 730,
minheight: 275
}, options);
this.template = [
'<div id="id-diagram-editor-container" class="box" style="height:' + (_options.height-85) + 'px;">',
'<div id="id-diagram-editor-placeholder" style="width: 100%;height: 100%;"></div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer" style="text-align: center;">',
'<button id="id-btn-diagram-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
'<button id="id-btn-diagram-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
'</div>'
].join('');
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._chartData = null;
this._isNewChart = true;
Common.UI.Window.prototype.initialize.call(this, _options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
this.btnSave = new Common.UI.Button({
el: $('#id-btn-diagram-editor-apply'),
disabled: true
});
this.btnCancel = new Common.UI.Button({
el: $('#id-btn-diagram-editor-cancel')
});
this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
Common.Views.ExternalEditor.prototype.initialize.call(this, _options);
},
show: function() {
this.setPlaceholder();
Common.UI.Window.prototype.show.apply(this, arguments);
Common.Views.ExternalEditor.prototype.show.apply(this, arguments);
},
setChartData: function(data) {
@ -100,55 +70,6 @@ define([
this.fireEvent('setchartdata', this);
},
setEditMode: function(mode) {
this._isNewChart = !mode;
},
isEditMode: function() {
return !this._isNewChart;
},
setControlsDisabled: function(disable) {
this.btnSave.setDisabled(disable);
this.btnCancel.setDisabled(disable);
(disable) ? this.$window.find('.tool.close').addClass('disabled') : this.$window.find('.tool.close').removeClass('disabled');
},
onDlgBtnClick: function(event) {
if ( this.handler ) {
this.handler.call(this, event.currentTarget.attributes['result'].value);
return;
}
this.hide();
},
onToolClose: function() {
if ( this.handler ) {
this.handler.call(this, 'cancel');
return;
}
this.hide();
},
setHeight: function(height) {
if (height >= 0) {
var min = parseInt(this.$window.css('min-height'));
height < min && (height = min);
this.$window.height(height);
var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85);
var top = (Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top') - parseInt(height)) / 2;
var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left);
this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top') + top);
}
},
setPlaceholder: function(placeholder) {
this._placeholder = placeholder;
},
@ -157,8 +78,6 @@ define([
return this._placeholder;
},
textSave: 'Save & Exit',
textClose: 'Close',
textTitle: 'Chart Editor'
}, Common.Views.ExternalDiagramEditor || {}));
});

View file

@ -0,0 +1,195 @@
/*
*
* (c) Copyright Ascensio System SIA 2010-2022
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* ExternalEditor.js
*
* Created by Julia Radzhabova on 22/06/22
* Copyright (c) 2022 Ascensio System SIA. All rights reserved.
*
*/
define([
'common/main/lib/component/Window'
], function () { 'use strict';
Common.Views.ExternalEditor = Common.UI.Window.extend(_.extend({
initialize : function(options) {
var filter = Common.localStorage.getKeysFilter(),
appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
this.storageName = appPrefix + (options.storageName || 'external-editor');
var _options = {},
width = options.initwidth || 900,
height = options.initheight || 700;
var value = Common.localStorage.getItem(this.storageName + '-width');
value && (width = parseInt(value));
value = Common.localStorage.getItem(this.storageName + '-height');
value && (height = parseInt(value));
var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
_.extend(_options, {
width: width,
height: (_inner_height - height)<0 ? _inner_height : height,
cls: 'advanced-settings-dlg',
header: true,
toolclose: 'hide',
toolcallback: _.bind(this.onToolClose, this),
resizable: true
}, options);
this._headerFooterHeight = 85;
this.template = [
'<div id="id-editor-container" class="box" style="height:' + (_options.height-this._headerFooterHeight) + 'px; padding: 0 5px;">',
'<div id="' + (_options.sdkplaceholder || '') + '" style="width: 100%;height: 100%;"></div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer" style="text-align: center;">',
'<button id="id-btn-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
'<button id="id-btn-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
'</div>'
].join('');
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._isNewObject = true;
this.on('resize', _.bind(this.onWindowResize, this));
Common.UI.Window.prototype.initialize.call(this, _options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
this.boxEl = this.$window.find('.body > .box');
this.btnSave = new Common.UI.Button({
el: this.$window.find('#id-btn-editor-apply'),
disabled: true
});
this.btnCancel = new Common.UI.Button({
el: this.$window.find('#id-btn-editor-cancel')
});
this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
},
show: function() {
Common.UI.Window.prototype.show.apply(this, arguments);
},
setEditMode: function(mode) {
this._isNewObject = !mode;
},
isEditMode: function() {
return !this._isNewObject;
},
setControlsDisabled: function(disable) {
this.btnSave.setDisabled(disable);
this.btnCancel.setDisabled(disable);
(disable) ? this.$window.find('.tool.close').addClass('disabled') : this.$window.find('.tool.close').removeClass('disabled');
},
onDlgBtnClick: function(event) {
if ( this.handler ) {
this.handler.call(this, event.currentTarget.attributes['result'].value);
return;
}
this.hide();
},
onToolClose: function() {
if ( this.handler ) {
this.handler.call(this, 'cancel');
return;
}
this.hide();
},
setHeight: function(height) {
if (height >= 0) {
var min = parseInt(this.$window.css('min-height'));
height < min && (height = min);
this.$window.height(height);
var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-this._headerFooterHeight);
}
},
setInCenter: function() {
var height = this.$window.height(),
top = (Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top') - parseInt(height)) / 2,
left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left);
this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top') + top);
},
setInnerSize: function(width, height) {
var maxHeight = Common.Utils.innerHeight(),
maxWidth = Common.Utils.innerWidth(),
borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width'))),
paddings = (parseInt(this.boxEl.css('padding-left')) + parseInt(this.boxEl.css('padding-right')));
height += 90; // add toolbar and statusbar height
if (maxHeight<height + this._headerFooterHeight)
height = maxHeight - this._headerFooterHeight;
if (maxWidth<width + paddings + borders_width)
width = maxWidth - paddings - borders_width;
this.boxEl.css('height', height);
this.setHeight(height + this._headerFooterHeight);
this.setWidth(width + paddings + borders_width);
if (this.getLeft()<0)
this.$window.css('left', 0);
if (this.getTop() < Common.Utils.InternalSettings.get('window-inactive-area-top') )
this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top'));
},
onWindowResize: function (args) {
if (args && args[1]=='end') {
var value = this.getSize();
Common.localStorage.setItem(this.storageName + '-width', value[0]);
Common.localStorage.setItem(this.storageName + '-height', value[1]);
}
},
textSave: 'Save & Exit',
textClose: 'Close'
}, Common.Views.ExternalEditor || {}));
});

View file

@ -39,55 +39,24 @@
*/
define([
'common/main/lib/component/Window'
'common/main/lib/view/ExternalEditor'
], function () { 'use strict';
Common.Views.ExternalMergeEditor = Common.UI.Window.extend(_.extend({
Common.Views.ExternalMergeEditor = Common.Views.ExternalEditor.extend(_.extend({
initialize : function(options) {
var _options = {};
_.extend(_options, {
title: this.textTitle,
width: 910,
height: (Common.Utils.innerHeight()-700)<0 ? Common.Utils.innerHeight(): 700,
cls: 'advanced-settings-dlg',
header: true,
toolclose: 'hide',
toolcallback: _.bind(this.onToolClose, this)
storageName: 'merge-editor',
sdkplaceholder: 'id-merge-editor-placeholder',
initwidth: 900,
initheight: 700,
minwidth: 370,
minheight: 275
}, options);
this.template = [
'<div id="id-merge-editor-container" class="box" style="height:' + (_options.height-85) + 'px;">',
'<div id="id-merge-editor-placeholder" style="width: 100%;height: 100%;"></div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer" style="text-align: center;">',
'<button id="id-btn-merge-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
'<button id="id-btn-merge-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
'</div>'
].join('');
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._mergeData = null;
this._isNewMerge = true;
Common.UI.Window.prototype.initialize.call(this, _options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
this.btnSave = new Common.UI.Button({
el: $('#id-btn-merge-editor-apply'),
disabled: true
});
this.btnCancel = new Common.UI.Button({
el: $('#id-btn-merge-editor-cancel'),
disabled: true
});
this.$window.find('.tool.close').addClass('disabled');
this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
Common.Views.ExternalEditor.prototype.initialize.call(this, _options);
},
setMergeData: function(data) {
@ -96,54 +65,6 @@ define([
this.fireEvent('setmergedata', this);
},
setEditMode: function(mode) {
this._isNewMerge = !mode;
},
isEditMode: function() {
return !this._isNewMerge;
},
setControlsDisabled: function(disable) {
this.btnSave.setDisabled(disable);
this.btnCancel.setDisabled(disable);
(disable) ? this.$window.find('.tool.close').addClass('disabled') : this.$window.find('.tool.close').removeClass('disabled');
},
onDlgBtnClick: function(event) {
var state = event.currentTarget.attributes['result'].value;
if ( this.handler && this.handler.call(this, state) )
return;
this.hide();
},
onToolClose: function() {
if ( this.handler && this.handler.call(this, 'cancel') )
return;
this.hide();
},
setHeight: function(height) {
if (height >= 0) {
var min = parseInt(this.$window.css('min-height'));
height < min && (height = min);
this.$window.height(height);
var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85);
var top = (Common.Utils.innerHeight() - parseInt(height)) / 2;
var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left);
this.$window.css('top',top);
}
},
textSave: 'Save & Exit',
textClose: 'Close',
textTitle: 'Mail Merge Recipients'
}, Common.Views.ExternalMergeEditor || {}));
});

View file

@ -39,59 +39,24 @@
*/
define([
'common/main/lib/component/Window'
'common/main/lib/view/ExternalEditor'
], function () { 'use strict';
Common.Views.ExternalOleEditor = Common.UI.Window.extend(_.extend({
Common.Views.ExternalOleEditor = Common.Views.ExternalEditor.extend(_.extend({
initialize : function(options) {
var _options = {};
var _inner_height = Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top');
_.extend(_options, {
title: this.textTitle,
width: 910,
height: (_inner_height - 700)<0 ? _inner_height : 700,
cls: 'advanced-settings-dlg',
header: true,
toolclose: 'hide',
toolcallback: _.bind(this.onToolClose, this)
storageName: 'ole-editor',
sdkplaceholder: 'id-ole-editor-placeholder',
initwidth: 900,
initheight: 700,
minwidth: 860,
minheight: 275
}, options);
this.template = [
'<div id="id-ole-editor-container" class="box" style="height:' + (_options.height-85) + 'px;">',
'<div id="id-ole-editor-placeholder" style="width: 100%;height: 100%;"></div>',
'</div>',
'<div class="separator horizontal"></div>',
'<div class="footer" style="text-align: center;">',
'<button id="id-btn-ole-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
'<button id="id-btn-ole-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
'</div>'
].join('');
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._oleData = null;
this._isNewOle = true;
Common.UI.Window.prototype.initialize.call(this, _options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
this.btnSave = new Common.UI.Button({
el: $('#id-btn-ole-editor-apply'),
disabled: true
});
this.btnCancel = new Common.UI.Button({
el: $('#id-btn-ole-editor-cancel')
});
this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
},
show: function() {
this.setPlaceholder();
Common.UI.Window.prototype.show.apply(this, arguments);
Common.Views.ExternalEditor.prototype.initialize.call(this, _options);
},
setOleData: function(data) {
@ -100,65 +65,6 @@ define([
this.fireEvent('setoledata', this);
},
setEditMode: function(mode) {
this._isNewOle = !mode;
},
isEditMode: function() {
return !this._isNewOle;
},
setControlsDisabled: function(disable) {
this.btnSave.setDisabled(disable);
this.btnCancel.setDisabled(disable);
(disable) ? this.$window.find('.tool.close').addClass('disabled') : this.$window.find('.tool.close').removeClass('disabled');
},
onDlgBtnClick: function(event) {
if ( this.handler ) {
this.handler.call(this, event.currentTarget.attributes['result'].value);
return;
}
this.hide();
},
onToolClose: function() {
if ( this.handler ) {
this.handler.call(this, 'cancel');
return;
}
this.hide();
},
setHeight: function(height) {
if (height >= 0) {
var min = parseInt(this.$window.css('min-height'));
height < min && (height = min);
this.$window.height(height);
var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85);
var top = (Common.Utils.innerHeight() - Common.Utils.InternalSettings.get('window-inactive-area-top') - parseInt(height)) / 2;
var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left);
this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top') + top);
}
},
setPlaceholder: function(placeholder) {
this._placeholder = placeholder;
},
getPlaceholder: function() {
return this._placeholder;
},
textSave: 'Save & Exit',
textClose: 'Close',
textTitle: 'Spreadsheet Editor'
}, Common.Views.ExternalOleEditor || {}));
});

View file

@ -126,6 +126,7 @@ define([
var templateTitleBox = '<section id="box-document-title">' +
'<div class="extra"></div>' +
'<div class="hedset">' +
'<div class="btn-slot" id="slot-btn-dt-home"></div>' +
'<div class="btn-slot" id="slot-btn-dt-save" data-layout-name="header-save"></div>' +
'<div class="btn-slot" id="slot-btn-dt-print"></div>' +
'<div class="btn-slot" id="slot-btn-dt-undo"></div>' +

View file

@ -207,6 +207,7 @@ define([
type: 'password',
showCls: (this.options.iconType==='svg' ? 'svg-icon' : 'toolbar__icon') + ' btn-sheet-view',
hideCls: (this.options.iconType==='svg' ? 'svg-icon' : 'toolbar__icon') + ' hide-password',
maxLength: this.options.maxPasswordLength,
validateOnBlur: false,
showPwdOnClick: true,
validation : function(value) {

View file

@ -154,6 +154,8 @@ define([
this.$window.css('left',(maxWidth - width - borders_width) / 2);
this.$window.css('top',(maxHeight - height - this._headerFooterHeight) / 2);
this._restoreHeight = this._restoreWidth = undefined;
},
onWindowResize: function() {
@ -162,27 +164,39 @@ define([
win_width = this.getWidth(),
win_height = this.getHeight(),
bordersOffset = (this.resizable) ? 0 : this.bordersOffset;
if (win_height<main_height-bordersOffset*2+0.1 && win_width<main_width-bordersOffset*2+0.1) {
var left = this.getLeft(),
top = this.getTop();
if (win_height<main_height-bordersOffset*2+0.1 ) {
if (!this.resizable && this._restoreHeight>0 && win_height < this._restoreHeight) {
var height = Math.max(Math.min(this._restoreHeight, main_height-bordersOffset*2), this.initConfig.minheight);
this.setHeight(height);
this.boxEl.css('height', height - this._headerFooterHeight);
}
var top = this.getTop();
if (top<bordersOffset) this.$window.css('top', bordersOffset);
else if (top+win_height>main_height-bordersOffset)
this.$window.css('top', main_height-bordersOffset - win_height);
if (left<bordersOffset) this.$window.css('left', bordersOffset);
else if (left+win_width>main_width-bordersOffset)
this.$window.css('left', main_width-bordersOffset-win_width);
} else {
if (win_height>main_height-bordersOffset*2) {
if (this._restoreHeight===undefined) {
this._restoreHeight = win_height;
}
this.setHeight(Math.max(main_height-bordersOffset*2, this.initConfig.minheight));
this.boxEl.css('height', Math.max(main_height-bordersOffset*2, this.initConfig.minheight) - this._headerFooterHeight);
this.$window.css('top', bordersOffset);
}
if (win_width>main_width-bordersOffset*2) {
if (win_width<main_width-bordersOffset*2+0.1) {
if (!this.resizable && this._restoreWidth>0 && win_width < this._restoreWidth) {
this.setWidth(Math.max(Math.min(this._restoreWidth, main_width-bordersOffset*2), this.initConfig.minwidth));
}
var left = this.getLeft();
if (left<bordersOffset) this.$window.css('left', bordersOffset);
else if (left+win_width>main_width-bordersOffset)
this.$window.css('left', main_width-bordersOffset-win_width);
} else {
if (this._restoreWidth===undefined) {
this._restoreWidth = win_width;
}
this.setWidth(Math.max(main_width-bordersOffset*2, this.initConfig.minwidth));
this.$window.css('left', bordersOffset);
}
}
},
showButton: function(id) {

View file

@ -74,14 +74,16 @@ define([
_.extend(this, options);
this._locked = false;
this._state = {
DisabledControls: false
DisabledControls: false,
docProtection: {
isReadOnly: false,
isReviewOnly: false,
isFormsOnly: false,
isCommentsOnly: false
}
};
this.lockedControls = [];
Common.UI.BaseView.prototype.initialize.call(this, arguments);
Common.NotificationCenter.on('app:ready', function (mode) {
Common.Utils.asyncCall(this._onAppReady, this, mode);
}.bind(this));
},
render: function(el) {
@ -153,6 +155,7 @@ define([
if ( !this.storePlugins.isEmpty() ) {
var me = this;
var _group = $('<div class="group"></div>');
var _set = Common.enumLock;
this.storePlugins.each(function (model) {
if (model.get('visible')) {
var modes = model.get('variations'),
@ -167,6 +170,7 @@ define([
split: modes && modes.length > 1,
value: guid,
hint: model.get('name'),
lock: model.get('isDisplayedInViewer') ? [_set.viewMode, _set.previewReviewMode, _set.viewFormMode, _set.selRangeEdit, _set.editFormula] : [_set.viewMode, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.selRangeEdit, _set.editFormula],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
@ -179,6 +183,10 @@ define([
me.lockedControls.push(btn);
}
});
var docProtection = me._state.docProtection
Common.Utils.lockControls(Common.enumLock.docLockView, docProtection.isReadOnly, {array: me.lockedControls});
Common.Utils.lockControls(Common.enumLock.docLockForms, docProtection.isFormsOnly, {array: me.lockedControls});
Common.Utils.lockControls(Common.enumLock.docLockComments, docProtection.isCommentsOnly, {array: me.lockedControls});
parent.html(_group);
$('<div class="separator long"></div>').prependTo(parent);
@ -204,6 +212,16 @@ define([
}
},
SetDisabled: function(disable, reviewMode, fillFormMode) {
if (reviewMode) {
Common.Utils.lockControls(Common.enumLock.previewReviewMode, disable, {array: this.lockedControls});
} else if (fillFormMode) {
Common.Utils.lockControls(Common.enumLock.viewFormMode, disable, {array: this.lockedControls});
} else {
Common.Utils.lockControls(Common.enumLock.viewMode, disable, {array: this.lockedControls});
}
},
openInsideMode: function(name, url, frameId) {
if (!this.pluginsPanel) return false;
@ -289,9 +307,6 @@ define([
this.loadMask.hide();
},
_onAppReady: function (mode) {
},
parseIcons: function(icons) {
if (icons.length && typeof icons[0] !== 'string') {
var theme = Common.UI.Themes.currentThemeId().toLowerCase(),
@ -389,6 +404,7 @@ define([
});
});
var _set = Common.enumLock;
var btn = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconImg: icon_url,
@ -397,6 +413,7 @@ define([
split: _menu_items.length > 1,
value: guid,
hint: model.get('name'),
lock: model.get('isDisplayedInViewer') ? [_set.viewMode, _set.previewReviewMode, _set.viewFormMode, _set.selRangeEdit, _set.editFormula] : [_set.viewMode, _set.previewReviewMode, _set.viewFormMode, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.selRangeEdit, _set.editFormula ],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'

View file

@ -78,6 +78,9 @@ define([
});
});
this.btnPwd.on('click', function (b, e) {
!b.pressed && me.fireEvent('protect:password', [b, 'delete']);
});
this.btnPwd.menu.on('item:click', function (menu, item, e) {
me.fireEvent('protect:password', [menu, item.value]);
});
@ -132,6 +135,8 @@ define([
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-ic-protect',
caption: this.txtEncrypt,
split: true,
enableToggle: true,
menu: true,
visible: false,
dataHint : '1',
@ -172,7 +177,7 @@ define([
if ( config.canProtect) {
if ( config.isPasswordSupport) {
me.btnAddPwd.updateHint(me.hintAddPwd);
me.btnPwd.updateHint(me.hintPwd);
me.btnPwd.updateHint([me.hintDelPwd, me.hintPwd]);
me.btnPwd.setMenu(
new Common.UI.Menu({
@ -342,6 +347,7 @@ define([
}
}, this);
this.btnPwd.setVisible(hasPassword);
this.btnPwd.toggle(hasPassword, true);
},
txtEncrypt: 'Encrypt',
@ -353,7 +359,8 @@ define([
txtDeletePwd: 'Delete password',
txtAddPwd: 'Add password',
txtInvisibleSignature: 'Add digital signature',
txtSignatureLine: 'Add Signature line'
txtSignatureLine: 'Add Signature line',
hintDelPwd: 'Delete password'
}
}()), Common.Views.Protection || {}));
});

View file

@ -238,6 +238,10 @@ define([
me.fireEvent('comment:resolveComments', [item.value]);
});
}
Common.NotificationCenter.on('protect:doclock', function (e) {
me.fireEvent('protect:update');
});
me.fireEvent('protect:update');
}
return {
@ -259,7 +263,7 @@ define([
caption: this.txtAccept,
split: !this.appConfig.canUseReviewPermissions,
iconCls: 'toolbar__icon btn-review-save',
lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
@ -271,7 +275,7 @@ define([
caption: this.txtReject,
split: !this.appConfig.canUseReviewPermissions,
iconCls: 'toolbar__icon btn-review-deny',
lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
@ -284,7 +288,7 @@ define([
caption: this.txtCompare,
split: true,
iconCls: 'toolbar__icon btn-compare',
lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
@ -294,7 +298,7 @@ define([
this.btnTurnOn = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-ic-review',
lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
caption: this.txtTurnon,
split: !this.appConfig.isReviewOnly,
enableToggle: true,
@ -309,7 +313,7 @@ define([
this.btnPrev = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-review-prev',
lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
caption: this.txtPrev,
dataHint: '1',
dataHintDirection: 'bottom',
@ -320,7 +324,7 @@ define([
this.btnNext = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-review-next',
lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
caption: this.txtNext,
dataHint: '1',
dataHintDirection: 'bottom',
@ -336,7 +340,7 @@ define([
this.btnReviewView = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-ic-reviewview',
lock: [_set.viewFormMode, _set.lostConnect],
lock: [_set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments],
caption: this.txtView,
menu: new Common.UI.Menu({
cls: 'ppm-toolbar',
@ -404,7 +408,7 @@ define([
this.btnCoAuthMode = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-ic-coedit',
lock: [_set.viewFormMode, _set.lostConnect],
lock: [_set.viewFormMode, _set.lostConnect, _set.docLockView],
caption: this.txtCoAuthMode,
menu: true,
dataHint: '1',
@ -445,12 +449,13 @@ define([
}
if ( this.appConfig.canCoAuthoring && this.appConfig.canComments ) {
this.canComments = true; // fix for loading protected document
this.btnCommentRemove = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
caption: this.txtCommentRemove,
split: true,
iconCls: 'toolbar__icon btn-rem-comment',
lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect],
lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
@ -461,15 +466,13 @@ define([
caption: this.txtCommentResolve,
split: true,
iconCls: 'toolbar__icon btn-resolve-all',
lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect],
lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
});
this.lockedControls.push(this.btnCommentResolve);
}
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
render: function (el) {
@ -658,7 +661,7 @@ define([
}
var separator_sharing = !(me.btnSharing || me.btnCoAuthMode) ? me.$el.find('.separator.sharing') : '.separator.sharing',
separator_comments = !(config.canComments && config.canCoAuthoring) ? me.$el.find('.separator.comments') : '.separator.comments',
separator_comments = !(me.btnCommentRemove || me.btnCommentResolve) ? me.$el.find('.separator.comments') : '.separator.comments',
separator_review = !(config.canReview || config.canViewReview) ? me.$el.find('.separator.review') : '.separator.review',
separator_compare = !(config.canReview && config.canFeatureComparison) ? me.$el.find('.separator.compare') : '.separator.compare',
separator_chat = !me.btnChat ? me.$el.find('.separator.chat') : '.separator.chat',
@ -692,8 +695,7 @@ define([
if (!me.btnHistory && separator_last)
me.$el.find(separator_last).hide();
Common.NotificationCenter.trigger('tab:visible', 'review', (config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments) && Common.UI.LayoutManager.isElementVisible('toolbar-collaboration'));
Common.NotificationCenter.trigger('tab:visible', 'review', (config.isEdit || config.canViewReview || me.canComments) && Common.UI.LayoutManager.isElementVisible('toolbar-collaboration'));
setEvents.call(me);
});
},
@ -731,7 +733,7 @@ define([
var button = new Common.UI.Button({
cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-ic-review',
lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.lostConnect],
lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.lostConnect, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.docLockComments, Common.enumLock.docLockReview],
hintAnchor : 'top',
hint : this.tipReview,
split : !this.appConfig.isReviewOnly,
@ -778,7 +780,7 @@ define([
button = new Common.UI.Button({
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-ic-docspell',
lock: [Common.enumLock.viewMode, Common.enumLock.viewFormMode, Common.enumLock.previewReviewMode],
lock: [Common.enumLock.viewMode, Common.enumLock.viewFormMode, Common.enumLock.previewReviewMode, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.docLockComments],
hintAnchor : 'top',
hint: this.tipSetSpelling,
enableToggle: true,
@ -794,7 +796,7 @@ define([
button = new Common.UI.Button({
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-ic-doclang',
lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.noSpellcheckLangs, Common.enumLock.lostConnect],
lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.noSpellcheckLangs, Common.enumLock.lostConnect, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.docLockComments],
hintAnchor : 'top',
hint: this.tipSetDocLang,
dataHint: '0',
@ -973,6 +975,7 @@ define([
this.options.tpl = _.template(this.template)(this.options);
this.popoverChanges = this.options.popoverChanges;
this.mode = this.options.mode;
this.docProtection = this.options.docProtection;
var filter = Common.localStorage.getKeysFilter();
this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
@ -983,6 +986,7 @@ define([
render: function() {
Common.UI.Window.prototype.render.call(this);
var _set = Common.enumLock;
this.btnPrev = new Common.UI.Button({
cls: 'dlg-btn iconic',
iconCls: 'img-commonctrl prev',
@ -1003,7 +1007,8 @@ define([
cls : 'btn-toolbar',
caption : this.txtAccept,
split : true,
disabled : this.mode.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
disabled : this.mode.isReviewOnly || this.docProtection.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
lock : [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
menu : this.mode.canUseReviewPermissions ? false : new Common.UI.Menu({
items: [
this.mnuAcceptCurrent = new Common.UI.MenuItem({
@ -1023,7 +1028,7 @@ define([
cls : 'btn-toolbar',
caption : this.txtReject,
split : true,
disabled : this.mode.isReviewOnly || !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"),
lock : [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview],
menu : this.mode.canUseReviewPermissions ? false : new Common.UI.Menu({
items: [
this.mnuRejectCurrent = new Common.UI.MenuItem({
@ -1038,6 +1043,13 @@ define([
})
});
this.btnReject.render(this.$window.find('#id-review-button-reject'));
var arr = [this.btnAccept, this.btnReject];
Common.Utils.lockControls(Common.enumLock.isReviewOnly, this.mode.isReviewOnly, {array: arr});
Common.Utils.lockControls(Common.enumLock.docLockView, this.docProtection.isReadOnly, {array: arr});
Common.Utils.lockControls(Common.enumLock.docLockForms, this.docProtection.isFormsOnly, {array: arr});
Common.Utils.lockControls(Common.enumLock.docLockReview, this.docProtection.isReviewOnly, {array: arr});
Common.Utils.lockControls(Common.enumLock.docLockComments, this.docProtection.isCommentsOnly, {array: arr});
Common.Utils.lockControls(Common.enumLock.reviewChangelock, !!Common.Utils.InternalSettings.get(this.appPrefix + "accept-reject-lock"), {array: arr});
var me = this;
this.btnPrev.on('click', function (e) {

View file

@ -63,10 +63,7 @@ define([
}, options || {});
this.template = [
'<div class="box" style="height: 260px;">',
'<div class="input-row">',
'<label>' + this.textInfo + '</label>',
'</div>',
'<div class="box" style="height: 250px;">',
'<div class="input-row">',
'<label>' + this.textInfoName + '</label>',
'</div>',
@ -125,6 +122,7 @@ define([
});
me.textareaInstructions = this.$window.find('textarea');
me.textareaInstructions.val(this.textDefInstruction);
me.textareaInstructions.keydown(function (event) {
if (event.keyCode == Common.UI.Keys.RETURN) {
event.stopPropagation();
@ -136,7 +134,8 @@ define([
this.chDate = new Common.UI.CheckBox({
el: $('#id-dlg-sign-settings-date'),
labelText: this.textShowDate,
disabled: this.type=='view'
disabled: this.type=='view',
value: 'checked'
});
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
@ -198,13 +197,14 @@ define([
},
textInfo: 'Signer Info',
textInfoName: 'Name',
textInfoTitle: 'Signer Title',
textInfoEmail: 'E-mail',
textInstructions: 'Instructions for Signer',
textInfoName: 'Suggested signer',
textInfoTitle: 'Suggested signer\'s title',
textInfoEmail: 'Suggested signer\'s e-mail',
textInstructions: 'Instructions for signer',
txtEmpty: 'This field is required',
textAllowComment: 'Allow signer to add comment in the signature dialog',
textShowDate: 'Show sign date in signature line',
textTitle: 'Signature Setup'
textTitle: 'Signature Setup',
textDefInstruction: 'Before signing this document, verify that the content you are signing is correct.'
}, Common.Views.SignSettingsDialog || {}))
});

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 462 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 360 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 562 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 548 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 330 B

After

Width:  |  Height:  |  Size: 244 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 363 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 712 B

View file

@ -25,7 +25,7 @@
}
{{/spritesheet}}
{{#sprites}}
{{#parselang name}}.x-huge .{{name}}{{/parselang}},
{{#parselang name}}.x-huge .{{name}}{{/parselang}}:not(.menu__icon),
.toolbar__icon-big.{{name}}
{
background-position: 0 {{px.offset_y}};

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 371 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Some files were not shown because too many files have changed in this diff Show more