diff --git a/.gitignore b/.gitignore index 5e4e0e31b..78c52c465 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ customization .*.swp *.db /customize/ +customize messages.log .DS_Store www/scratch diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a51b1ef9..bb11c061d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ Features * We spent some time improving the support ticket components of the administration panel. Tickets are now shown in four categories: tickets from premium users, tickets from non-paying users, answered tickets, and closed tickets. * We also improved the readability of some of the server's activity logs by rounding off some numbers to display fewer decimal points. On a related note, log events indicating the completion of a file upload now display the size of the uploaded file. * Errors that occur when loading teams now trigger some basic telemetry to the server to indicate the error code. This should help us determine the origin of some annoying teams issues that several users have reported. -* Users of the rich text editor should now find that their scroll position is now maintained when they are at the bottom of the document and a remote users adds more text. +* Users of the rich text editor should now find that their scroll position is maintained when they are at the bottom of the document and a remote users adds more text. Bug fixes @@ -20,6 +20,8 @@ Bug fixes * We found that shared folders were reconnecting to the server correctly after a network failure, however, some changes in the UI caused clients to incorrectly remain locked. * Some recent refactoring of some styles caused some buttons on the login page to inherit bootstrap's styles instead of our custom ones. * A third-party admin brought it to our attention that a library that was used for some development tests was being fetched via http instead of https, and was thus blocked by some of their local configuration parameters. We've updated its source to load via secure protocols only. +* The recent replacement of a link to our faq with a link to our documentation platform violated some security headers and prevented the link from loading. We've fixed the inline link with some code to open this link in a compatible way. +* Finally, we found a bug that caused custom colors in the slide app to revert to the default settings on page reloads. Custom slide colors should now be preserved. To update from 3.25.0 to 3.25.1: diff --git a/customize.dist/404.html b/customize.dist/404.html index 9298a5377..0030c2bcd 100644 --- a/customize.dist/404.html +++ b/customize.dist/404.html @@ -2,10 +2,10 @@ - CryptPad: Zero Knowledge, Collaborative Real Time Editing + CryptPad: Collaboration suite, encrypted and open-source - + diff --git a/customize.dist/CryptPad_logo.svg b/customize.dist/CryptPad_logo.svg new file mode 100644 index 000000000..1944b9142 --- /dev/null +++ b/customize.dist/CryptPad_logo.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/customize.dist/CryptPad_logo_grey.svg b/customize.dist/CryptPad_logo_grey.svg new file mode 100644 index 000000000..cbadd7697 --- /dev/null +++ b/customize.dist/CryptPad_logo_grey.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/customize.dist/about.html b/customize.dist/about.html deleted file mode 100644 index 31d4c99f8..000000000 --- a/customize.dist/about.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - CryptPad: Zero Knowledge, Collaborative Real Time Editing - - - - - - - - diff --git a/customize.dist/alt-favicon.png b/customize.dist/alt-favicon.png deleted file mode 100644 index 23753684f..000000000 Binary files a/customize.dist/alt-favicon.png and /dev/null differ diff --git a/customize.dist/bg14.jpg b/customize.dist/bg14.jpg deleted file mode 100644 index 7f5211229..000000000 Binary files a/customize.dist/bg14.jpg and /dev/null differ diff --git a/customize.dist/bkabout.jpg b/customize.dist/bkabout.jpg deleted file mode 100644 index d9434609e..000000000 Binary files a/customize.dist/bkabout.jpg and /dev/null differ diff --git a/customize.dist/bkregister.jpg b/customize.dist/bkregister.jpg deleted file mode 100644 index a67a3b03e..000000000 Binary files a/customize.dist/bkregister.jpg and /dev/null differ diff --git a/customize.dist/bkwhat.jpg b/customize.dist/bkwhat.jpg deleted file mode 100644 index 90a2841e3..000000000 Binary files a/customize.dist/bkwhat.jpg and /dev/null differ diff --git a/customize.dist/code.svg b/customize.dist/code.svg deleted file mode 100644 index 29647b529..000000000 --- a/customize.dist/code.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/customize.dist/contact.html b/customize.dist/contact.html index 31d4c99f8..f1cf1b429 100644 --- a/customize.dist/contact.html +++ b/customize.dist/contact.html @@ -2,10 +2,10 @@ - CryptPad: Zero Knowledge, Collaborative Real Time Editing + CryptPad: Collaboration suite, encrypted and open-source - + diff --git a/customize.dist/faq.html b/customize.dist/down.html similarity index 50% rename from customize.dist/faq.html rename to customize.dist/down.html index d485505dd..6005f2ad6 100644 --- a/customize.dist/faq.html +++ b/customize.dist/down.html @@ -1,17 +1,21 @@ - + CryptPad: Zero Knowledge, Collaborative Real Time Editing - - - + +

CryptPad

+

We're temporarily offline while we recover from a bad data-center outage

+

Your data is safe, but we need to move it to a new machine. +
+
+ We'll be back as soon as possible. +

+

For the latest updates, follow us on Mastodon or Twitter.

+ diff --git a/customize.dist/favicon/alt-favicon-code.png b/customize.dist/favicon/alt-favicon-code.png new file mode 100644 index 000000000..a15038d97 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-code.png differ diff --git a/customize.dist/favicon/alt-favicon-kanban.png b/customize.dist/favicon/alt-favicon-kanban.png new file mode 100644 index 000000000..1db1114ac Binary files /dev/null and b/customize.dist/favicon/alt-favicon-kanban.png differ diff --git a/customize.dist/favicon/alt-favicon-pad.png b/customize.dist/favicon/alt-favicon-pad.png new file mode 100644 index 000000000..cbc20de3c Binary files /dev/null and b/customize.dist/favicon/alt-favicon-pad.png differ diff --git a/customize.dist/favicon/alt-favicon-poll.png b/customize.dist/favicon/alt-favicon-poll.png new file mode 100644 index 000000000..2194e35b7 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-poll.png differ diff --git a/customize.dist/favicon/alt-favicon-sheet.png b/customize.dist/favicon/alt-favicon-sheet.png new file mode 100644 index 000000000..0cb370f7b Binary files /dev/null and b/customize.dist/favicon/alt-favicon-sheet.png differ diff --git a/customize.dist/favicon/alt-favicon-slide.png b/customize.dist/favicon/alt-favicon-slide.png new file mode 100644 index 000000000..d3824b9dd Binary files /dev/null and b/customize.dist/favicon/alt-favicon-slide.png differ diff --git a/customize.dist/favicon/alt-favicon-whiteboard.png b/customize.dist/favicon/alt-favicon-whiteboard.png new file mode 100644 index 000000000..1f94fb6e4 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-whiteboard.png differ diff --git a/customize.dist/favicon/alt-favicon.png b/customize.dist/favicon/alt-favicon.png new file mode 100644 index 000000000..f7d472090 Binary files /dev/null and b/customize.dist/favicon/alt-favicon.png differ diff --git a/customize.dist/favicon/favicon_source.svg b/customize.dist/favicon/favicon_source.svg new file mode 100644 index 000000000..46329f2fa --- /dev/null +++ b/customize.dist/favicon/favicon_source.svg @@ -0,0 +1,498 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/customize.dist/favicon/main-favicon-code.png b/customize.dist/favicon/main-favicon-code.png new file mode 100644 index 000000000..06157c70f Binary files /dev/null and b/customize.dist/favicon/main-favicon-code.png differ diff --git a/customize.dist/favicon/main-favicon-kanban.png b/customize.dist/favicon/main-favicon-kanban.png new file mode 100644 index 000000000..3a8d218ce Binary files /dev/null and b/customize.dist/favicon/main-favicon-kanban.png differ diff --git a/customize.dist/favicon/main-favicon-pad.png b/customize.dist/favicon/main-favicon-pad.png new file mode 100644 index 000000000..8c46d21dd Binary files /dev/null and b/customize.dist/favicon/main-favicon-pad.png differ diff --git a/customize.dist/favicon/main-favicon-poll.png b/customize.dist/favicon/main-favicon-poll.png new file mode 100644 index 000000000..05c8ebf45 Binary files /dev/null and b/customize.dist/favicon/main-favicon-poll.png differ diff --git a/customize.dist/favicon/main-favicon-sheet.png b/customize.dist/favicon/main-favicon-sheet.png new file mode 100644 index 000000000..6df4fd0d6 Binary files /dev/null and b/customize.dist/favicon/main-favicon-sheet.png differ diff --git a/customize.dist/favicon/main-favicon-slide.png b/customize.dist/favicon/main-favicon-slide.png new file mode 100644 index 000000000..41f98c84b Binary files /dev/null and b/customize.dist/favicon/main-favicon-slide.png differ diff --git a/customize.dist/favicon/main-favicon-teams.png b/customize.dist/favicon/main-favicon-teams.png new file mode 100644 index 000000000..3b780cc2f Binary files /dev/null and b/customize.dist/favicon/main-favicon-teams.png differ diff --git a/customize.dist/favicon/main-favicon-whiteboard.png b/customize.dist/favicon/main-favicon-whiteboard.png new file mode 100644 index 000000000..cb60edf46 Binary files /dev/null and b/customize.dist/favicon/main-favicon-whiteboard.png differ diff --git a/customize.dist/favicon/main-favicon.png b/customize.dist/favicon/main-favicon.png new file mode 100644 index 000000000..ce110f883 Binary files /dev/null and b/customize.dist/favicon/main-favicon.png differ diff --git a/customize.dist/features.html b/customize.dist/features.html index 31d4c99f8..f1cf1b429 100644 --- a/customize.dist/features.html +++ b/customize.dist/features.html @@ -2,10 +2,10 @@ - CryptPad: Zero Knowledge, Collaborative Real Time Editing + CryptPad: Collaboration suite, encrypted and open-source - + diff --git a/customize.dist/fonts/IBMPlexMono-Medium.woff b/customize.dist/fonts/IBMPlexMono-Medium.woff new file mode 100644 index 000000000..c6ca87bd1 Binary files /dev/null and b/customize.dist/fonts/IBMPlexMono-Medium.woff differ diff --git a/customize.dist/fonts/IBMPlexMono-Medium.woff2 b/customize.dist/fonts/IBMPlexMono-Medium.woff2 new file mode 100644 index 000000000..6e17c4c50 Binary files /dev/null and b/customize.dist/fonts/IBMPlexMono-Medium.woff2 differ diff --git a/customize.dist/fonts/cptools/fonts/cptools.svg b/customize.dist/fonts/cptools/fonts/cptools.svg index 8eee6df58..776b66ba3 100644 --- a/customize.dist/fonts/cptools/fonts/cptools.svg +++ b/customize.dist/fonts/cptools/fonts/cptools.svg @@ -8,22 +8,21 @@ - - + + - - - - - + + + + + - + - - - - + + + diff --git a/customize.dist/fonts/cptools/fonts/cptools.ttf b/customize.dist/fonts/cptools/fonts/cptools.ttf index 181d4268a..cfc9d1e3c 100644 Binary files a/customize.dist/fonts/cptools/fonts/cptools.ttf and b/customize.dist/fonts/cptools/fonts/cptools.ttf differ diff --git a/customize.dist/fonts/cptools/fonts/cptools.woff b/customize.dist/fonts/cptools/fonts/cptools.woff index a2b04bff9..80432d647 100644 Binary files a/customize.dist/fonts/cptools/fonts/cptools.woff and b/customize.dist/fonts/cptools/fonts/cptools.woff differ diff --git a/customize.dist/fonts/cptools/style.css b/customize.dist/fonts/cptools/style.css index 74ebac0b5..7fad69146 100644 --- a/customize.dist/fonts/cptools/style.css +++ b/customize.dist/fonts/cptools/style.css @@ -1,9 +1,9 @@ @font-face { font-family: 'cptools'; src: - url('fonts/cptools.ttf?5ntnhs') format('truetype'), - url('fonts/cptools.woff?5ntnhs') format('woff'), - url('fonts/cptools.svg?5ntnhs#cptools') format('svg'); + url('fonts/cptools.ttf?n9y2kz') format('truetype'), + url('fonts/cptools.woff?n9y2kz') format('woff'), + url('fonts/cptools.svg?n9y2kz#cptools') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -25,6 +25,39 @@ -moz-osx-font-smoothing: grayscale; } +.cptools-sheet:before { + content: "\e908"; +} +.cptools-slide:before { + content: "\e907"; +} +.cptools-whiteboard:before { + content: "\e901"; +} +.cptools-new-template:before { + content: "\e902"; +} +.cptools-file-upload:before { + content: "\e904"; +} +.cptools-template:before { + content: "\e905"; +} +.cptools-poll:before { + content: "\e906"; +} +.cptools-kanban:before { + content: "\e90a"; +} +.cptools-code:before { + content: "\e90d"; +} +.cptools-richtext:before { + content: "\e90e"; +} +.cptools-file:before { + content: "\e90f"; +} .cptools-destroy:before { content: "\e915"; } @@ -40,54 +73,18 @@ .cptools-folder-no-color:before { content: "\e900"; } -.cptools-slide:before { - content: "\e902"; -} .cptools-shared-folder:before { content: "\e903"; } -.cptools-poll:before { - content: "\e904"; -} -.cptools-file-upload:before { - content: "\e905"; -} -.cptools-whiteboard:before { - content: "\e906"; -} -.cptools-todo:before { - content: "\e907"; -} -.cptools-pad:before { - content: "\e908"; -} .cptools-folder-open:before { content: "\e909"; } -.cptools-kanban:before { - content: "\e90a"; -} .cptools-folder:before { content: "\e90b"; } .cptools-shared-folder-open:before { content: "\e90c"; } -.cptools-file:before { - content: "\e90d"; -} -.cptools-contacts:before { - content: "\e90e"; -} -.cptools-code:before { - content: "\e90f"; -} -.cptools-template:before { - content: "\e901"; -} -.cptools-new-template:before { - content: "\e910"; -} .cptools-palette:before { content: "\e911"; } diff --git a/customize.dist/fonts/lato/Lato-Black.ttf b/customize.dist/fonts/lato/Lato-Black.ttf deleted file mode 100644 index 6848db0d1..000000000 Binary files a/customize.dist/fonts/lato/Lato-Black.ttf and /dev/null differ diff --git a/customize.dist/fonts/lato/Lato-Italic.ttf b/customize.dist/fonts/lato/Lato-Italic.ttf deleted file mode 100644 index 3d3b7a298..000000000 Binary files a/customize.dist/fonts/lato/Lato-Italic.ttf and /dev/null differ diff --git a/customize.dist/fonts/lato/Lato-Regular.ttf b/customize.dist/fonts/lato/Lato-Regular.ttf deleted file mode 100644 index 04ea8efb1..000000000 Binary files a/customize.dist/fonts/lato/Lato-Regular.ttf and /dev/null differ diff --git a/customize.dist/fonts/lato/METADATA.json b/customize.dist/fonts/lato/METADATA.json deleted file mode 100644 index 31213e2d8..000000000 --- a/customize.dist/fonts/lato/METADATA.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "name": "Lato", - "designer": "Łukasz Dziedzic", - "license": "OFL", - "visibility": "External", - "category": "Sans Serif", - "size": 51318, - "fonts": [ - { - "name": "Lato", - "style": "normal", - "weight": 100, - "filename": "Lato-Hairline.ttf", - "postScriptName": "Lato-Hairline", - "fullName": "Lato Hairline", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "italic", - "weight": 100, - "filename": "Lato-HairlineItalic.ttf", - "postScriptName": "Lato-HairlineItalic", - "fullName": "Lato Hairline Italic", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "normal", - "weight": 300, - "filename": "Lato-Light.ttf", - "postScriptName": "Lato-Light", - "fullName": "Lato Light", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "italic", - "weight": 300, - "filename": "Lato-LightItalic.ttf", - "postScriptName": "Lato-LightItalic", - "fullName": "Lato Light Italic", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "normal", - "weight": 400, - "filename": "Lato-Regular.ttf", - "postScriptName": "Lato-Regular", - "fullName": "Lato Regular", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "italic", - "weight": 400, - "filename": "Lato-Italic.ttf", - "postScriptName": "Lato-Italic", - "fullName": "Lato Italic", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "normal", - "weight": 700, - "filename": "Lato-Bold.ttf", - "postScriptName": "Lato-Bold", - "fullName": "Lato Bold", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "italic", - "weight": 700, - "filename": "Lato-BoldItalic.ttf", - "postScriptName": "Lato-BoldItalic", - "fullName": "Lato Bold Italic", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "normal", - "weight": 900, - "filename": "Lato-Black.ttf", - "postScriptName": "Lato-Black", - "fullName": "Lato Black", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - }, - { - "name": "Lato", - "style": "italic", - "weight": 900, - "filename": "Lato-BlackItalic.ttf", - "postScriptName": "Lato-BlackItalic", - "fullName": "Lato Black Italic", - "copyright": "Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name \"Lato\". Licensed under the SIL Open Font License, Version 1.1." - } - ], - "subsets": [ - "latin", - "latin-ext", - "menu" - ], - "dateAdded": "2010-12-15" -} diff --git a/customize.dist/fonts/lato/OFL.txt b/customize.dist/fonts/lato/OFL.txt deleted file mode 100644 index 98383e3d8..000000000 --- a/customize.dist/fonts/lato/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/customize.dist/fonts/neuropolitical.ttf b/customize.dist/fonts/neuropolitical.ttf deleted file mode 100644 index 26bbb63ce..000000000 Binary files a/customize.dist/fonts/neuropolitical.ttf and /dev/null differ diff --git a/customize.dist/four-oh-four.js b/customize.dist/four-oh-four.js index bcae8b4b2..568faf951 100644 --- a/customize.dist/four-oh-four.js +++ b/customize.dist/four-oh-four.js @@ -9,7 +9,7 @@ define([ ], function ($, Config, h, LocalStore, Messages) { var urlArgs = Config.requireConf.urlArgs; var img = h('img#cp-logo', { - src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs + src: '/customize/CryptPad_logo_grey.svg?' + urlArgs }); var brand = h('h1#cp-brand', 'CryptPad'); diff --git a/customize.dist/images/AaronMacSween.jpg b/customize.dist/images/AaronMacSween.jpg deleted file mode 100644 index 95afcda67..000000000 Binary files a/customize.dist/images/AaronMacSween.jpg and /dev/null differ diff --git a/customize.dist/images/CalebJames.jpg b/customize.dist/images/CalebJames.jpg deleted file mode 100644 index 0e29dd116..000000000 Binary files a/customize.dist/images/CalebJames.jpg and /dev/null differ diff --git a/customize.dist/images/Catalin.jpg b/customize.dist/images/Catalin.jpg deleted file mode 100644 index 508c0692e..000000000 Binary files a/customize.dist/images/Catalin.jpg and /dev/null differ diff --git a/customize.dist/images/LudovicDuboist.jpg b/customize.dist/images/LudovicDuboist.jpg deleted file mode 100644 index 09bf4afba..000000000 Binary files a/customize.dist/images/LudovicDuboist.jpg and /dev/null differ diff --git a/customize.dist/images/Pierre-new.jpg b/customize.dist/images/Pierre-new.jpg deleted file mode 100644 index c8dafbe41..000000000 Binary files a/customize.dist/images/Pierre-new.jpg and /dev/null differ diff --git a/customize.dist/images/apps-preview.png b/customize.dist/images/apps-preview.png new file mode 100644 index 000000000..1ef33fede Binary files /dev/null and b/customize.dist/images/apps-preview.png differ diff --git a/customize.dist/images/bkcontact.jpg b/customize.dist/images/bkcontact.jpg deleted file mode 100644 index bae61ba1a..000000000 Binary files a/customize.dist/images/bkcontact.jpg and /dev/null differ diff --git a/customize.dist/images/collaboration.png b/customize.dist/images/collaboration.png new file mode 100644 index 000000000..16e5dc77b Binary files /dev/null and b/customize.dist/images/collaboration.png differ diff --git a/customize.dist/images/cover-faq.jpg b/customize.dist/images/cover-faq.jpg deleted file mode 100644 index 27be3af99..000000000 Binary files a/customize.dist/images/cover-faq.jpg and /dev/null differ diff --git a/customize.dist/images/cover-features.jpg b/customize.dist/images/cover-features.jpg deleted file mode 100644 index 6652c9b28..000000000 Binary files a/customize.dist/images/cover-features.jpg and /dev/null differ diff --git a/customize.dist/images/cover-privacy.jpg b/customize.dist/images/cover-privacy.jpg deleted file mode 100644 index ff873c99d..000000000 Binary files a/customize.dist/images/cover-privacy.jpg and /dev/null differ diff --git a/customize.dist/images/drive-grid.png b/customize.dist/images/drive-grid.png new file mode 100644 index 000000000..b9b55157e Binary files /dev/null and b/customize.dist/images/drive-grid.png differ diff --git a/customize.dist/images/drive_screenshot.png b/customize.dist/images/drive_screenshot.png deleted file mode 100644 index 74f89c06d..000000000 Binary files a/customize.dist/images/drive_screenshot.png and /dev/null differ diff --git a/customize.dist/images/email.svg b/customize.dist/images/email.svg index e2e566e6e..61f7e6137 100644 --- a/customize.dist/images/email.svg +++ b/customize.dist/images/email.svg @@ -1,25 +1,66 @@ - - - - diff --git a/customize.dist/images/github.svg b/customize.dist/images/github.svg index 16cd68786..18c5b45e8 100644 --- a/customize.dist/images/github.svg +++ b/customize.dist/images/github.svg @@ -1,22 +1,77 @@ - - - - - CryptPad: Zero Knowledge, Collaborative Real Time Editing + CryptPad: Collaboration suite, encrypted and open-source - + diff --git a/customize.dist/loading.js b/customize.dist/loading.js index cc19d3544..819e0d89d 100644 --- a/customize.dist/loading.js +++ b/customize.dist/loading.js @@ -1,5 +1,6 @@ -// dark #326599 -// light #4591c4 +// bg #e7e7e7 +// blue #0087FF +// text #3F4141 define(['/customize/messages.js'], function (Messages) { var loadingStyle = (function(){/* @font-face { @@ -21,8 +22,8 @@ define(['/customize/messages.js'], function (Messages) { bottom: 0px; left: 0px; right: 0px; - background: linear-gradient(to right, #326599 0%, #326599 50%, #4591c4 50%, #4591c4 100%); - color: #fafafa; + background-color: #e7e7e7; + color: #3F4141; font-size: 1.3em; line-height: 120%; opacity: 1; @@ -32,6 +33,9 @@ define(['/customize/messages.js'], function (Messages) { align-items: center; font: 20px 'Open Sans', 'Helvetica Neue', sans-serif !important; } +#cp-loading.cp-loading-transparent { + background-color: rgba(231, 231, 231, 0.7); +} #cp-loading.cp-loading-hidden { opacity: 0; visibility: hidden; @@ -52,35 +56,39 @@ define(['/customize/messages.js'], function (Messages) { #cp-loading .cp-loading-container { width: 700px; max-width: 90vw; - height: 500px; + height: 236px; max-height: calc(100vh - 20px); margin: 50px; flex-shrink: 0; display: flex; flex-flow: column; - justify-content: space-around; align-items: center; } -@media screen and (max-height: 800px) { - #cp-loading .cp-loading-container { - height: auto; - } -} -@media screen and (max-width: 600px) { - #cp-loading .cp-loading-container { - height: auto; - } -} #cp-loading .cp-loading-cryptofist { margin-left: auto; margin-right: auto; - //height: 300px; max-width: 90vw; max-height: 300px; width: auto; height: auto; margin-bottom: 2em; } +@media screen and (max-width: 500px) { + #cp-loading { + font-size: 16px !important; + } + #cp-loading .cp-loading-container { + height: 206px; + } +} +@media screen and (max-height: 700px) { + #cp-loading { + font-size: 16px !important; + } + #cp-loading .cp-loading-container { + height: 206px; + } +} @media screen and (max-height: 500px) { #cp-loading .cp-loading-logo { display: none; @@ -170,14 +178,11 @@ p.cp-password-info{ } #cp-loading .cp-loading-spinner-container { position: relative; - height: 100px; -} -#cp-loading .cp-loading-spinner-container > div { - height: 100px; + height: 80px; + margin-bottom: 50px; } .cp-loading-progress { width: 100%; - margin: 20px; text-align: center; } .cp-loading-progress p { @@ -189,10 +194,13 @@ p.cp-password-info{ .cp-loading-progress-list { text-align: left; display: inline-block; + margin-bottom: 50px; + max-width: 100%; } .cp-loading-progress-list ul { list-style: none; padding-left: 0; + margin: 0; } .cp-loading-progress-list li { padding: 0px 5px; @@ -200,6 +208,9 @@ p.cp-password-info{ -moz-user-select: none; -ms-user-select: none; user-select: none; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .cp-loading-progress-list li i { width: 22px; @@ -214,10 +225,11 @@ p.cp-password-info{ .cp-loading-progress-bar { height: 24px; background: white; + border: 1px solid #0087FF; } .cp-loading-progress-bar-value { height: 100%; - background: #5cb85c; + background: #0087FF; } @keyframes spin { @@ -234,7 +246,7 @@ p.cp-password-info{ box-sizing: border-box; width: 80px; height: 80px; - border: 11px solid white; + border: 11px solid #999999; border-radius: 50%; border-top-color: transparent; animation: spin infinite 3s; @@ -263,7 +275,7 @@ button:not(.btn).primary:hover{ loadingStyle, '', '', '
', '',n.id)),i.cmpEl.append(o)),n.render(o),n.cmpEl.attr({tabindex:"-1"}));var a=e.api.asc_getActiveCellCoord(),l={left:0,top:0},r=[a.asc_getX()+l.left,(a.asc_getY()<0?0:a.asc_getY())+a.asc_getHeight()+l.top];o.css({left:r[0],top:r[1]}),n.show(),n.alignPosition(),_.delay(function(){n.cmpEl.focus()},10)}else this.documentHolder.entriesMenu.hide(),Common.UI.warning({title:this.notcriticalErrorTitle,maxwidth:600,msg:this.txtNoChoices,callback:_.bind(function(t){Common.NotificationCenter.trigger("edit:complete",this.documentHolder)},this)})},onFormulaCompleteMenu:function(t){if(this.documentHolder.funcMenu)if(t){for(var e=this,i=e.documentHolder,n=i.funcMenu,o=i.cmpEl.find("#menu-formula-selection"),s=e.getApplication().getController("FormulaDialog").getDescription(Common.Utils.InternalSettings.get("sse-settings-func-locale")),a=0;an?1:0}),_.each(t,function(t,i){var o=t.asc_getType(),a=t.asc_getName(!0),l=e.api.asc_getFormulaNameByLocale(a),r=new Common.UI.MenuItem({iconCls:o==Asc.c_oAscPopUpSelectorType.Func?"mnu-popup-func":o==Asc.c_oAscPopUpSelectorType.Table?"mnu-popup-table":"mnu-popup-range",caption:a,hint:s&&s[l]?s[l].d:""}).on("click",function(t,i){setTimeout(function(){e.api.asc_insertFormula(t.caption,o,!1)},10)});n.addItem(r)}),n.rendered||(o.length<1&&(o=$(Common.Utils.String.format('')),i.cmpEl.append(o)),n.onAfterKeydownMenu=function(t){if(t.keyCode!=Common.UI.Keys.RETURN||!t.ctrlKey&&!t.altKey){var e;if(arguments.length>1&&arguments[1]instanceof KeyboardEvent&&(t=arguments[1]),o.hasClass("open"))if(t.keyCode==Common.UI.Keys.TAB||t.keyCode==Common.UI.Keys.RETURN&&!t.ctrlKey&&!t.altKey)e=o.find("a.focus").closest("li");else if(t.keyCode==Common.UI.Keys.UP||t.keyCode==Common.UI.Keys.DOWN){var i=n.cmpEl,s=i.offset().top,a=o.find("a.focus").closest("li"),l=a.offset().top;(ls+i.height())&&(n.scroller?n.scroller.scrollTop(i.scrollTop()+l-s,0):i.scrollTop(i.scrollTop()+l-s))}e&&(e.length>0&&e.click(),Common.UI.Menu.Manager.hideAll())}},n.on("hide:after",function(){for(var t=0;t
'),this.documentHolder.cmpEl.append(e.parentEl));var i=this.getApplication().getController("FormulaDialog").getDescription(Common.Utils.InternalSettings.get("sse-settings-func-locale")),n=(i&&i[t]?this.api.asc_getFormulaLocaleName(t)+i[t].a:"").replace(/[,;]/g,this.api.asc_getFunctionArgumentSeparator());if(e.ref&&e.ref.isVisible()&&e.text!=n&&(e.ref.hide(),e.ref=void 0,e.text="",e.isHidden=!0),!n)return;e.ref&&e.ref.isVisible()||(e.text=n,e.ref=new Common.UI.Tooltip({owner:e.parentEl,html:!0,title:n,cls:"auto-tooltip"}),e.ref.show([-1e4,-1e4]),e.isHidden=!1);var o=[this.documentHolder.cmpEl.offset().left-$(window).scrollLeft(),this.documentHolder.cmpEl.offset().top-$(window).scrollTop()],s=this.api.asc_getActiveCellCoord(),a=[s.asc_getX()+o[0]-3,s.asc_getY()+o[1]-e.ref.getBSTip().$tip.height()-5],l=e.ref.getBSTip().$tip.width();a[0]+l>this.tooltips.coauth.bodyWidth&&(a[0]=this.tooltips.coauth.bodyWidth-l),e.ref.getBSTip().$tip.css({top:a[1]+"px",left:a[0]+"px"})}else!e.isHidden&&e.ref&&(e.ref.hide(),e.ref=void 0,e.text="",e.isHidden=!0)},onInputMessage:function(t,e){var i=this.tooltips.input_msg;if(e){i.parentEl||(i.parentEl=$('
'),this.documentHolder.cmpEl.append(i.parentEl));var n=t?""+(t||"")+"
":"";n+=e||"",i.ref&&i.ref.isVisible()&&i.text!=n&&(i.ref.hide(),i.ref=void 0,i.text="",i.isHidden=!0),i.ref&&i.ref.isVisible()||(i.text=n,i.ref=new Common.UI.Tooltip({owner:i.parentEl,html:!0,title:n}),i.ref.show([-1e4,-1e4]),i.isHidden=!1);var o=[this.documentHolder.cmpEl.offset().left-$(window).scrollLeft(),this.documentHolder.cmpEl.offset().top-$(window).scrollTop()],s=this.api.asc_getActiveCellCoord(),a=[s.asc_getX()+o[0]-3,s.asc_getY()+o[1]-i.ref.getBSTip().$tip.height()-5],l=i.ref.getBSTip().$tip.width();a[0]+l>this.tooltips.coauth.bodyWidth&&(a[0]=this.tooltips.coauth.bodyWidth-l),i.ref.getBSTip().$tip.css({top:a[1]+"px",left:a[0]+"px"})}else!i.isHidden&&i.ref&&(i.ref.hide(),i.ref=void 0,i.text="",i.isHidden=!0)},onShowSpecialPasteOptions:function(t){var e=this,i=e.documentHolder,n=t.asc_getCellCoord(),o=i.cmpEl.find("#special-paste-container"),s=t.asc_getOptions();if(s){if(o.length<1&&(e._arrSpecialPaste=[],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste]=[e.txtPaste,0],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormula]=[e.txtPasteFormulas,0],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaNumberFormat]=[e.txtPasteFormulaNumFormat,0],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaAllFormatting]=[e.txtPasteKeepSourceFormat,0],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaWithoutBorders]=[e.txtPasteBorders,0],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaColumnWidth]=[e.txtPasteColWidths,0],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.mergeConditionalFormating]=[e.txtPasteMerge,0],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.transpose]=[e.txtPasteTranspose,0],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyValues]=[e.txtPasteValues,1],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueNumberFormat]=[e.txtPasteValNumFormat,1],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueAllFormating]=[e.txtPasteValFormat,1],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormating]=[e.txtPasteFormat,2],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.link]=[e.txtPasteLink,2],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.picture]=[e.txtPastePicture,2],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.linkedPicture]=[e.txtPasteLinkPicture,2],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.sourceformatting]=[e.txtPasteSourceFormat,2],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.destinationFormatting]=[e.txtPasteDestFormat,2],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.keepTextOnly]=[e.txtKeepTextOnly,2],e._arrSpecialPaste[Asc.c_oSpecialPasteProps.useTextImport]=[e.txtUseTextImport,3],o=$('
'),i.cmpEl.append(o),e.btnSpecialPaste=new Common.UI.Button({cls:"btn-toolbar",iconCls:"btn-paste",menu:new Common.UI.Menu({items:[]})}),e.btnSpecialPaste.render($("#id-document-holder-btn-special-paste"))),s.length>0){for(var a=e.btnSpecialPaste.menu,l=0;l0&&(a.addItem(new Common.UI.MenuItem({caption:"--"})),h=!1),_.each(r[l],function(t,e){a.addItem(t),h=!0});a.items.length>0&&a.items[0].setChecked(!0,!0),e._state.lastSpecPasteChecked=a.items.length>0?a.items[0]:null,c&&(a.addItem(new Common.UI.MenuItem({caption:"--"})),a.addItem(c))}if(n[0].asc_getX()<0||n[0].asc_getY()<0)return void(o.is(":visible")&&o.hide());var d=n[0],p=n[1],m=e.tooltips.coauth.bodyWidth-e.tooltips.coauth.XY[0]-e.tooltips.coauth.rightMenuWidth-15,u=e.tooltips.coauth.apiHeight-15,g=[],b=[31,20],f=d.asc_getX()+d.asc_getWidth()+3+b[0],C=d.asc_getY()+d.asc_getHeight()+3+b[1];f>m?(g[0]=void 0!==p?p.asc_getX():m-b[0]-3,C>u&&(g[0]-=b[0]+3),g[0]<0&&(g[0]=m-3-b[0])):g[0]=f-b[0],g[1]=C>u?u-3-b[1]:C-b[1],o.css({left:g[0],top:g[1]}),o.show()}},onHideSpecialPasteOptions:function(){var t=this.documentHolder.cmpEl.find("#special-paste-container");t.is(":visible")&&t.hide()},onToggleAutoCorrectOptions:function(t){if(!t){var e=this.documentHolder.cmpEl.find("#autocorrect-paste-container");return void(e.is(":visible")&&e.hide())}var i=this,n=i.documentHolder,o=t.asc_getCellCoord(),e=n.cmpEl.find("#autocorrect-paste-container"),s=t.asc_getOptions();if(e.length<1&&(i._arrAutoCorrectPaste=[],i._arrAutoCorrectPaste[Asc.c_oAscAutoCorrectOptions.UndoTableAutoExpansion]=i.txtUndoExpansion,i._arrAutoCorrectPaste[Asc.c_oAscAutoCorrectOptions.RedoTableAutoExpansion]=i.txtRedoExpansion,e=$('
'),n.cmpEl.append(e),i.btnAutoCorrectPaste=new Common.UI.Button({cls:"btn-toolbar",iconCls:"btn-paste",menu:new Common.UI.Menu({items:[]})}),i.btnAutoCorrectPaste.render($("#id-document-holder-btn-autocorrect-paste"))),s.length>0){for(var a=i.btnAutoCorrectPaste.menu,l=0;lr||p>c||o.asc_getX()<0||o.asc_getY()<0?e.is(":visible")&&e.hide():(e.css({left:d-h[0],top:p-h[1]}),e.show())},onCellsRange:function(t){this.rangeSelectionMode=t!=Asc.c_oAscSelectionDialogType.None},onApiEditCell:function(t){this.isEditFormula=t==Asc.c_oAscCellEditorState.editFormula,this.isEditCell=t!=Asc.c_oAscCellEditorState.editEnd},onLockDefNameManager:function(t){this.namedrange_locked=t==Asc.c_oAscDefinedNameReason.LockDefNameManager},onChangeCropState:function(t){this.documentHolder.menuImgCrop.menu.items[0].setChecked(t,!0)},initEquationMenu:function(){if(this._currentMathObj){var t,e=this,i=e._currentMathObj.get_Type(),n=e._currentMathObj,o=[];switch(i){case Asc.c_oAscMathInterfaceType.Accent:t=new Common.UI.MenuItem({caption:e.txtRemoveAccentChar,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"remove_AccentCharacter"}}),o.push(t);break;case Asc.c_oAscMathInterfaceType.BorderBox:t=new Common.UI.MenuItem({caption:e.txtBorderProps,equation:!0,disabled:e._currentParaObjDisabled,menu:new Common.UI.Menu({menuAlign:"tl-tr",items:[{caption:n.get_HideTop()?e.txtAddTop:e.txtHideTop,equationProps:{type:i,callback:"put_HideTop",value:!n.get_HideTop()}},{caption:n.get_HideBottom()?e.txtAddBottom:e.txtHideBottom,equationProps:{type:i,callback:"put_HideBottom",value:!n.get_HideBottom()}},{caption:n.get_HideLeft()?e.txtAddLeft:e.txtHideLeft,equationProps:{type:i,callback:"put_HideLeft",value:!n.get_HideLeft()}},{caption:n.get_HideRight()?e.txtAddRight:e.txtHideRight,equationProps:{type:i,callback:"put_HideRight",value:!n.get_HideRight()}},{caption:n.get_HideHor()?e.txtAddHor:e.txtHideHor,equationProps:{type:i,callback:"put_HideHor",value:!n.get_HideHor()}},{caption:n.get_HideVer()?e.txtAddVer:e.txtHideVer,equationProps:{type:i,callback:"put_HideVer",value:!n.get_HideVer()}},{caption:n.get_HideTopLTR()?e.txtAddLT:e.txtHideLT,equationProps:{type:i,callback:"put_HideTopLTR",value:!n.get_HideTopLTR()}},{caption:n.get_HideTopRTL()?e.txtAddLB:e.txtHideLB,equationProps:{type:i,callback:"put_HideTopRTL",value:!n.get_HideTopRTL()}}]})}),o.push(t);break;case Asc.c_oAscMathInterfaceType.Bar:t=new Common.UI.MenuItem({caption:e.txtRemoveBar,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"remove_Bar"}}),o.push(t),t=new Common.UI.MenuItem({caption:n.get_Pos()==Asc.c_oAscMathInterfaceBarPos.Top?e.txtUnderbar:e.txtOverbar,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_Pos",value:n.get_Pos()==Asc.c_oAscMathInterfaceBarPos.Top?Asc.c_oAscMathInterfaceBarPos.Bottom:Asc.c_oAscMathInterfaceBarPos.Top}}),o.push(t);break;case Asc.c_oAscMathInterfaceType.Script:var s=n.get_ScriptType();s==Asc.c_oAscMathInterfaceScript.PreSubSup?(t=new Common.UI.MenuItem({caption:e.txtScriptsAfter,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_ScriptType",value:Asc.c_oAscMathInterfaceScript.SubSup}}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtRemScripts,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_ScriptType",value:Asc.c_oAscMathInterfaceScript.None}}),o.push(t)):(s==Asc.c_oAscMathInterfaceScript.SubSup&&(t=new Common.UI.MenuItem({caption:e.txtScriptsBefore,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_ScriptType",value:Asc.c_oAscMathInterfaceScript.PreSubSup}}),o.push(t)),s!=Asc.c_oAscMathInterfaceScript.SubSup&&s!=Asc.c_oAscMathInterfaceScript.Sub||(t=new Common.UI.MenuItem({caption:e.txtRemSubscript,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_ScriptType",value:s==Asc.c_oAscMathInterfaceScript.SubSup?Asc.c_oAscMathInterfaceScript.Sup:Asc.c_oAscMathInterfaceScript.None}}),o.push(t)),s!=Asc.c_oAscMathInterfaceScript.SubSup&&s!=Asc.c_oAscMathInterfaceScript.Sup||(t=new Common.UI.MenuItem({caption:e.txtRemSuperscript,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_ScriptType",value:s==Asc.c_oAscMathInterfaceScript.SubSup?Asc.c_oAscMathInterfaceScript.Sub:Asc.c_oAscMathInterfaceScript.None}}),o.push(t)));break;case Asc.c_oAscMathInterfaceType.Fraction:var a=n.get_FractionType();a!=Asc.c_oAscMathInterfaceFraction.Skewed&&a!=Asc.c_oAscMathInterfaceFraction.Linear||(t=new Common.UI.MenuItem({caption:e.txtFractionStacked,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_FractionType",value:Asc.c_oAscMathInterfaceFraction.Bar}}),o.push(t)),a!=Asc.c_oAscMathInterfaceFraction.Bar&&a!=Asc.c_oAscMathInterfaceFraction.Linear||(t=new Common.UI.MenuItem({caption:e.txtFractionSkewed,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_FractionType",value:Asc.c_oAscMathInterfaceFraction.Skewed}}),o.push(t)),a!=Asc.c_oAscMathInterfaceFraction.Bar&&a!=Asc.c_oAscMathInterfaceFraction.Skewed||(t=new Common.UI.MenuItem({caption:e.txtFractionLinear,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_FractionType",value:Asc.c_oAscMathInterfaceFraction.Linear}}),o.push(t)),a!=Asc.c_oAscMathInterfaceFraction.Bar&&a!=Asc.c_oAscMathInterfaceFraction.NoBar||(t=new Common.UI.MenuItem({caption:a==Asc.c_oAscMathInterfaceFraction.Bar?e.txtRemFractionBar:e.txtAddFractionBar,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_FractionType",value:a==Asc.c_oAscMathInterfaceFraction.Bar?Asc.c_oAscMathInterfaceFraction.NoBar:Asc.c_oAscMathInterfaceFraction.Bar}}),o.push(t));break;case Asc.c_oAscMathInterfaceType.Limit:t=new Common.UI.MenuItem({caption:n.get_Pos()==Asc.c_oAscMathInterfaceLimitPos.Top?e.txtLimitUnder:e.txtLimitOver,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_Pos",value:n.get_Pos()==Asc.c_oAscMathInterfaceLimitPos.Top?Asc.c_oAscMathInterfaceLimitPos.Bottom:Asc.c_oAscMathInterfaceLimitPos.Top}}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtRemLimit,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_Pos",value:Asc.c_oAscMathInterfaceLimitPos.None}}),o.push(t);break;case Asc.c_oAscMathInterfaceType.Matrix:t=new Common.UI.MenuItem({caption:n.get_HidePlaceholder()?e.txtShowPlaceholder:e.txtHidePlaceholder,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_HidePlaceholder",value:!n.get_HidePlaceholder()}}),o.push(t),t=new Common.UI.MenuItem({caption:e.insertText,equation:!0,disabled:e._currentParaObjDisabled,menu:new Common.UI.Menu({menuAlign:"tl-tr",items:[{caption:e.insertRowAboveText,equationProps:{type:i,callback:"insert_MatrixRow",value:!0}},{caption:e.insertRowBelowText,equationProps:{type:i,callback:"insert_MatrixRow",value:!1}},{caption:e.insertColumnLeftText,equationProps:{type:i,callback:"insert_MatrixColumn",value:!0}},{caption:e.insertColumnRightText,equationProps:{type:i,callback:"insert_MatrixColumn",value:!1}}]})}),o.push(t),t=new Common.UI.MenuItem({caption:e.deleteText,equation:!0,disabled:e._currentParaObjDisabled,menu:new Common.UI.Menu({menuAlign:"tl-tr",items:[{caption:e.deleteRowText,equationProps:{type:i,callback:"delete_MatrixRow"}},{caption:e.deleteColumnText,equationProps:{type:i,callback:"delete_MatrixColumn"}}]})}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtMatrixAlign,equation:!0,disabled:e._currentParaObjDisabled,menu:new Common.UI.Menu({menuAlign:"tl-tr",items:[{caption:e.txtTop,checkable:!0,checked:n.get_MatrixAlign()==Asc.c_oAscMathInterfaceMatrixMatrixAlign.Top,equationProps:{type:i,callback:"put_MatrixAlign",value:Asc.c_oAscMathInterfaceMatrixMatrixAlign.Top}},{caption:e.centerText,checkable:!0,checked:n.get_MatrixAlign()==Asc.c_oAscMathInterfaceMatrixMatrixAlign.Center,equationProps:{type:i,callback:"put_MatrixAlign",value:Asc.c_oAscMathInterfaceMatrixMatrixAlign.Center}},{caption:e.txtBottom,checkable:!0,checked:n.get_MatrixAlign()==Asc.c_oAscMathInterfaceMatrixMatrixAlign.Bottom,equationProps:{type:i,callback:"put_MatrixAlign",value:Asc.c_oAscMathInterfaceMatrixMatrixAlign.Bottom}}]})}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtColumnAlign,equation:!0,disabled:e._currentParaObjDisabled,menu:new Common.UI.Menu({menuAlign:"tl-tr",items:[{caption:e.leftText,checkable:!0,checked:n.get_ColumnAlign()==Asc.c_oAscMathInterfaceMatrixColumnAlign.Left,equationProps:{type:i,callback:"put_ColumnAlign",value:Asc.c_oAscMathInterfaceMatrixColumnAlign.Left}},{caption:e.centerText,checkable:!0,checked:n.get_ColumnAlign()==Asc.c_oAscMathInterfaceMatrixColumnAlign.Center,equationProps:{type:i,callback:"put_ColumnAlign",value:Asc.c_oAscMathInterfaceMatrixColumnAlign.Center}},{caption:e.rightText,checkable:!0,checked:n.get_ColumnAlign()==Asc.c_oAscMathInterfaceMatrixColumnAlign.Right,equationProps:{type:i,callback:"put_ColumnAlign",value:Asc.c_oAscMathInterfaceMatrixColumnAlign.Right}}]})}),o.push(t);break;case Asc.c_oAscMathInterfaceType.EqArray:t=new Common.UI.MenuItem({caption:e.txtInsertEqBefore,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"insert_Equation",value:!0}}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtInsertEqAfter,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"insert_Equation",value:!1}}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtDeleteEq,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"delete_Equation"}}),o.push(t),t=new Common.UI.MenuItem({caption:e.alignmentText,equation:!0,disabled:e._currentParaObjDisabled,menu:new Common.UI.Menu({menuAlign:"tl-tr",items:[{caption:e.txtTop,checkable:!0,checked:n.get_Align()==Asc.c_oAscMathInterfaceEqArrayAlign.Top,equationProps:{type:i,callback:"put_Align",value:Asc.c_oAscMathInterfaceEqArrayAlign.Top}},{caption:e.centerText,checkable:!0,checked:n.get_Align()==Asc.c_oAscMathInterfaceEqArrayAlign.Center,equationProps:{type:i,callback:"put_Align",value:Asc.c_oAscMathInterfaceEqArrayAlign.Center}},{caption:e.txtBottom,checkable:!0,checked:n.get_Align()==Asc.c_oAscMathInterfaceEqArrayAlign.Bottom,equationProps:{type:i,callback:"put_Align",value:Asc.c_oAscMathInterfaceEqArrayAlign.Bottom}}]})}),o.push(t);break;case Asc.c_oAscMathInterfaceType.LargeOperator:t=new Common.UI.MenuItem({caption:e.txtLimitChange,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_LimitLocation",value:n.get_LimitLocation()==Asc.c_oAscMathInterfaceNaryLimitLocation.UndOvr?Asc.c_oAscMathInterfaceNaryLimitLocation.SubSup:Asc.c_oAscMathInterfaceNaryLimitLocation.UndOvr}}),o.push(t),void 0!==n.get_HideUpper()&&(t=new Common.UI.MenuItem({caption:n.get_HideUpper()?e.txtShowTopLimit:e.txtHideTopLimit,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_HideUpper",value:!n.get_HideUpper()}}),o.push(t)),void 0!==n.get_HideLower()&&(t=new Common.UI.MenuItem({caption:n.get_HideLower()?e.txtShowBottomLimit:e.txtHideBottomLimit,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_HideLower",value:!n.get_HideLower()}}),o.push(t));break;case Asc.c_oAscMathInterfaceType.Delimiter:t=new Common.UI.MenuItem({caption:e.txtInsertArgBefore,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"insert_DelimiterArgument",value:!0}}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtInsertArgAfter,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"insert_DelimiterArgument",value:!1}}),o.push(t),n.can_DeleteArgument()&&(t=new Common.UI.MenuItem({caption:e.txtDeleteArg,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"delete_DelimiterArgument"}}),o.push(t)),t=new Common.UI.MenuItem({caption:n.has_Separators()?e.txtDeleteCharsAndSeparators:e.txtDeleteChars,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"remove_DelimiterCharacters"}}),o.push(t),t=new Common.UI.MenuItem({caption:n.get_HideOpeningBracket()?e.txtShowOpenBracket:e.txtHideOpenBracket,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_HideOpeningBracket",value:!n.get_HideOpeningBracket()}}),o.push(t),t=new Common.UI.MenuItem({caption:n.get_HideClosingBracket()?e.txtShowCloseBracket:e.txtHideCloseBracket,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_HideClosingBracket",value:!n.get_HideClosingBracket()}}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtStretchBrackets,equation:!0,disabled:e._currentParaObjDisabled,checkable:!0,checked:n.get_StretchBrackets(),equationProps:{type:i,callback:"put_StretchBrackets",value:!n.get_StretchBrackets()}}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtMatchBrackets,equation:!0,disabled:!n.get_StretchBrackets()||e._currentParaObjDisabled,checkable:!0,checked:n.get_StretchBrackets()&&n.get_MatchBrackets(),equationProps:{type:i,callback:"put_MatchBrackets",value:!n.get_MatchBrackets()}}),o.push(t);break;case Asc.c_oAscMathInterfaceType.GroupChar:n.can_ChangePos()&&(t=new Common.UI.MenuItem({caption:n.get_Pos()==Asc.c_oAscMathInterfaceGroupCharPos.Top?e.txtGroupCharUnder:e.txtGroupCharOver,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_Pos",value:n.get_Pos()==Asc.c_oAscMathInterfaceGroupCharPos.Top?Asc.c_oAscMathInterfaceGroupCharPos.Bottom:Asc.c_oAscMathInterfaceGroupCharPos.Top}}),o.push(t),t=new Common.UI.MenuItem({caption:e.txtDeleteGroupChar,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_Pos",value:Asc.c_oAscMathInterfaceGroupCharPos.None}}),o.push(t));break;case Asc.c_oAscMathInterfaceType.Radical:void 0!==n.get_HideDegree()&&(t=new Common.UI.MenuItem({caption:n.get_HideDegree()?e.txtShowDegree:e.txtHideDegree,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"put_HideDegree",value:!n.get_HideDegree()}}),o.push(t)),t=new Common.UI.MenuItem({caption:e.txtDeleteRadical,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"remove_Radical"}}),o.push(t)}return n.can_IncreaseArgumentSize()&&(t=new Common.UI.MenuItem({caption:e.txtIncreaseArg,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"increase_ArgumentSize"}}),o.push(t)),n.can_DecreaseArgumentSize()&&(t=new Common.UI.MenuItem({caption:e.txtDecreaseArg,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"decrease_ArgumentSize"}}),o.push(t)),n.can_InsertManualBreak()&&(t=new Common.UI.MenuItem({caption:e.txtInsertBreak,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"insert_ManualBreak"}}),o.push(t)),n.can_DeleteManualBreak()&&(t=new Common.UI.MenuItem({caption:e.txtDeleteBreak,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"delete_ManualBreak"}}),o.push(t)),n.can_AlignToCharacter()&&(t=new Common.UI.MenuItem({caption:e.txtAlignToChar,equation:!0,disabled:e._currentParaObjDisabled,equationProps:{type:i,callback:"align_ToCharacter"}}),o.push(t)),o}},addEquationMenu:function(t){var e=this;e.clearEquationMenu(t);var i=e.documentHolder.textInShapeMenu,n=e.initEquationMenu();return n.length>0&&_.each(n,function(n,o){n.menu?_.each(n.menu.items,function(t){t.on("click",_.bind(e.equationCallback,e,t.options.equationProps))}):n.on("click",_.bind(e.equationCallback,e,n.options.equationProps)),i.insertItem(t,n),t++}),n.length},clearEquationMenu:function(t){for(var e=this,i=e.documentHolder.textInShapeMenu,n=t;n')}),e.paraBulletsPicker.on("item:click",_.bind(this.onSelectBullets,this)),i&&e.paraBulletsPicker.selectRecord(i.rec,!0)},onSignatureClick:function(t){var e=t.cmpEl.attr("data-value");switch(t.value){case 0:Common.NotificationCenter.trigger("protect:sign",e);break;case 1:this.api.asc_ViewCertificate(e);break;case 2:Common.NotificationCenter.trigger("protect:signature","visible",this._isDisabled,e);break;case 3:this.api.asc_RemoveSignature(e)}},onOriginalSizeClick:function(t){if(this.api){var e=this.api.asc_getOriginalImageSize(),i=e.asc_getImageWidth(),n=e.asc_getImageHeight(),o=new Asc.asc_CImgProperty;o.asc_putWidth(i),o.asc_putHeight(n),o.put_ResetCrop(!0),this.api.asc_setGraphicObjectProps(o),Common.NotificationCenter.trigger("edit:complete",this.documentHolder),Common.component.Analytics.trackEvent("DocumentHolder","Set Image Original Size")}},onImgReplace:function(t,e){var i=this;this.api&&("file"==e.value?setTimeout(function(){i.api&&i.api.asc_changeImageFromFile(),Common.NotificationCenter.trigger("edit:complete",i.documentHolder)},10):new Common.Views.ImageFromUrlDialog({handler:function(t,e){if("ok"==t&&i.api){var n=e.replace(/ /g,"");if(!_.isEmpty(n)){var o=new Asc.asc_CImgProperty;o.asc_putImageUrl(n),i.api.asc_setGraphicObjectProps(o)}}Common.NotificationCenter.trigger("edit:complete",i.documentHolder)}}).show())},onNumberFormatSelect:function(t,e){void 0!==e.value&&"advanced"!==e.value&&this.api&&this.api.asc_setCellFormat(e.options.format),Common.NotificationCenter.trigger("edit:complete",this.documentHolder)},onCustomNumberFormat:function(t){var e=this,i=e.api.asc_getLocale();!i&&(i=e.permissions.lang?parseInt(Common.util.LanguageInfo.getLocalLanguageCode(e.permissions.lang)):1033),new SSE.Views.FormatSettingsDialog({api:e.api,handler:function(t,i){i&&e.api.asc_setCellFormat(i.format),Common.NotificationCenter.trigger("edit:complete",e.documentHolder)},props:{format:t.options.numformat,formatInfo:t.options.numformatinfo,langId:i}}).show(),Common.NotificationCenter.trigger("edit:complete",this.documentHolder)},onNumberFormatOpenAfter:function(t){if(this.api){var e=this,i=e.api.asc_getLocale();if(!i&&(i=e.permissions.lang?parseInt(Common.util.LanguageInfo.getLocalLanguageCode(e.permissions.lang)):1033),this._state.langId!==i){this._state.langId=i;var n=new Asc.asc_CFormatCellsInfo ;n.asc_setType(Asc.c_oAscNumFormatType.None),n.asc_setSymbol(this._state.langId);for(var o=this.api.asc_getFormatCells(n),s=0;sOnly text values from the column can be selected for replacement.",txtExpandSort:"The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?",txtExpand:"Expand and sort",txtSorting:"Sorting",txtSortSelected:"Sort selected",txtPaste:"Paste",txtPasteFormulas:"Paste only formula",txtPasteFormulaNumFormat:"Formula + number format",txtPasteKeepSourceFormat:"Formula + all formatting",txtPasteBorders:"Formula without borders",txtPasteColWidths:"Formula + column width",txtPasteMerge:"Merge conditional formatting",txtPasteTranspose:"Transpose",txtPasteValues:"Paste only value",txtPasteValNumFormat:"Value + number format",txtPasteValFormat:"Value + all formatting",txtPasteFormat:"Paste only formatting",txtPasteLink:"Paste Link",txtPastePicture:"Picture",txtPasteLinkPicture:"Linked Picture",txtPasteSourceFormat:"Source formatting",txtPasteDestFormat:"Destination formatting",txtKeepTextOnly:"Keep text only",txtUseTextImport:"Use text import wizard",txtUndoExpansion:"Undo table autoexpansion",txtRedoExpansion:"Redo table autoexpansion",txtAnd:"and",txtOr:"or",txtEquals:"Equals",txtNotEquals:"Does not equal",txtGreater:"Greater than",txtGreaterEquals:"Greater than or equal to",txtLess:"Less than",txtLessEquals:"Less than or equal to",txtAboveAve:"Above average",txtBelowAve:"Below average",txtBegins:"Begins with",txtNotBegins:"Does not begin with",txtEnds:"Ends with",txtNotEnds:"Does not end with",txtContains:"Contains",txtNotContains:"Does not contain",txtFilterTop:"Top",txtFilterBottom:"Bottom",txtItems:"items",txtPercent:"percent",txtEqualsToCellColor:"Equals to cell color",txtEqualsToFontColor:"Equals to font color",txtAll:"(All)",txtBlanks:"(Blanks)",txtColumn:"Column",txtImportWizard:"Text Import Wizard"},SSE.Controllers.DocumentHolder||{}))}),define("text!spreadsheeteditor/main/app/template/CellEditor.template",[],function(){return'
\r\n \r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n'}),define("spreadsheeteditor/main/app/view/CellEditor",["text!spreadsheeteditor/main/app/template/CellEditor.template","common/main/lib/component/BaseView"],function(t){"use strict";SSE.Views.CellEditor=Common.UI.BaseView.extend(_.extend({template:_.template(t),initialize:function(t){Common.UI.BaseView.prototype.initialize.call(this,t)},render:function(){$(this.el).html(this.template()),this.btnNamedRanges=new Common.UI.Button({menu:new Common.UI.Menu({style:"min-width: 70px;max-width:400px;",maxHeight:250,items:[{caption:this.textManager,value:"manager"},{caption:"--"}]})}),this.btnNamedRanges.render($("#ce-cell-name-menu")),this.btnNamedRanges.setVisible(!1),this.btnNamedRanges.menu.setOffset(-81),this.$cellname=$("#ce-cell-name",this.el),this.$btnexpand=$("#ce-btn-expand",this.el),this.$btnfunc=$("#ce-func-label",this.el);var t=this;return this.$cellname.on("focus",function(e){var i=t.$cellname[0];i.selectionStart=0,i.selectionEnd=i.value.length,i.scrollLeft=i.scrollWidth}),this.$btnfunc.addClass("disabled"),this.$btnfunc.tooltip({title:this.tipFormula,placement:"cursor"}),this},updateCellInfo:function(t){t&&this.$cellname.val("string"==typeof t?t:t.asc_getName())},cellNameDisabled:function(t){t?this.$cellname.attr("disabled","disabled"):this.$cellname.removeAttr("disabled"),this.btnNamedRanges.setDisabled(t)},tipFormula:"Insert Function",textManager:"Manager"},SSE.Views.CellEditor||{}))}),define("text!spreadsheeteditor/main/app/template/NameManagerDlg.template",[],function(){return'
\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n \r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n
'}),define("spreadsheeteditor/main/app/view/NameManagerDlg",["text!spreadsheeteditor/main/app/template/NameManagerDlg.template","common/main/lib/view/AdvancedSettingsWindow","common/main/lib/component/ComboBox","common/main/lib/component/ListView","common/main/lib/component/InputField"],function(t){"use strict";SSE.Views=SSE.Views||{},SSE.Views.NameManagerDlg=Common.Views.AdvancedSettingsWindow.extend(_.extend({options:{alias:"NameManagerDlg",contentWidth:510,height:353},initialize:function(e){_.extend(this.options,{title:this.txtTitle,template:['
','
'+_.template(t)({scope:this})+"
","
",'
','
','","
"].join("")},e),this.api=e.api,this.handler=e.handler,this.sheets=e.sheets||[],this.sheetNames=e.sheetNames||[],this.ranges=e.ranges||[],this.props=e.props,this.sort=e.sort||{type:"name",direction:1},this.locked=e.locked||!1,this.userTooltip=!0,this.currentNamedRange=void 0,this.rangesStore=new Common.UI.DataViewStore,this.wrapEvents={onRefreshDefNameList:_.bind(this.onRefreshDefNameList,this),onLockDefNameManager:_.bind(this.onLockDefNameManager,this)},Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this,this.options)},render:function(){Common.Views.AdvancedSettingsWindow.prototype.render.call(this);var t=this;this.cmbFilter=new Common.UI.ComboBox({el:$("#name-manager-combo-filter"),menuStyle:"min-width: 100%;",editable:!1,cls:"input-group-nr",data:[{value:0,displayValue:this.textFilterAll},{value:1,displayValue:this.textFilterDefNames},{value:2,displayValue:this.textFilterTableNames},{value:3,displayValue:this.textFilterSheet},{value:4,displayValue:this.textFilterWorkbook}]}).on("selected",function(e,i){t.refreshRangeList(null,0)}),this.cmbFilter.setValue(0),this.rangeList=new Common.UI.ListView({el:$("#name-manager-range-list",this.$window),store:new Common.UI.DataViewStore,simpleAddMode:!0,emptyText:this.textEmpty,template:_.template(['
'].join("")),itemTemplate:_.template(['
','
','
<%= name %>
','
<%= scopeName %>
','
<%= range %>
',"<% if (lock) { %>",'
<%=lockuser%>
',"<% } %>","
"].join(""))}),this.rangeList.store.comparator=function(e,i){var n=e.get(t.sort.type).toLowerCase(),o=i.get(t.sort.type).toLowerCase();return n==o?0:n0?this.textnoNames:this.textEmpty)}var a=this,l=this.rangeList.store,r=this.rangesStore.models,c=this.cmbFilter.getValue(),h=c<3?2==c:-1,d=c>2?4==c:-1;if(c>0&&(r=this.rangesStore.filter(function(t){return-1!==h?h===t.get("isTable"):-1!==d&&d===(null===t.get("scope"))})),l.reset(r,{silent:!1}),c=l.length,this.btnEditRange.setDisabled(!c),this.btnDeleteRange.setDisabled(!c),c>0){if(void 0!==e&&null!==e||(e=0),_.isNumber(e))e>c-1&&(e=c-1),this.rangeList.selectByIndex(e),setTimeout(function(){a.rangeList.scrollToRecord(l.at(e))},50);else if(e){var p=l.findWhere({name:e.asc_getName(!0),scope:e.asc_getScope()});p&&(this.rangeList.selectRecord(p),setTimeout(function(){a.rangeList.scrollToRecord(p)},50))}!0===this.userTooltip&&this.rangeList.cmpEl.find(".lock-user").length>0&&this.rangeList.cmpEl.on("mouseover",_.bind(a.onMouseOverLock,a)).on("mouseout",_.bind(a.onMouseOutLock,a))}_.delay(function(){a.rangeList.cmpEl.find(".listview").focus(),a.rangeList.scroller.update({alwaysVisibleY:!0})},100,this)},onMouseOverLock:function(t,e,i){if(!0===this.userTooltip&&$(t.target).hasClass("lock-user")){var n=this,o=$(t.target).tooltip({title:this.tipIsLocked,trigger:"manual"}).data("bs.tooltip");this.userTooltip=o.tip(),this.userTooltip.css("z-index",parseInt(this.$window.css("z-index"))+10),o.show(),setTimeout(function(){n.userTipHide()},5e3)}},userTipHide:function(){"object"==typeof this.userTooltip&&(this.userTooltip.remove(),this.userTooltip=void 0,this.rangeList.cmpEl.off("mouseover").off("mouseout"))},onMouseOutLock:function(t,e,i){"object"==typeof this.userTooltip&&this.userTipHide()},onEditRange:function(t){if(this.locked)return void Common.NotificationCenter.trigger("namedrange:locked");var e=this,i=e.$window.offset(),n=this.rangeList.getSelectedRec(),o=(_.indexOf(this.rangeList.store.models,n),t&&n?new Asc.asc_CDefName(n.get("name"),n.get("range"),n.get("scope"),n.get("isTable"),void 0,void 0,void 0,!0):null),s=new SSE.Views.NamedRangeEditDlg({api:e.api,sheets:this.sheets,props:t?o:this.props,isEdit:t,handler:function(i,n){"ok"==i&&n&&(t?(e.currentNamedRange=n,e.api.asc_editDefinedNames(o,n)):(e.cmbFilter.setValue(0),e.currentNamedRange=n,e.api.asc_setDefinedNames(n)))}}).on("close",function(){e.show(),_.delay(function(){e.rangeList.cmpEl.find(".listview").focus()},100,e)});e.hide(),s.show(i.left+65,i.top+77)},onDeleteRange:function(){var t=this.rangeList.getSelectedRec();t&&(this.currentNamedRange=_.indexOf(this.rangeList.store.models,t),this.api.asc_delDefinedNames(new Asc.asc_CDefName(t.get("name"),t.get("range"),t.get("scope"),t.get("isTable"),void 0,void 0,void 0,!0)))},getSettings:function(){return this.sort},onPrimary:function(){return!0},onDlgBtnClick:function(t){this.handler&&this.handler.call(this,t.currentTarget.attributes.result.value),this.close()},onSortNames:function(t){t!==this.sort.type?(this.sort={type:t,direction:1},this.spanSortName.toggleClass("hidden"),this.spanSortScope.toggleClass("hidden")):this.sort.direction=-this.sort.direction;var e="name"==t?this.spanSortName:this.spanSortScope;this.sort.direction>0?e.removeClass("sort-desc"):e.addClass("sort-desc"),this.rangeList.store.sort(),this.rangeList.onResetItems(),this.rangeList.scroller.update({alwaysVisibleY:!0})},getUserName:function(t){var e=SSE.getCollection("Common.Collections.Users");if(e){var i=e.findUser(t);if(i)return i.get("username")}return this.guestText},onSelectRangeItem:function(t,e,i){this.userTipHide();var n={};if(_.isFunction(i.toJSON)){if(!i.get("selected"))return;n=i.toJSON(),this.currentNamedRange=_.indexOf(this.rangeList.store.models,i),this.btnEditRange.setDisabled(n.lock),this.btnDeleteRange.setDisabled(n.lock||n.isTable)}},hide:function(){this.userTipHide(),Common.UI.Window.prototype.hide.call(this)},close:function(){this.userTipHide(),this.api.asc_unregisterCallback("asc_onLockDefNameManager",this.wrapEvents.onLockDefNameManager),this.api.asc_unregisterCallback("asc_onRefreshDefNameList",this.wrapEvents.onRefreshDefNameList),Common.UI.Window.prototype.close.call(this)},onKeyDown:function(t,e,i){i.keyCode!=Common.UI.Keys.DELETE||this.btnDeleteRange.isDisabled()||this.onDeleteRange()},onDblClickItem:function(t,e,i){this.btnEditRange.isDisabled()||this.onEditRange(!0)},onLockDefNameManager:function(t){this.locked=t==Asc.c_oAscDefinedNameReason.LockDefNameManager},txtTitle:"Name Manager",closeButtonText:"Close",okButtonText:"Ok",textDataRange:"Data Range",textNew:"New",textEdit:"Edit",textDelete:"Delete",textRanges:"Named Ranges",textScope:"Scope",textFilter:"Filter",textEmpty:"No named ranges have been created yet.
Create at least one named range and it will appear in this field.",textnoNames:"No named ranges matching your filter could be found.",textFilterAll:"All",textFilterDefNames:"Defined names",textFilterTableNames:"Table names",textFilterSheet:"Names Scoped to Sheet",textFilterWorkbook:"Names Scoped to Workbook",textWorkbook:"Workbook",guestText:"Guest",tipIsLocked:"This element is being edited by another user."},SSE.Views.NameManagerDlg||{}))}),define("spreadsheeteditor/main/app/controller/CellEditor",["core","spreadsheeteditor/main/app/view/CellEditor","spreadsheeteditor/main/app/view/NameManagerDlg"],function(t){"use strict";SSE.Controllers.CellEditor=Backbone.Controller.extend({views:["CellEditor"],events:function(){return{"keyup input#ce-cell-name":_.bind(this.onCellName,this),"keyup textarea#ce-cell-content":_.bind(this.onKeyupCellEditor,this),"blur textarea#ce-cell-content":_.bind(this.onBlurCellEditor,this),"click button#ce-btn-expand":_.bind(this.expandEditorField,this),"click button#ce-func-label":_.bind(this.onInsertFunction,this)}},initialize:function(){this.addListeners({CellEditor:{},Viewport:{"layout:resizedrag":_.bind(this.onLayoutResize,this)},"Common.Views.Header":{"formulabar:hide":function(t){this.editor.setVisible(!t),Common.localStorage.setBool("sse-hidden-formula",t),Common.NotificationCenter.trigger("layout:changed","celleditor",t?"hidden":"showed")}.bind(this)}})},setApi:function(t){return this.api=t,this.api.isCEditorFocused=!1,this.api.asc_registerCallback("asc_onSelectionNameChanged",_.bind(this.onApiCellSelection,this)),this.api.asc_registerCallback("asc_onEditCell",_.bind(this.onApiEditCell,this)),this.api.asc_registerCallback("asc_onCoAuthoringDisconnect",_.bind(this.onApiDisconnect,this)),Common.NotificationCenter.on("api:disconnect",_.bind(this.onApiDisconnect,this)),Common.NotificationCenter.on("cells:range",_.bind(this.onCellsRange,this)),this.api.asc_registerCallback("asc_onLockDefNameManager",_.bind(this.onLockDefNameManager,this)),this.api.asc_registerCallback("asc_onInputKeyDown",_.bind(this.onInputKeyDown,this)),this},setMode:function(t){this.mode=t,this.editor.$btnfunc[this.mode.isEdit?"removeClass":"addClass"]("disabled"),this.editor.btnNamedRanges.setVisible(this.mode.isEdit&&!this.mode.isEditDiagram&&!this.mode.isEditMailMerge),this.mode.isEdit&&this.api.asc_registerCallback("asc_onSelectionChanged",_.bind(this.onApiSelectionChanged,this))},onInputKeyDown:function(t){if(Common.UI.Keys.UP===t.keyCode||Common.UI.Keys.DOWN===t.keyCode||Common.UI.Keys.TAB===t.keyCode||Common.UI.Keys.RETURN===t.keyCode||Common.UI.Keys.ESC===t.keyCode||Common.UI.Keys.LEFT===t.keyCode||Common.UI.Keys.RIGHT===t.keyCode){var e=$("#menu-formula-selection");e.hasClass("open")&&e.find(".dropdown-menu").trigger("keydown",t)}},onLaunch:function(){this.editor=this.createView("CellEditor",{el:"#cell-editing-box"}).render(),this.bindViewEvents(this.editor,this.events),this.editor.$el.parent().find(".after").css({zIndex:"4"}),this.editor.btnNamedRanges.menu.on("item:click",_.bind(this.onNamedRangesMenu,this)).on("show:before",_.bind(this.onNameBeforeShow,this)),this.namedrange_locked=!1},onApiEditCell:function(t){t==Asc.c_oAscCellEditorState.editStart?(this.api.isCellEdited=!0,this.editor.cellNameDisabled(!0)):t==Asc.c_oAscCellEditorState.editInCell?this.api.isCEditorFocused="clear":t==Asc.c_oAscCellEditorState.editEnd&&(this.api.isCellEdited=!1,this.api.isCEditorFocused=!1,this.editor.cellNameDisabled(!1)),this.editor.$btnfunc.toggleClass("disabled",t==Asc.c_oAscCellEditorState.editText)},onApiCellSelection:function(t){this.editor.updateCellInfo(t)},onApiSelectionChanged:function(t){var e=t.asc_getFlags().asc_getSelectionType(),i=!this.mode.isEditMailMerge&&!this.mode.isEditDiagram&&(!0===t.asc_getLocked()||!0===t.asc_getLockedTable()),n=e==Asc.c_oAscSelectionType.RangeChartText,o=e==Asc.c_oAscSelectionType.RangeChart,s=e==Asc.c_oAscSelectionType.RangeShapeText,a=e==Asc.c_oAscSelectionType.RangeShape,l=e==Asc.c_oAscSelectionType.RangeImage,r=s||a||n||o;this.editor.$btnfunc.toggleClass("disabled",l||r||i)},onApiDisconnect:function(){this.mode.isEdit=!1;var t=this.getApplication().getController("FormulaDialog");t&&t.hideDialog(),this.mode.isEdit||($("#ce-func-label",this.editor.el).addClass("disabled"),this.editor.btnNamedRanges.setVisible(!1))},onCellsRange:function(t){this.editor.cellNameDisabled(t!=Asc.c_oAscSelectionDialogType.None),this.editor.$btnfunc.toggleClass("disabled",t!=Asc.c_oAscSelectionDialogType.None)},onLayoutResize:function(t,e){"cell:edit"==e&&(this.editor.$el.height()>19?this.editor.$btnexpand.hasClass("btn-collapse")||this.editor.$btnexpand.addClass("btn-collapse"):this.editor.$btnexpand.removeClass("btn-collapse"))},onCellName:function(t){if(t.keyCode==Common.UI.Keys.RETURN){var e=this.editor.$cellname.val();e&&e.length&&this.api.asc_findCell(e),Common.NotificationCenter.trigger("edit:complete",this.editor)}},onBlurCellEditor:function(){"clear"==this.api.isCEditorFocused?this.api.isCEditorFocused=void 0:this.api.isCellEdited&&(this.api.isCEditorFocused=!0)},onKeyupCellEditor:function(t){t.keyCode!=Common.UI.Keys.RETURN||t.altKey||(this.api.isCEditorFocused="clear")},expandEditorField:function(){this.editor.$el.height()>19?(this.editor.keep_height=this.editor.$el.height(),this.editor.$el.height(19),this.editor.$btnexpand.removeClass("btn-collapse")):(this.editor.$el.height(this.editor.keep_height||74),this.editor.$btnexpand.addClass("btn-collapse")),Common.NotificationCenter.trigger("layout:changed","celleditor"),Common.NotificationCenter.trigger("edit:complete",this.editor,{restorefocus:!0})},onInsertFunction:function(){if(this.mode.isEdit&&!this.editor.$btnfunc.hasClass("disabled")){var t=this.getApplication().getController("FormulaDialog");t&&($("#ce-func-label",this.editor.el).blur(),t.showDialog())}},onNamedRangesMenu:function(t,e){var i=this;if("manager"==e.options.value){for(var n=this.api.asc_getWorksheetsCount(),o=-1,s=[],a=[];++o2)},onLockDefNameManager:function(t){this.namedrange_locked=t==Asc.c_oAscDefinedNameReason.LockDefNameManager}})}),define("common/main/lib/view/ImageFromUrlDialog",["common/main/lib/component/Window"],function(){"use strict";Common.Views.ImageFromUrlDialog=Common.UI.Window.extend(_.extend({options:{width:330,header:!1,cls:"modal-dlg"},initialize:function(t){_.extend(this.options,t||{}),this.template=['
','
',"","
",'
',"
",'
','",'","
"].join(""),this.options.tpl=_.template(this.template)(this.options),Common.UI.Window.prototype.initialize.call(this,this.options)},render:function(){Common.UI.Window.prototype.render.call(this);var t=this;t.inputUrl=new Common.UI.InputField({el:$("#id-dlg-url"),allowBlank:!1,blankError:t.txtEmpty,style:"width: 100%;",validateOnBlur:!1,validation:function(e){return!!/((^https?)|(^ftp)):\/\/.+/i.test(e)||t.txtNotUrl}}),this.getChild().find(".btn").on("click",_.bind(this.onBtnClick,this))},show:function(){Common.UI.Window.prototype.show.apply(this,arguments);var t=this;_.delay(function(){t.getChild("input").focus()},500)},onPrimary:function(t){return this._handleInput("ok"),!1},onBtnClick:function(t){this._handleInput(t.currentTarget.attributes.result.value)},_handleInput:function(t){if(this.options.handler){if("ok"==t&&!0!==this.inputUrl.checkValidate())return void this.inputUrl.cmpEl.find("input").focus();this.options.handler.call(this,t,this.inputUrl.getValue())}this.close()},textUrl:"Paste an image URL:",cancelButtonText:"Cancel",okButtonText:"Ok",txtEmpty:"This field is required",txtNotUrl:'This field should be a URL in the format "http://www.example.com"'},Common.Views.ImageFromUrlDialog||{}))}),void 0===Common)var Common={};if(define("common/main/lib/component/LoadMask",["common/main/lib/component/BaseView"],function(){"use strict";Common.UI.LoadMask=Common.UI.BaseView.extend(function(){var t,e,i;return{options:{cls:"",style:"",title:"Loading...",owner:document.body},template:_.template(['"].join("")),initialize:function(t){Common.UI.BaseView.prototype.initialize.call(this,t),this.template=this.options.template||this.template,this.cls=this.options.cls,this.style=this.options.style,this.title=this.options.title,this.owner=this.options.owner},render:function(){return this},show:function(){if(!e&&!i){if(t=this.owner instanceof Common.UI.BaseView?$(this.owner.el):$(this.owner),t.hasClass("masked"))return this;var n=this;return e=$('
'),i=$(this.template({id:n.id,cls:n.cls,style:n.style,title:n.title})),t.addClass("masked"),t.append(e),t.append(i),i.css({top:Math.round(t.height()/2-(i.height()+parseInt(i.css("padding-top"))+parseInt(i.css("padding-bottom")))/2)+"px",left:Math.round(t.width()/2-(i.width()+parseInt(i.css("padding-left"))+parseInt(i.css("padding-right")))/2)+"px"}),(t.height()<1||t.width()<1)&&i.css({visibility:"hidden"}),Common.util.Shortcuts.suspendEvents(),this}},hide:function(){t&&t.removeClass("masked"),e&&e.remove(),i&&i.remove(),e=null,i=null,Common.util.Shortcuts.resumeEvents()},setTitle:function(e){this.title=e,t&&t.hasClass("masked")&&i&&$(".asc-loadmask-title",i).html(e)},isVisible:function(){return!_.isEmpty(i)},updatePosition:function(){t&&t.hasClass("masked")&&i&&(i.css({top:Math.round(t.height()/2-(i.height()+parseInt(i.css("padding-top"))+parseInt(i.css("padding-bottom")))/2)+"px",left:Math.round(t.width()/2-(i.width()+parseInt(i.css("padding-left"))+parseInt(i.css("padding-right")))/2)+"px"}),i.css({visibility:"visible"}))}}}())}),define("common/main/lib/view/SelectFileDlg",["common/main/lib/component/Window","common/main/lib/component/LoadMask"],function(){"use strict";Common.Views.SelectFileDlg=Common.UI.Window.extend(_.extend({initialize:function(t){var e={};_.extend(e,{title:this.textTitle,width:1024,height:621,header:!0},t),this.template=['
'].join(""),e.tpl=_.template(this.template)(e),this.fileChoiceUrl=t.fileChoiceUrl||"",Common.UI.Window.prototype.initialize.call(this,e)},render:function(){Common.UI.Window.prototype.render.call(this),this.$window.find("> .body").css({height:"auto",overflow:"hidden"});var t=document.createElement("iframe");t.width="100%",t.height=585,t.align="top",t.frameBorder=0,t.scrolling="no",t.onload=_.bind(this._onLoad,this),$("#id-select-file-placeholder").append(t),this.loadMask=new Common.UI.LoadMask({owner:$("#id-select-file-placeholder")}),this.loadMask.setTitle(this.textLoading),this.loadMask.show(), t.src=this.fileChoiceUrl;var e=this;this._eventfunc=function(t){e._onWindowMessage(t)},this._bindWindowEvents.call(this),this.on("close",function(t){e._unbindWindowEvents()})},_bindWindowEvents:function(){window.addEventListener?window.addEventListener("message",this._eventfunc,!1):window.attachEvent&&window.attachEvent("onmessage",this._eventfunc)},_unbindWindowEvents:function(){window.removeEventListener?window.removeEventListener("message",this._eventfunc):window.detachEvent&&window.detachEvent("onmessage",this._eventfunc)},_onWindowMessage:function(t){if(t&&window.JSON)try{this._onMessage.call(this,window.JSON.parse(t.data))}catch(t){}},_onMessage:function(t){if(t&&"onlyoffice"==t.Referer&&void 0!==t.file){Common.NotificationCenter.trigger("window:close",this);var e=this;setTimeout(function(){_.isEmpty(t.file)||e.trigger("selectfile",e,t.file)},50)}},_onLoad:function(){this.loadMask&&this.loadMask.hide()},textTitle:"Select Data Source",textLoading:"Loading"},Common.Views.SelectFileDlg||{}))}),void 0===Common)var Common={};if(define("common/main/lib/util/define",[],function(){"use strict";Common.define={},Common.define.c_oAscMathMainType={Symbol:0,Fraction:1,Script:2,Radical:3,Integral:4,LargeOperator:5,Bracket:6,Function:7,Accent:8,LimitLog:9,Operator:10,Matrix:11},Common.define.c_oAscMathType={Symbol_pm:0,Symbol_infinity:1,Symbol_equals:2,Symbol_neq:3,Symbol_about:4,Symbol_times:5,Symbol_div:6,Symbol_factorial:7,Symbol_propto:8,Symbol_less:9,Symbol_ll:10,Symbol_greater:11,Symbol_gg:12,Symbol_leq:13,Symbol_geq:14,Symbol_mp:15,Symbol_cong:16,Symbol_approx:17,Symbol_equiv:18,Symbol_forall:19,Symbol_additional:20,Symbol_partial:21,Symbol_sqrt:22,Symbol_cbrt:23,Symbol_qdrt:24,Symbol_cup:25,Symbol_cap:26,Symbol_emptyset:27,Symbol_percent:28,Symbol_degree:29,Symbol_fahrenheit:30,Symbol_celsius:31,Symbol_inc:32,Symbol_nabla:33,Symbol_exists:34,Symbol_notexists:35,Symbol_in:36,Symbol_ni:37,Symbol_leftarrow:38,Symbol_uparrow:39,Symbol_rightarrow:40,Symbol_downarrow:41,Symbol_leftrightarrow:42,Symbol_therefore:43,Symbol_plus:44,Symbol_minus:45,Symbol_not:46,Symbol_ast:47,Symbol_bullet:48,Symbol_vdots:49,Symbol_cdots:50,Symbol_rddots:51,Symbol_ddots:52,Symbol_aleph:53,Symbol_beth:54,Symbol_QED:55,Symbol_alpha:65536,Symbol_beta:65537,Symbol_gamma:65538,Symbol_delta:65539,Symbol_varepsilon:65540,Symbol_epsilon:65541,Symbol_zeta:65542,Symbol_eta:65543,Symbol_theta:65544,Symbol_vartheta:65545,Symbol_iota:65546,Symbol_kappa:65547,Symbol_lambda:65548,Symbol_mu:65549,Symbol_nu:65550,Symbol_xsi:65551,Symbol_o:65552,Symbol_pi:65553,Symbol_varpi:65554,Symbol_rho:65555,Symbol_varrho:65556,Symbol_sigma:65557,Symbol_varsigma:65558,Symbol_tau:65559,Symbol_upsilon:65560,Symbol_varphi:65561,Symbol_phi:65562,Symbol_chi:65563,Symbol_psi:65564,Symbol_omega:65565,Symbol_Alpha:131072,Symbol_Beta:131073,Symbol_Gamma:131074,Symbol_Delta:131075,Symbol_Epsilon:131076,Symbol_Zeta:131077,Symbol_Eta:131078,Symbol_Theta:131079,Symbol_Iota:131080,Symbol_Kappa:131081,Symbol_Lambda:131082,Symbol_Mu:131083,Symbol_Nu:131084,Symbol_Xsi:131085,Symbol_O:131086,Symbol_Pi:131087,Symbol_Rho:131088,Symbol_Sigma:131089,Symbol_Tau:131090,Symbol_Upsilon:131091,Symbol_Phi:131092,Symbol_Chi:131093,Symbol_Psi:131094,Symbol_Omega:131095,FractionVertical:16777216,FractionDiagonal:16777217,FractionHorizontal:16777218,FractionSmall:16777219,FractionDifferential_1:16842752,FractionDifferential_2:16842753,FractionDifferential_3:16842754,FractionDifferential_4:16842755,FractionPi_2:16842756,ScriptSup:33554432,ScriptSub:33554433,ScriptSubSup:33554434,ScriptSubSupLeft:33554435,ScriptCustom_1:33619968,ScriptCustom_2:33619969,ScriptCustom_3:33619970,ScriptCustom_4:33619971,RadicalSqrt:50331648,RadicalRoot_n:50331649,RadicalRoot_2:50331650,RadicalRoot_3:50331651,RadicalCustom_1:50397184,RadicalCustom_2:50397185,Integral:67108864,IntegralSubSup:67108865,IntegralCenterSubSup:67108866,IntegralDouble:67108867,IntegralDoubleSubSup:67108868,IntegralDoubleCenterSubSup:67108869,IntegralTriple:67108870,IntegralTripleSubSup:67108871,IntegralTripleCenterSubSup:67108872,IntegralOriented:67174400,IntegralOrientedSubSup:67174401,IntegralOrientedCenterSubSup:67174402,IntegralOrientedDouble:67174403,IntegralOrientedDoubleSubSup:67174404,IntegralOrientedDoubleCenterSubSup:67174405,IntegralOrientedTriple:67174406,IntegralOrientedTripleSubSup:67174407,IntegralOrientedTripleCenterSubSup:67174408,Integral_dx:67239936,Integral_dy:67239937,Integral_dtheta:67239938,LargeOperator_Sum:83886080,LargeOperator_Sum_CenterSubSup:83886081,LargeOperator_Sum_SubSup:83886082,LargeOperator_Sum_CenterSub:83886083,LargeOperator_Sum_Sub:83886084,LargeOperator_Prod:83951616,LargeOperator_Prod_CenterSubSup:83951617,LargeOperator_Prod_SubSup:83951618,LargeOperator_Prod_CenterSub:83951619,LargeOperator_Prod_Sub:83951620,LargeOperator_CoProd:83951621,LargeOperator_CoProd_CenterSubSup:83951622,LargeOperator_CoProd_SubSup:83951623,LargeOperator_CoProd_CenterSub:83951624,LargeOperator_CoProd_Sub:83951625,LargeOperator_Union:84017152,LargeOperator_Union_CenterSubSup:84017153,LargeOperator_Union_SubSup:84017154,LargeOperator_Union_CenterSub:84017155,LargeOperator_Union_Sub:84017156,LargeOperator_Intersection:84017157,LargeOperator_Intersection_CenterSubSup:84017158,LargeOperator_Intersection_SubSup:84017159,LargeOperator_Intersection_CenterSub:84017160,LargeOperator_Intersection_Sub:84017161,LargeOperator_Disjunction:84082688,LargeOperator_Disjunction_CenterSubSup:84082689,LargeOperator_Disjunction_SubSup:84082690,LargeOperator_Disjunction_CenterSub:84082691,LargeOperator_Disjunction_Sub:84082692,LargeOperator_Conjunction:84082693,LargeOperator_Conjunction_CenterSubSup:84082694,LargeOperator_Conjunction_SubSup:84082695,LargeOperator_Conjunction_CenterSub:84082696,LargeOperator_Conjunction_Sub:84082697,LargeOperator_Custom_1:84148224,LargeOperator_Custom_2:84148225,LargeOperator_Custom_3:84148226,LargeOperator_Custom_4:84148227,LargeOperator_Custom_5:84148228,Bracket_Round:100663296,Bracket_Square:100663297,Bracket_Curve:100663298,Bracket_Angle:100663299,Bracket_LowLim:100663300,Bracket_UppLim:100663301,Bracket_Line:100663302,Bracket_LineDouble:100663303,Bracket_Square_OpenOpen:100663304,Bracket_Square_CloseClose:100663305,Bracket_Square_CloseOpen:100663306,Bracket_SquareDouble:100663307,Bracket_Round_Delimiter_2:100728832,Bracket_Curve_Delimiter_2:100728833,Bracket_Angle_Delimiter_2:100728834,Bracket_Angle_Delimiter_3:100728835,Bracket_Round_OpenNone:100794368,Bracket_Round_NoneOpen:100794369,Bracket_Square_OpenNone:100794370,Bracket_Square_NoneOpen:100794371,Bracket_Curve_OpenNone:100794372,Bracket_Curve_NoneOpen:100794373,Bracket_Angle_OpenNone:100794374,Bracket_Angle_NoneOpen:100794375,Bracket_LowLim_OpenNone:100794376,Bracket_LowLim_NoneNone:100794377,Bracket_UppLim_OpenNone:100794378,Bracket_UppLim_NoneOpen:100794379,Bracket_Line_OpenNone:100794380,Bracket_Line_NoneOpen:100794381,Bracket_LineDouble_OpenNone:100794382,Bracket_LineDouble_NoneOpen:100794383,Bracket_SquareDouble_OpenNone:100794384,Bracket_SquareDouble_NoneOpen:100794385,Bracket_Custom_1:100859904,Bracket_Custom_2:100859905,Bracket_Custom_3:100859906,Bracket_Custom_4:100859907,Bracket_Custom_5:100925440,Bracket_Custom_6:100925441,Bracket_Custom_7:100925442,Function_Sin:117440512,Function_Cos:117440513,Function_Tan:117440514,Function_Csc:117440515,Function_Sec:117440516,Function_Cot:117440517,Function_1_Sin:117506048,Function_1_Cos:117506049,Function_1_Tan:117506050,Function_1_Csc:117506051,Function_1_Sec:117506052,Function_1_Cot:117506053,Function_Sinh:117571584,Function_Cosh:117571585,Function_Tanh:117571586,Function_Csch:117571587,Function_Sech:117571588,Function_Coth:117571589,Function_1_Sinh:117637120,Function_1_Cosh:117637121,Function_1_Tanh:117637122,Function_1_Csch:117637123,Function_1_Sech:117637124,Function_1_Coth:117637125,Function_Custom_1:117702656,Function_Custom_2:117702657,Function_Custom_3:117702658,Accent_Dot:134217728,Accent_DDot:134217729,Accent_DDDot:134217730,Accent_Hat:134217731,Accent_Check:134217732,Accent_Accent:134217733,Accent_Grave:134217734,Accent_Smile:134217735,Accent_Tilde:134217736,Accent_Bar:134217737,Accent_DoubleBar:134217738,Accent_CurveBracketTop:134217739,Accent_CurveBracketBot:134217740,Accent_GroupTop:134217741,Accent_GroupBot:134217742,Accent_ArrowL:134217743,Accent_ArrowR:134217744,Accent_ArrowD:134217745,Accent_HarpoonL:134217746,Accent_HarpoonR:134217747,Accent_BorderBox:134283264,Accent_BorderBoxCustom:134283265,Accent_BarTop:134348800,Accent_BarBot:134348801,Accent_Custom_1:134414336,Accent_Custom_2:134414337,Accent_Custom_3:134414338,LimitLog_LogBase:150994944,LimitLog_Log:150994945,LimitLog_Lim:150994946,LimitLog_Min:150994947,LimitLog_Max:150994948,LimitLog_Ln:150994949,LimitLog_Custom_1:151060480,LimitLog_Custom_2:151060481,Operator_ColonEquals:167772160,Operator_EqualsEquals:167772161,Operator_PlusEquals:167772162,Operator_MinusEquals:167772163,Operator_Definition:167772164,Operator_UnitOfMeasure:167772165,Operator_DeltaEquals:167772166,Operator_ArrowL_Top:167837696,Operator_ArrowR_Top:167837697,Operator_ArrowL_Bot:167837698,Operator_ArrowR_Bot:167837699,Operator_DoubleArrowL_Top:167837700,Operator_DoubleArrowR_Top:167837701,Operator_DoubleArrowL_Bot:167837702,Operator_DoubleArrowR_Bot:167837703,Operator_ArrowD_Top:167837704,Operator_ArrowD_Bot:167837705,Operator_DoubleArrowD_Top:167837706,Operator_DoubleArrowD_Bot:167837707,Operator_Custom_1:167903232,Operator_Custom_2:167903233,Matrix_1_2:184549376,Matrix_2_1:184549377,Matrix_1_3:184549378,Matrix_3_1:184549379,Matrix_2_2:184549380,Matrix_2_3:184549381,Matrix_3_2:184549382,Matrix_3_3:184549383,Matrix_Dots_Center:184614912,Matrix_Dots_Baseline:184614913,Matrix_Dots_Vertical:184614914,Matrix_Dots_Diagonal:184614915,Matrix_Identity_2:184680448,Matrix_Identity_2_NoZeros:184680449,Matrix_Identity_3:184680450,Matrix_Identity_3_NoZeros:184680451,Matrix_2_2_RoundBracket:184745984,Matrix_2_2_SquareBracket:184745985,Matrix_2_2_LineBracket:184745986,Matrix_2_2_DLineBracket:184745987,Matrix_Flat_Round:184811520,Matrix_Flat_Square:184811521}}),define("text!spreadsheeteditor/main/app/template/Toolbar.template",[],function(){return'
\n
\n
\n <%= tabsmarkup %>\n
\n
\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n \n \n
\n
\n \n \n
\n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n
\n
\n \n \n \n \n \n \n \n \n
\n
\n
\n
\n
\n \n \n \n \n \n
\n
\n \n \n \n \n \n
\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n \n \n
\n
\n \n \n
\n
\n
\n
\n
\n \n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n \n \n
\n
\n \n \n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n \n \n \n \n \n
\n
\n
\n \n \n
\n
\n
\n \n
\n
\n
\n
\n \n \n \n \n \n
\n
\n
\n \n \n \n \n
\n
\n
\n
\n \n
\n
\n
\n \n \n \n \n \n \n \n \n \n
\n
\n
\n
\n
\n \n \n
\n
\n \n \n
\n
\n
\n
\n \n
\n
\n
\n \n \n
\n \x3c!--
--\x3e\n \x3c!--
--\x3e\n \x3c!----\x3e\n \x3c!--
--\x3e\n \x3c!--
--\x3e\n \x3c!----\x3e\n \x3c!--
--\x3e\n \x3c!--
--\x3e\n
\n
\n
\n
'}),define("text!spreadsheeteditor/main/app/template/ToolbarAnother.template",[],function(){return'
\n <% if ( isEditDiagram ) { %>\n \x3c!-----------------------\x3e\n \x3c!-- Edit diagram mode --\x3e\n \x3c!-----------------------\x3e\n
\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n \n \n \n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n <% } else if ( isEditMailMerge ) { %>\n \x3c!-----------------------\x3e\n \x3c!-- Edit mail merge mode --\x3e\n \x3c!-----------------------\x3e\n
\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n \n \n
\n
\n
\n
\n
\n \n \n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n <% } %>\n
'}),define("text!spreadsheeteditor/main/app/template/ToolbarView.template",[],function(){return'
\n
\n
\n <%= tabsmarkup %>\n
\n
\n
\n
\n
\n
\n
\n
'}),void 0===Common)var Common={};if(Common.Models=Common.Models||{},define("common/main/lib/model/Font",["backbone"],function(t){"use strict";Common.Models.Font=t.Model.extend({defaults:function(){return{id:Common.UI.getId(),name:null,cloneid:null,imgidx:0,type:0}}})}),void 0===Common)var Common={};if(Common.Collections=Common.Collections||{},define("common/main/lib/collection/Fonts",["backbone","common/main/lib/model/Font"],function(t){"use strict";Common.Collections.Fonts=t.Collection.extend({model:Common.Models.Font,comparator:function(t,e){var i=t.get("name").toLowerCase(),n=e.get("name").toLowerCase();return i==n?0:i","<% if (iconImg) { print(''); } else { %>","<% if (iconCls != \"\") { if (/svgicon/.test(iconCls)) {print('');} else print(' '); }} %>","<% } %>","<% if ( !menu ) { %>",'","<% } else if (split == false) {%>",'
','","
","<% } else { %>",'
','",'","
","<% } %>"].join("")),initialize:function(t){Common.UI.BaseView.prototype.initialize.call(this,t);var e=this;e.id=e.options.id||Common.UI.getId(),e.hint=e.options.hint,e.enableToggle=e.options.enableToggle,e.allowDepress=e.options.allowDepress,e.cls=e.options.cls,e.iconCls=e.options.iconCls,e.menu=e.options.menu,e.split=e.options.split,e.toggleGroup=e.options.toggleGroup,e.disabled=e.options.disabled,e.visible=e.options.visible,e.pressed=e.options.pressed,e.caption=e.options.caption,e.template=e.options.template||e.template,e.style=e.options.style,e.rendered=!1,e.options.el&&e.render()},render:function(t){var e=this;if(e.trigger("render:before",e),e.cmpEl=$(e.el),t&&(e.setElement(t,!1),e.rendered||(/icon-top/.test(e.cls)&&e.caption&&/huge/.test(e.cls)&&(!0===e.split?(!!e.cls&&(e.cls=e.cls.replace(/\s?(?:x-huge|icon-top)/g,"")),this.template=_.template('
')):e.menu?this.template=_.template('
'):this.template=_.template('')),e.cmpEl=$(this.template({id:e.id,cls:e.cls,iconCls:e.iconCls,iconImg:e.options.iconImg,menu:e.menu,split:e.split,disabled:e.disabled,pressed:e.pressed,caption:e.caption,style:e.style})),e.menu&&_.isObject(e.menu)&&_.isFunction(e.menu.render)&&e.menu.render(e.cmpEl),t.html(e.cmpEl),e.$icon=e.$el.find(".icon"))),!e.rendered){var i=e.cmpEl,n=i.hasClass("btn-group"),o=i.hasClass("split");if(e.options.hint){var s=e.cmpEl.closest(".asc-window");if("object"==typeof e.options.hint&&e.options.hint.length>1&&$("button",i).length>0){var a=$("button",i);e.btnEl=$(a[0]),e.btnMenuEl=$(a[1])}else e.btnEl=e.cmpEl,e.btnEl.attr("data-toggle","tooltip");e.btnEl.tooltip({ diff --git a/www/common/onlyoffice/x2t/README.md b/www/common/onlyoffice/x2t/README.md deleted file mode 100644 index 2c20b9cc2..000000000 --- a/www/common/onlyoffice/x2t/README.md +++ /dev/null @@ -1,11 +0,0 @@ - -LICENCE: GNU AGPL v3.0 - -The code in x2t.js is a WASM build based on the OnlyOffice Core source from this repository: - -https://github.com/ldubost/core/commits/wasm32-5.2.6 - -It is built using emscripten using docker: - -https://git.xwikisas.com/caubin/onlyoffice-x2t-wasm/tree/master/x2t-wasm - diff --git a/www/common/onlyoffice/x2t/x2t.js b/www/common/onlyoffice/x2t/x2t.js index c87f65922..181b2db8f 100644 --- a/www/common/onlyoffice/x2t/x2t.js +++ b/www/common/onlyoffice/x2t/x2t.js @@ -635,8 +635,8 @@ function getValue(ptr, type, noSafe) { } var wasmMemory; var wasmTable = new WebAssembly.Table({ - "initial": 63857, - "maximum": 63857 + 0, + "initial": 64685, + "maximum": 64685 + 0, "element": "anyfunc" }); var wasmModule; @@ -996,7 +996,7 @@ function updateGlobalBufferAndViews(buf) { Module["HEAPF32"] = HEAPF32 = new Float32Array(buf); Module["HEAPF64"] = HEAPF64 = new Float64Array(buf); } -var STATIC_BASE = 1024, STACK_BASE = 17838800, STACKTOP = STACK_BASE, STACK_MAX = 12595920, DYNAMIC_BASE = 17838800, DYNAMICTOP_PTR = 12594960; +var STATIC_BASE = 1024, STACK_BASE = 19131664, STACKTOP = STACK_BASE, STACK_MAX = 13888784, DYNAMIC_BASE = 19131664, DYNAMICTOP_PTR = 13887824; assert(STACK_BASE % 16 === 0, "stack must start aligned"); assert(DYNAMIC_BASE % 16 === 0, "heap must start aligned"); if (ENVIRONMENT_IS_PTHREAD) { @@ -1385,15 +1385,15 @@ var ASM_CONSTS = { root: "." }, "/working"); }), - 10774952: (function() { + 11958700: (function() { throw "Canceled!"; }), - 10775091: (function() { + 11958839: (function() { postMessage({ cmd: "processQueuedMainThreadWork" }); }), - 10775142: (function($0) { + 11958890: (function($0) { if (!ENVIRONMENT_IS_PTHREAD) { if (!PThread.pthreads[$0] || !PThread.pthreads[$0].worker) { return 0; @@ -1409,10 +1409,10 @@ var ASM_CONSTS = { } return 1; }), - 10775510: (function() { + 11959258: (function() { return !!Module["canvas"]; }), - 10775546: (function() { + 11959294: (function() { noExitRuntime = true; }) }; @@ -1480,96 +1480,261 @@ function stackTrace() { return demangleAll(js); } Module["stackTrace"] = stackTrace; -function __ZN12CPdfRenderer10SaveToFileERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE() { - err("missing function: _ZN12CPdfRenderer10SaveToFileERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"); +function __ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb() { + err("missing function: _ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb"); abort(-1); } -Module["__ZN12CPdfRenderer10SaveToFileERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"] = __ZN12CPdfRenderer10SaveToFileERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE; -function __ZN12CPdfRenderer11SetPasswordERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE() { - err("missing function: _ZN12CPdfRenderer11SetPasswordERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"); +Module["__ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb"] = __ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb; +function __ZN2v810Uint8Array3NewENS_5LocalINS_11ArrayBufferEEEmm() { + err("missing function: _ZN2v810Uint8Array3NewENS_5LocalINS_11ArrayBufferEEEmm"); abort(-1); } -Module["__ZN12CPdfRenderer11SetPasswordERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"] = __ZN12CPdfRenderer11SetPasswordERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE; -function __ZN12CPdfRenderer13SetDocumentIDERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE() { - err("missing function: _ZN12CPdfRenderer13SetDocumentIDERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"); +Module["__ZN2v810Uint8Array3NewENS_5LocalINS_11ArrayBufferEEEmm"] = __ZN2v810Uint8Array3NewENS_5LocalINS_11ArrayBufferEEEmm; +function __ZN2v811ArrayBuffer11ExternalizeEv() { + err("missing function: _ZN2v811ArrayBuffer11ExternalizeEv"); abort(-1); } -Module["__ZN12CPdfRenderer13SetDocumentIDERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"] = __ZN12CPdfRenderer13SetDocumentIDERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE; -function __ZN12CPdfRenderer13SetTempFolderERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE() { - err("missing function: _ZN12CPdfRenderer13SetTempFolderERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"); +Module["__ZN2v811ArrayBuffer11ExternalizeEv"] = __ZN2v811ArrayBuffer11ExternalizeEv; +function __ZN2v811ArrayBuffer3NewEPNS_7IsolateEPvmNS_23ArrayBufferCreationModeE() { + err("missing function: _ZN2v811ArrayBuffer3NewEPNS_7IsolateEPvmNS_23ArrayBufferCreationModeE"); abort(-1); } -Module["__ZN12CPdfRenderer13SetTempFolderERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"] = __ZN12CPdfRenderer13SetTempFolderERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE; -function __ZN12CPdfRenderer14SetThemesPlaceERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE() { - err("missing function: _ZN12CPdfRenderer14SetThemesPlaceERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"); +Module["__ZN2v811ArrayBuffer3NewEPNS_7IsolateEPvmNS_23ArrayBufferCreationModeE"] = __ZN2v811ArrayBuffer3NewEPNS_7IsolateEPvmNS_23ArrayBufferCreationModeE; +function __ZN2v811ArrayBuffer9Allocator19NewDefaultAllocatorEv() { + err("missing function: _ZN2v811ArrayBuffer9Allocator19NewDefaultAllocatorEv"); abort(-1); } -Module["__ZN12CPdfRenderer14SetThemesPlaceERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE"] = __ZN12CPdfRenderer14SetThemesPlaceERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE; -function __ZN12CPdfRenderer15OnlineWordToPdfERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb() { - err("missing function: _ZN12CPdfRenderer15OnlineWordToPdfERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb"); +Module["__ZN2v811ArrayBuffer9Allocator19NewDefaultAllocatorEv"] = __ZN2v811ArrayBuffer9Allocator19NewDefaultAllocatorEv; +function __ZN2v811HandleScope12CreateHandleEPNS_8internal10HeapObjectEPNS1_6ObjectE() { + err("missing function: _ZN2v811HandleScope12CreateHandleEPNS_8internal10HeapObjectEPNS1_6ObjectE"); abort(-1); } -Module["__ZN12CPdfRenderer15OnlineWordToPdfERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb"] = __ZN12CPdfRenderer15OnlineWordToPdfERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb; -function __ZN12CPdfRenderer25OnlineWordToPdfFromBinaryERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb() { - err("missing function: _ZN12CPdfRenderer25OnlineWordToPdfFromBinaryERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb"); +Module["__ZN2v811HandleScope12CreateHandleEPNS_8internal10HeapObjectEPNS1_6ObjectE"] = __ZN2v811HandleScope12CreateHandleEPNS_8internal10HeapObjectEPNS1_6ObjectE; +function __ZN2v811HandleScopeC1EPNS_7IsolateE() { + err("missing function: _ZN2v811HandleScopeC1EPNS_7IsolateE"); abort(-1); } -Module["__ZN12CPdfRenderer25OnlineWordToPdfFromBinaryERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb"] = __ZN12CPdfRenderer25OnlineWordToPdfFromBinaryERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb; -function __ZN12CPdfRendererC1EPN7NSFonts17IApplicationFontsEb() { - err("missing function: _ZN12CPdfRendererC1EPN7NSFonts17IApplicationFontsEb"); +Module["__ZN2v811HandleScopeC1EPNS_7IsolateE"] = __ZN2v811HandleScopeC1EPNS_7IsolateE; +function __ZN2v811HandleScopeD1Ev() { + err("missing function: _ZN2v811HandleScopeD1Ev"); abort(-1); } -Module["__ZN12CPdfRendererC1EPN7NSFonts17IApplicationFontsEb"] = __ZN12CPdfRendererC1EPN7NSFonts17IApplicationFontsEb; -function __ZN12CPdfRendererD1Ev() { - err("missing function: _ZN12CPdfRendererD1Ev"); +Module["__ZN2v811HandleScopeD1Ev"] = __ZN2v811HandleScopeD1Ev; +function __ZN2v814ObjectTemplate11NewInstanceEv() { + err("missing function: _ZN2v814ObjectTemplate11NewInstanceEv"); abort(-1); } -Module["__ZN12CPdfRendererD1Ev"] = __ZN12CPdfRendererD1Ev; -function __ZN14NSDoctRenderer13CDoctrenderer18GetImagesInChangesEv() { - err("missing function: _ZN14NSDoctRenderer13CDoctrenderer18GetImagesInChangesEv"); +Module["__ZN2v814ObjectTemplate11NewInstanceEv"] = __ZN2v814ObjectTemplate11NewInstanceEv; +function __ZN2v814ObjectTemplate11SetAccessorENS_5LocalINS_6StringEEEPFvS3_RKNS_20PropertyCallbackInfoINS_5ValueEEEEPFvS3_NS1_IS5_EERKNS4_IvEEESB_NS_13AccessControlENS_17PropertyAttributeENS1_INS_17AccessorSignatureEEE() { + err("missing function: _ZN2v814ObjectTemplate11SetAccessorENS_5LocalINS_6StringEEEPFvS3_RKNS_20PropertyCallbackInfoINS_5ValueEEEEPFvS3_NS1_IS5_EERKNS4_IvEEESB_NS_13AccessControlENS_17PropertyAttributeENS1_INS_17AccessorSignatureEEE"); abort(-1); } -Module["__ZN14NSDoctRenderer13CDoctrenderer18GetImagesInChangesEv"] = __ZN14NSDoctRenderer13CDoctrenderer18GetImagesInChangesEv; -function __ZN14NSDoctRenderer13CDoctrenderer7ExecuteERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERS7_() { - err("missing function: _ZN14NSDoctRenderer13CDoctrenderer7ExecuteERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERS7_"); +Module["__ZN2v814ObjectTemplate11SetAccessorENS_5LocalINS_6StringEEEPFvS3_RKNS_20PropertyCallbackInfoINS_5ValueEEEEPFvS3_NS1_IS5_EERKNS4_IvEEESB_NS_13AccessControlENS_17PropertyAttributeENS1_INS_17AccessorSignatureEEE"] = __ZN2v814ObjectTemplate11SetAccessorENS_5LocalINS_6StringEEEPFvS3_RKNS_20PropertyCallbackInfoINS_5ValueEEEEPFvS3_NS1_IS5_EERKNS4_IvEEESB_NS_13AccessControlENS_17PropertyAttributeENS1_INS_17AccessorSignatureEEE; +function __ZN2v814ObjectTemplate21SetInternalFieldCountEi() { + err("missing function: _ZN2v814ObjectTemplate21SetInternalFieldCountEi"); abort(-1); } -Module["__ZN14NSDoctRenderer13CDoctrenderer7ExecuteERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERS7_"] = __ZN14NSDoctRenderer13CDoctrenderer7ExecuteERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERS7_; -function __ZN14NSDoctRenderer13CDoctrendererC1ERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEE() { - err("missing function: _ZN14NSDoctRenderer13CDoctrendererC1ERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEE"); +Module["__ZN2v814ObjectTemplate21SetInternalFieldCountEi"] = __ZN2v814ObjectTemplate21SetInternalFieldCountEi; +function __ZN2v814ObjectTemplate3NewEv() { + err("missing function: _ZN2v814ObjectTemplate3NewEv"); abort(-1); } -Module["__ZN14NSDoctRenderer13CDoctrendererC1ERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEE"] = __ZN14NSDoctRenderer13CDoctrendererC1ERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEE; -function __ZN14NSDoctRenderer13CDoctrendererD1Ev() { - err("missing function: _ZN14NSDoctRenderer13CDoctrendererD1Ev"); +Module["__ZN2v814ObjectTemplate3NewEv"] = __ZN2v814ObjectTemplate3NewEv; +function __ZN2v814ScriptCompiler10CachedDataC1EPKhiNS1_12BufferPolicyE() { + err("missing function: _ZN2v814ScriptCompiler10CachedDataC1EPKhiNS1_12BufferPolicyE"); abort(-1); } -Module["__ZN14NSDoctRenderer13CDoctrendererD1Ev"] = __ZN14NSDoctRenderer13CDoctrendererD1Ev; -function __ZN14NSHtmlRenderer17CASCHTMLRenderer316CreateOfficeFileENSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERKS7_() { - err("missing function: _ZN14NSHtmlRenderer17CASCHTMLRenderer316CreateOfficeFileENSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERKS7_"); +Module["__ZN2v814ScriptCompiler10CachedDataC1EPKhiNS1_12BufferPolicyE"] = __ZN2v814ScriptCompiler10CachedDataC1EPKhiNS1_12BufferPolicyE; +function __ZN2v814ScriptCompiler7CompileENS_5LocalINS_7ContextEEEPNS0_6SourceENS0_14CompileOptionsE() { + err("missing function: _ZN2v814ScriptCompiler7CompileENS_5LocalINS_7ContextEEEPNS0_6SourceENS0_14CompileOptionsE"); abort(-1); } -Module["__ZN14NSHtmlRenderer17CASCHTMLRenderer316CreateOfficeFileENSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERKS7_"] = __ZN14NSHtmlRenderer17CASCHTMLRenderer316CreateOfficeFileENSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERKS7_; -function __ZN14NSHtmlRenderer17CASCHTMLRenderer39CloseFileEb() { - err("missing function: _ZN14NSHtmlRenderer17CASCHTMLRenderer39CloseFileEb"); +Module["__ZN2v814ScriptCompiler7CompileENS_5LocalINS_7ContextEEEPNS0_6SourceENS0_14CompileOptionsE"] = __ZN2v814ScriptCompiler7CompileENS_5LocalINS_7ContextEEEPNS0_6SourceENS0_14CompileOptionsE; +function __ZN2v815ArrayBufferView6BufferEv() { + err("missing function: _ZN2v815ArrayBufferView6BufferEv"); abort(-1); } -Module["__ZN14NSHtmlRenderer17CASCHTMLRenderer39CloseFileEb"] = __ZN14NSHtmlRenderer17CASCHTMLRenderer39CloseFileEb; -function __ZN14NSHtmlRenderer17CASCHTMLRenderer3C1Ev() { - err("missing function: _ZN14NSHtmlRenderer17CASCHTMLRenderer3C1Ev"); +Module["__ZN2v815ArrayBufferView6BufferEv"] = __ZN2v815ArrayBufferView6BufferEv; +function __ZN2v816FunctionTemplate3NewEPNS_7IsolateEPFvRKNS_20FunctionCallbackInfoINS_5ValueEEEENS_5LocalIS4_EENSA_INS_9SignatureEEEiNS_19ConstructorBehaviorE() { + err("missing function: _ZN2v816FunctionTemplate3NewEPNS_7IsolateEPFvRKNS_20FunctionCallbackInfoINS_5ValueEEEENS_5LocalIS4_EENSA_INS_9SignatureEEEiNS_19ConstructorBehaviorE"); abort(-1); } -Module["__ZN14NSHtmlRenderer17CASCHTMLRenderer3C1Ev"] = __ZN14NSHtmlRenderer17CASCHTMLRenderer3C1Ev; -function __ZN14NSHtmlRenderer17CASCHTMLRenderer3D1Ev() { - err("missing function: _ZN14NSHtmlRenderer17CASCHTMLRenderer3D1Ev"); +Module["__ZN2v816FunctionTemplate3NewEPNS_7IsolateEPFvRKNS_20FunctionCallbackInfoINS_5ValueEEEENS_5LocalIS4_EENSA_INS_9SignatureEEEiNS_19ConstructorBehaviorE"] = __ZN2v816FunctionTemplate3NewEPNS_7IsolateEPFvRKNS_20FunctionCallbackInfoINS_5ValueEEEENS_5LocalIS4_EENSA_INS_9SignatureEEEiNS_19ConstructorBehaviorE; +function __ZN2v819ResourceConstraintsC1Ev() { + err("missing function: _ZN2v819ResourceConstraintsC1Ev"); abort(-1); } -Module["__ZN14NSHtmlRenderer17CASCHTMLRenderer3D1Ev"] = __ZN14NSHtmlRenderer17CASCHTMLRenderer3D1Ev; -function __ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb() { - err("missing function: _ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb"); +Module["__ZN2v819ResourceConstraintsC1Ev"] = __ZN2v819ResourceConstraintsC1Ev; +function __ZN2v82V812ToLocalEmptyEv() { + err("missing function: _ZN2v82V812ToLocalEmptyEv"); abort(-1); } -Module["__ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb"] = __ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb; +Module["__ZN2v82V812ToLocalEmptyEv"] = __ZN2v82V812ToLocalEmptyEv; +function __ZN2v84JSON5ParseENS_5LocalINS_6StringEEE() { + err("missing function: _ZN2v84JSON5ParseENS_5LocalINS_6StringEEE"); + abort(-1); +} +Module["__ZN2v84JSON5ParseENS_5LocalINS_6StringEEE"] = __ZN2v84JSON5ParseENS_5LocalINS_6StringEEE; +function __ZN2v85Array3NewEPNS_7IsolateEi() { + err("missing function: _ZN2v85Array3NewEPNS_7IsolateEi"); + abort(-1); +} +Module["__ZN2v85Array3NewEPNS_7IsolateEi"] = __ZN2v85Array3NewEPNS_7IsolateEi; +function __ZN2v86Locker10InitializeEPNS_7IsolateE() { + err("missing function: _ZN2v86Locker10InitializeEPNS_7IsolateE"); + abort(-1); +} +Module["__ZN2v86Locker10InitializeEPNS_7IsolateE"] = __ZN2v86Locker10InitializeEPNS_7IsolateE; +function __ZN2v86LockerD1Ev() { + err("missing function: _ZN2v86LockerD1Ev"); + abort(-1); +} +Module["__ZN2v86LockerD1Ev"] = __ZN2v86LockerD1Ev; +function __ZN2v86Object16SetInternalFieldEiNS_5LocalINS_5ValueEEE() { + err("missing function: _ZN2v86Object16SetInternalFieldEiNS_5LocalINS_5ValueEEE"); + abort(-1); +} +Module["__ZN2v86Object16SetInternalFieldEiNS_5LocalINS_5ValueEEE"] = __ZN2v86Object16SetInternalFieldEiNS_5LocalINS_5ValueEEE; +function __ZN2v86Object20SlowGetInternalFieldEi() { + err("missing function: _ZN2v86Object20SlowGetInternalFieldEi"); + abort(-1); +} +Module["__ZN2v86Object20SlowGetInternalFieldEi"] = __ZN2v86Object20SlowGetInternalFieldEi; +function __ZN2v86Object3GetENS_5LocalINS_5ValueEEE() { + err("missing function: _ZN2v86Object3GetENS_5LocalINS_5ValueEEE"); + abort(-1); +} +Module["__ZN2v86Object3GetENS_5LocalINS_5ValueEEE"] = __ZN2v86Object3GetENS_5LocalINS_5ValueEEE; +function __ZN2v86Object3NewEPNS_7IsolateE() { + err("missing function: _ZN2v86Object3NewEPNS_7IsolateE"); + abort(-1); +} +Module["__ZN2v86Object3NewEPNS_7IsolateE"] = __ZN2v86Object3NewEPNS_7IsolateE; +function __ZN2v86Object3SetENS_5LocalINS_5ValueEEES3_() { + err("missing function: _ZN2v86Object3SetENS_5LocalINS_5ValueEEES3_"); + abort(-1); +} +Module["__ZN2v86Object3SetENS_5LocalINS_5ValueEEES3_"] = __ZN2v86Object3SetENS_5LocalINS_5ValueEEES3_; +function __ZN2v86Object3SetEjNS_5LocalINS_5ValueEEE() { + err("missing function: _ZN2v86Object3SetEjNS_5LocalINS_5ValueEEE"); + abort(-1); +} +Module["__ZN2v86Object3SetEjNS_5LocalINS_5ValueEEE"] = __ZN2v86Object3SetEjNS_5LocalINS_5ValueEEE; +function __ZN2v86Script3RunEv() { + err("missing function: _ZN2v86Script3RunEv"); + abort(-1); +} +Module["__ZN2v86Script3RunEv"] = __ZN2v86Script3RunEv; +function __ZN2v86Script7CompileENS_5LocalINS_6StringEEEPNS_12ScriptOriginE() { + err("missing function: _ZN2v86Script7CompileENS_5LocalINS_6StringEEEPNS_12ScriptOriginE"); + abort(-1); +} +Module["__ZN2v86Script7CompileENS_5LocalINS_6StringEEEPNS_12ScriptOriginE"] = __ZN2v86Script7CompileENS_5LocalINS_6StringEEEPNS_12ScriptOriginE; +function __ZN2v86String11NewFromUtf8EPNS_7IsolateEPKcNS0_13NewStringTypeEi() { + err("missing function: _ZN2v86String11NewFromUtf8EPNS_7IsolateEPKcNS0_13NewStringTypeEi"); + abort(-1); +} +Module["__ZN2v86String11NewFromUtf8EPNS_7IsolateEPKcNS0_13NewStringTypeEi"] = __ZN2v86String11NewFromUtf8EPNS_7IsolateEPKcNS0_13NewStringTypeEi; +function __ZN2v86String5ValueC1ENS_5LocalINS_5ValueEEE() { + err("missing function: _ZN2v86String5ValueC1ENS_5LocalINS_5ValueEEE"); + abort(-1); +} +Module["__ZN2v86String5ValueC1ENS_5LocalINS_5ValueEEE"] = __ZN2v86String5ValueC1ENS_5LocalINS_5ValueEEE; +function __ZN2v86String5ValueD1Ev() { + err("missing function: _ZN2v86String5ValueD1Ev"); + abort(-1); +} +Module["__ZN2v86String5ValueD1Ev"] = __ZN2v86String5ValueD1Ev; +function __ZN2v86String9Utf8ValueC1ENS_5LocalINS_5ValueEEE() { + err("missing function: _ZN2v86String9Utf8ValueC1ENS_5LocalINS_5ValueEEE"); + abort(-1); +} +Module["__ZN2v86String9Utf8ValueC1ENS_5LocalINS_5ValueEEE"] = __ZN2v86String9Utf8ValueC1ENS_5LocalINS_5ValueEEE; +function __ZN2v86String9Utf8ValueD1Ev() { + err("missing function: _ZN2v86String9Utf8ValueD1Ev"); + abort(-1); +} +Module["__ZN2v86String9Utf8ValueD1Ev"] = __ZN2v86String9Utf8ValueD1Ev; +function __ZN2v87Context3NewEPNS_7IsolateEPNS_22ExtensionConfigurationENS_10MaybeLocalINS_14ObjectTemplateEEENS5_INS_5ValueEEE() { + err("missing function: _ZN2v87Context3NewEPNS_7IsolateEPNS_22ExtensionConfigurationENS_10MaybeLocalINS_14ObjectTemplateEEENS5_INS_5ValueEEE"); + abort(-1); +} +Module["__ZN2v87Context3NewEPNS_7IsolateEPNS_22ExtensionConfigurationENS_10MaybeLocalINS_14ObjectTemplateEEENS5_INS_5ValueEEE"] = __ZN2v87Context3NewEPNS_7IsolateEPNS_22ExtensionConfigurationENS_10MaybeLocalINS_14ObjectTemplateEEENS5_INS_5ValueEEE; +function __ZN2v87Context4ExitEv() { + err("missing function: _ZN2v87Context4ExitEv"); + abort(-1); +} +Module["__ZN2v87Context4ExitEv"] = __ZN2v87Context4ExitEv; +function __ZN2v87Context5EnterEv() { + err("missing function: _ZN2v87Context5EnterEv"); + abort(-1); +} +Module["__ZN2v87Context5EnterEv"] = __ZN2v87Context5EnterEv; +function __ZN2v87Context6GlobalEv() { + err("missing function: _ZN2v87Context6GlobalEv"); + abort(-1); +} +Module["__ZN2v87Context6GlobalEv"] = __ZN2v87Context6GlobalEv; +function __ZN2v87Integer3NewEPNS_7IsolateEi() { + err("missing function: _ZN2v87Integer3NewEPNS_7IsolateEi"); + abort(-1); +} +Module["__ZN2v87Integer3NewEPNS_7IsolateEi"] = __ZN2v87Integer3NewEPNS_7IsolateEi; +function __ZN2v87Isolate10GetCurrentEv() { + err("missing function: _ZN2v87Isolate10GetCurrentEv"); + abort(-1); +} +Module["__ZN2v87Isolate10GetCurrentEv"] = __ZN2v87Isolate10GetCurrentEv; +function __ZN2v87Isolate17GetCurrentContextEv() { + err("missing function: _ZN2v87Isolate17GetCurrentContextEv"); + abort(-1); +} +Module["__ZN2v87Isolate17GetCurrentContextEv"] = __ZN2v87Isolate17GetCurrentContextEv; +function __ZN2v87Isolate3NewERKNS0_12CreateParamsE() { + err("missing function: _ZN2v87Isolate3NewERKNS0_12CreateParamsE"); + abort(-1); +} +Module["__ZN2v87Isolate3NewERKNS0_12CreateParamsE"] = __ZN2v87Isolate3NewERKNS0_12CreateParamsE; +function __ZN2v87Isolate4ExitEv() { + err("missing function: _ZN2v87Isolate4ExitEv"); + abort(-1); +} +Module["__ZN2v87Isolate4ExitEv"] = __ZN2v87Isolate4ExitEv; +function __ZN2v87Isolate5EnterEv() { + err("missing function: _ZN2v87Isolate5EnterEv"); + abort(-1); +} +Module["__ZN2v87Isolate5EnterEv"] = __ZN2v87Isolate5EnterEv; +function __ZN2v87Isolate7DisposeEv() { + err("missing function: _ZN2v87Isolate7DisposeEv"); + abort(-1); +} +Module["__ZN2v87Isolate7DisposeEv"] = __ZN2v87Isolate7DisposeEv; +function __ZN2v88External3NewEPNS_7IsolateEPv() { + err("missing function: _ZN2v88External3NewEPNS_7IsolateEPv"); + abort(-1); +} +Module["__ZN2v88External3NewEPNS_7IsolateEPv"] = __ZN2v88External3NewEPNS_7IsolateEPv; +function __ZN2v88Function4CallENS_5LocalINS_5ValueEEEiPS3_() { + err("missing function: _ZN2v88Function4CallENS_5LocalINS_5ValueEEEiPS3_"); + abort(-1); +} +Module["__ZN2v88Function4CallENS_5LocalINS_5ValueEEEiPS3_"] = __ZN2v88Function4CallENS_5LocalINS_5ValueEEEiPS3_; +function __ZN2v88Template3SetENS_5LocalINS_4NameEEENS1_INS_4DataEEENS_17PropertyAttributeE() { + err("missing function: _ZN2v88Template3SetENS_5LocalINS_4NameEEENS1_INS_4DataEEENS_17PropertyAttributeE"); + abort(-1); +} +Module["__ZN2v88Template3SetENS_5LocalINS_4NameEEENS1_INS_4DataEEENS_17PropertyAttributeE"] = __ZN2v88Template3SetENS_5LocalINS_4NameEEENS1_INS_4DataEEENS_17PropertyAttributeE; +function __ZN2v88TryCatchC1Ev() { + err("missing function: _ZN2v88TryCatchC1Ev"); + abort(-1); +} +Module["__ZN2v88TryCatchC1Ev"] = __ZN2v88TryCatchC1Ev; +function __ZN2v88TryCatchD1Ev() { + err("missing function: _ZN2v88TryCatchD1Ev"); + abort(-1); +} +Module["__ZN2v88TryCatchD1Ev"] = __ZN2v88TryCatchD1Ev; function __ZN8CXpsFileC1EPN7NSFonts17IApplicationFontsE() { err("missing function: _ZN8CXpsFileC1EPN7NSFonts17IApplicationFontsE"); abort(-1); @@ -1605,16 +1770,76 @@ function __ZN9CHtmlFileD1Ev() { abort(-1); } Module["__ZN9CHtmlFileD1Ev"] = __ZN9CHtmlFileD1Ev; -function __ZN9PdfReader10CPdfReader8GetErrorEv() { - err("missing function: _ZN9PdfReader10CPdfReader8GetErrorEv"); +function __ZNK2v85Int325ValueEv() { + err("missing function: _ZNK2v85Int325ValueEv"); + abort(-1); +} +Module["__ZNK2v85Int325ValueEv"] = __ZNK2v85Int325ValueEv; +function __ZNK2v85Value10IsFunctionEv() { + err("missing function: _ZNK2v85Value10IsFunctionEv"); + abort(-1); +} +Module["__ZNK2v85Value10IsFunctionEv"] = __ZNK2v85Value10IsFunctionEv; +function __ZNK2v85Value12BooleanValueEv() { + err("missing function: _ZNK2v85Value12BooleanValueEv"); + abort(-1); +} +Module["__ZNK2v85Value12BooleanValueEv"] = __ZNK2v85Value12BooleanValueEv; +function __ZNK2v85Value7ToInt32ENS_5LocalINS_7ContextEEE() { + err("missing function: _ZNK2v85Value7ToInt32ENS_5LocalINS_7ContextEEE"); + abort(-1); +} +Module["__ZNK2v85Value7ToInt32ENS_5LocalINS_7ContextEEE"] = __ZNK2v85Value7ToInt32ENS_5LocalINS_7ContextEEE; +function __ZNK2v85Value8ToNumberENS_5LocalINS_7ContextEEE() { + err("missing function: _ZNK2v85Value8ToNumberENS_5LocalINS_7ContextEEE"); + abort(-1); +} +Module["__ZNK2v85Value8ToNumberENS_5LocalINS_7ContextEEE"] = __ZNK2v85Value8ToNumberENS_5LocalINS_7ContextEEE; +function __ZNK2v85Value8ToObjectENS_5LocalINS_7ContextEEE() { + err("missing function: _ZNK2v85Value8ToObjectENS_5LocalINS_7ContextEEE"); + abort(-1); +} +Module["__ZNK2v85Value8ToObjectENS_5LocalINS_7ContextEEE"] = __ZNK2v85Value8ToObjectENS_5LocalINS_7ContextEEE; +function __ZNK2v85Value8ToUint32ENS_5LocalINS_7ContextEEE() { + err("missing function: _ZNK2v85Value8ToUint32ENS_5LocalINS_7ContextEEE"); + abort(-1); +} +Module["__ZNK2v85Value8ToUint32ENS_5LocalINS_7ContextEEE"] = __ZNK2v85Value8ToUint32ENS_5LocalINS_7ContextEEE; +function __ZNK2v86Number5ValueEv() { + err("missing function: _ZNK2v86Number5ValueEv"); + abort(-1); +} +Module["__ZNK2v86Number5ValueEv"] = __ZNK2v86Number5ValueEv; +function __ZNK2v86Uint325ValueEv() { + err("missing function: _ZNK2v86Uint325ValueEv"); + abort(-1); +} +Module["__ZNK2v86Uint325ValueEv"] = __ZNK2v86Uint325ValueEv; +function __ZNK2v87Message13GetSourceLineEv() { + err("missing function: _ZNK2v87Message13GetSourceLineEv"); abort(-1); } -Module["__ZN9PdfReader10CPdfReader8GetErrorEv"] = __ZN9PdfReader10CPdfReader8GetErrorEv; -function __ZN9PdfReader10CPdfReaderC1EPN7NSFonts17IApplicationFontsE() { - err("missing function: _ZN9PdfReader10CPdfReaderC1EPN7NSFonts17IApplicationFontsE"); +Module["__ZNK2v87Message13GetSourceLineEv"] = __ZNK2v87Message13GetSourceLineEv; +function __ZNK2v87Message3GetEv() { + err("missing function: _ZNK2v87Message3GetEv"); abort(-1); } -Module["__ZN9PdfReader10CPdfReaderC1EPN7NSFonts17IApplicationFontsE"] = __ZN9PdfReader10CPdfReaderC1EPN7NSFonts17IApplicationFontsE; +Module["__ZNK2v87Message3GetEv"] = __ZNK2v87Message3GetEv; +function __ZNK2v88External5ValueEv() { + err("missing function: _ZNK2v88External5ValueEv"); + abort(-1); +} +Module["__ZNK2v88External5ValueEv"] = __ZNK2v88External5ValueEv; +function __ZNK2v88TryCatch7MessageEv() { + err("missing function: _ZNK2v88TryCatch7MessageEv"); + abort(-1); +} +Module["__ZNK2v88TryCatch7MessageEv"] = __ZNK2v88TryCatch7MessageEv; +function __ZNK2v88TryCatch9HasCaughtEv() { + err("missing function: _ZNK2v88TryCatch9HasCaughtEv"); + abort(-1); +} +Module["__ZNK2v88TryCatch9HasCaughtEv"] = __ZNK2v88TryCatch9HasCaughtEv; function ___assert_fail(condition, filename, line, func) { abort("Assertion failed: " + UTF8ToString(condition) + ", at: " + [ filename ? UTF8ToString(filename) : "unknown filename", line, func ? UTF8ToString(func) : "unknown function" ]); } @@ -1765,7 +1990,7 @@ var ERRNO_CODES = { ESTRPIPE: 135 }; Module["ERRNO_CODES"] = ERRNO_CODES; -var __main_thread_futex_wait_address = 12595904; +var __main_thread_futex_wait_address = 13888768; Module["__main_thread_futex_wait_address"] = __main_thread_futex_wait_address; function _emscripten_futex_wake(addr, count) { if (addr <= 0 || addr > HEAP8.length || addr & 3 != 0 || count < 0) return -28; @@ -1832,12 +2057,12 @@ var PThread = { }), initMainThreadBlock: (function() { if (ENVIRONMENT_IS_PTHREAD) return undefined; - PThread.mainThreadBlock = 12595120; + PThread.mainThreadBlock = 13887984; for (var i = 0; i < 244 / 4; ++i) GROWABLE_HEAP_STORE_I32((PThread.mainThreadBlock / 4 + i) * 4 | 0, 0); GROWABLE_HEAP_STORE_I32(PThread.mainThreadBlock + 24 | 0, PThread.mainThreadBlock); var headPtr = PThread.mainThreadBlock + 168; GROWABLE_HEAP_STORE_I32(headPtr | 0, headPtr); - var tlsMemory = 12595376; + var tlsMemory = 13888240; for (var i = 0; i < 128; ++i) GROWABLE_HEAP_STORE_I32((tlsMemory / 4 + i) * 4 | 0, 0); Atomics.store(HEAPU32, PThread.mainThreadBlock + 116 >> 2, tlsMemory); Atomics.store(HEAPU32, PThread.mainThreadBlock + 52 >> 2, PThread.mainThreadBlock); @@ -5124,95 +5349,8 @@ function ___syscall183(which, varargs) { } } Module["___syscall183"] = ___syscall183; -function _memset(ptr, value, num) { - ptr = ptr | 0; - value = value | 0; - num = num | 0; - var end = 0, aligned_end = 0, block_aligned_end = 0, value4 = 0; - end = ptr + num | 0; - value = value & 255; - if ((num | 0) >= 67) { - while ((ptr & 3) != 0) { - GROWABLE_HEAP_STORE_I8(ptr >> 0 | 0, value); - ptr = ptr + 1 | 0; - } - aligned_end = end & -4 | 0; - value4 = value | value << 8 | value << 16 | value << 24; - block_aligned_end = aligned_end - 64 | 0; - while ((ptr | 0) <= (block_aligned_end | 0)) { - GROWABLE_HEAP_STORE_I32(ptr | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 4 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 8 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 12 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 16 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 20 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 24 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 28 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 32 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 36 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 40 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 44 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 48 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 52 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 56 | 0, value4); - GROWABLE_HEAP_STORE_I32(ptr + 60 | 0, value4); - ptr = ptr + 64 | 0; - } - while ((ptr | 0) < (aligned_end | 0)) { - GROWABLE_HEAP_STORE_I32(ptr | 0, value4); - ptr = ptr + 4 | 0; - } - } - while ((ptr | 0) < (end | 0)) { - GROWABLE_HEAP_STORE_I8(ptr >> 0 | 0, value); - ptr = ptr + 1 | 0; - } - return end - num | 0; -} -Module["_memset"] = _memset; -function __emscripten_syscall_mmap2(addr, len, prot, flags, fd, off) { - off <<= 12; - var ptr; - var allocated = false; - if ((flags & 16) !== 0 && addr % PAGE_SIZE !== 0) { - return -28; - } - if ((flags & 32) !== 0) { - ptr = _memalign(PAGE_SIZE, len); - if (!ptr) return -48; - _memset(ptr, 0, len); - allocated = true; - } else { - var info = FS.getStream(fd); - if (!info) return -8; - var res = FS.mmap(info, HEAPU8, addr, len, off, prot, flags); - ptr = res.ptr; - allocated = res.allocated; - } - SYSCALLS.mappings[ptr] = { - malloc: ptr, - len: len, - allocated: allocated, - fd: fd, - flags: flags - }; - return ptr; -} -Module["__emscripten_syscall_mmap2"] = __emscripten_syscall_mmap2; -function ___syscall192(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(5, 1, which, varargs); - SYSCALLS.varargs = varargs; - try { - var addr = SYSCALLS.get(), len = SYSCALLS.get(), prot = SYSCALLS.get(), flags = SYSCALLS.get(), fd = SYSCALLS.get(), off = SYSCALLS.get(); - return __emscripten_syscall_mmap2(addr, len, prot, flags, fd, off); - } catch (e) { - if (typeof FS === "undefined" || !(e instanceof FS.ErrnoError)) abort(e); - return -e.errno; - } -} -Module["___syscall192"] = ___syscall192; function ___syscall195(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(6, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(5, 1, which, varargs); SYSCALLS.varargs = varargs; try { var path = SYSCALLS.getStr(), buf = SYSCALLS.get(); @@ -5224,7 +5362,7 @@ function ___syscall195(which, varargs) { } Module["___syscall195"] = ___syscall195; function ___syscall196(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(7, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(6, 1, which, varargs); SYSCALLS.varargs = varargs; try { var path = SYSCALLS.getStr(), buf = SYSCALLS.get(); @@ -5236,7 +5374,7 @@ function ___syscall196(which, varargs) { } Module["___syscall196"] = ___syscall196; function ___syscall220(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(8, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(7, 1, which, varargs); SYSCALLS.varargs = varargs; try { var stream = SYSCALLS.getStreamFromFD(), dirp = SYSCALLS.get(), count = SYSCALLS.get(); @@ -5276,7 +5414,7 @@ function ___syscall220(which, varargs) { } Module["___syscall220"] = ___syscall220; function ___syscall221(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(9, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(8, 1, which, varargs); SYSCALLS.varargs = varargs; try { var stream = SYSCALLS.getStreamFromFD(), cmd = SYSCALLS.get(); @@ -5330,7 +5468,7 @@ function ___syscall221(which, varargs) { } Module["___syscall221"] = ___syscall221; function ___syscall3(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(10, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(9, 1, which, varargs); SYSCALLS.varargs = varargs; try { var stream = SYSCALLS.getStreamFromFD(), buf = SYSCALLS.get(), count = SYSCALLS.get(); @@ -5342,7 +5480,7 @@ function ___syscall3(which, varargs) { } Module["___syscall3"] = ___syscall3; function ___syscall39(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(11, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(10, 1, which, varargs); SYSCALLS.varargs = varargs; try { var path = SYSCALLS.getStr(), mode = SYSCALLS.get(); @@ -5354,7 +5492,7 @@ function ___syscall39(which, varargs) { } Module["___syscall39"] = ___syscall39; function ___syscall4(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(12, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(11, 1, which, varargs); SYSCALLS.varargs = varargs; try { var stream = SYSCALLS.getStreamFromFD(), buf = SYSCALLS.get(), count = SYSCALLS.get(); @@ -5366,7 +5504,7 @@ function ___syscall4(which, varargs) { } Module["___syscall4"] = ___syscall4; function ___syscall40(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(13, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(12, 1, which, varargs); SYSCALLS.varargs = varargs; try { var path = SYSCALLS.getStr(); @@ -5379,7 +5517,7 @@ function ___syscall40(which, varargs) { } Module["___syscall40"] = ___syscall40; function ___syscall5(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(14, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(13, 1, which, varargs); SYSCALLS.varargs = varargs; try { var pathname = SYSCALLS.getStr(), flags = SYSCALLS.get(), mode = SYSCALLS.get(); @@ -5392,7 +5530,7 @@ function ___syscall5(which, varargs) { } Module["___syscall5"] = ___syscall5; function ___syscall54(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(15, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(14, 1, which, varargs); SYSCALLS.varargs = varargs; try { var stream = SYSCALLS.getStreamFromFD(), op = SYSCALLS.get(); @@ -5450,7 +5588,7 @@ function ___syscall54(which, varargs) { } Module["___syscall54"] = ___syscall54; function ___syscall85(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(16, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(15, 1, which, varargs); SYSCALLS.varargs = varargs; try { var path = SYSCALLS.getStr(), buf = SYSCALLS.get(), bufsize = SYSCALLS.get(); @@ -5480,7 +5618,7 @@ function __emscripten_syscall_munmap(addr, len) { } Module["__emscripten_syscall_munmap"] = __emscripten_syscall_munmap; function ___syscall91(which, varargs) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(17, 1, which, varargs); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(16, 1, which, varargs); SYSCALLS.varargs = varargs; try { var addr = SYSCALLS.get(), len = SYSCALLS.get(); @@ -5541,7 +5679,7 @@ function _emscripten_get_heap_size() { } Module["_emscripten_get_heap_size"] = _emscripten_get_heap_size; function _emscripten_get_sbrk_ptr() { - return 12594960; + return 13887824; } Module["_emscripten_get_sbrk_ptr"] = _emscripten_get_sbrk_ptr; function _emscripten_has_threading_support() { @@ -5930,7 +6068,7 @@ function _emscripten_set_canvas_element_size_calling_thread(target, width, heigh } Module["_emscripten_set_canvas_element_size_calling_thread"] = _emscripten_set_canvas_element_size_calling_thread; function _emscripten_set_canvas_element_size_main_thread(target, width, height) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(18, 1, target, width, height); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(17, 1, target, width, height); return _emscripten_set_canvas_element_size_calling_thread(target, width, height); } Module["_emscripten_set_canvas_element_size_main_thread"] = _emscripten_set_canvas_element_size_main_thread; @@ -5964,8 +6102,6 @@ function _emscripten_syscall(which, varargs) { return ___syscall12(which, varargs); case 183: return ___syscall183(which, varargs); - case 192: - return ___syscall192(which, varargs); case 195: return ___syscall195(which, varargs); case 196: @@ -6269,7 +6405,7 @@ function _exit(status) { } Module["_exit"] = _exit; function _fd_close(fd) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(19, 1, fd); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(18, 1, fd); try { var stream = SYSCALLS.getStreamFromFD(fd); FS.close(stream); @@ -6281,7 +6417,7 @@ function _fd_close(fd) { } Module["_fd_close"] = _fd_close; function _fd_read(fd, iov, iovcnt, pnum) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(20, 1, fd, iov, iovcnt, pnum); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(19, 1, fd, iov, iovcnt, pnum); try { var stream = SYSCALLS.getStreamFromFD(fd); var num = SYSCALLS.doReadv(stream, iov, iovcnt); @@ -6294,7 +6430,7 @@ function _fd_read(fd, iov, iovcnt, pnum) { } Module["_fd_read"] = _fd_read; function _fd_seek(fd, offset_low, offset_high, whence, newOffset) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(21, 1, fd, offset_low, offset_high, whence, newOffset); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(20, 1, fd, offset_low, offset_high, whence, newOffset); try { var stream = SYSCALLS.getStreamFromFD(fd); var HIGH_OFFSET = 4294967296; @@ -6314,7 +6450,7 @@ function _fd_seek(fd, offset_low, offset_high, whence, newOffset) { } Module["_fd_seek"] = _fd_seek; function _fd_write(fd, iov, iovcnt, pnum) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(22, 1, fd, iov, iovcnt, pnum); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(21, 1, fd, iov, iovcnt, pnum); try { var stream = SYSCALLS.getStreamFromFD(fd); var num = SYSCALLS.doWritev(stream, iov, iovcnt); @@ -6337,9 +6473,9 @@ function _gettimeofday(ptr) { return 0; } Module["_gettimeofday"] = _gettimeofday; -var ___tm_current = 12594976; +var ___tm_current = 13887840; Module["___tm_current"] = ___tm_current; -var ___tm_timezone = (stringToUTF8("GMT", 12595024, 4), 12595024); +var ___tm_timezone = (stringToUTF8("GMT", 13887888, 4), 13887888); Module["___tm_timezone"] = ___tm_timezone; function _gmtime_r(time, tmPtr) { var date = new Date(GROWABLE_HEAP_LOAD_I32(time | 0) * 1e3); @@ -6431,8 +6567,54 @@ function _memcpy(dest, src, num) { return ret | 0; } Module["_memcpy"] = _memcpy; +function _memset(ptr, value, num) { + ptr = ptr | 0; + value = value | 0; + num = num | 0; + var end = 0, aligned_end = 0, block_aligned_end = 0, value4 = 0; + end = ptr + num | 0; + value = value & 255; + if ((num | 0) >= 67) { + while ((ptr & 3) != 0) { + GROWABLE_HEAP_STORE_I8(ptr >> 0 | 0, value); + ptr = ptr + 1 | 0; + } + aligned_end = end & -4 | 0; + value4 = value | value << 8 | value << 16 | value << 24; + block_aligned_end = aligned_end - 64 | 0; + while ((ptr | 0) <= (block_aligned_end | 0)) { + GROWABLE_HEAP_STORE_I32(ptr | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 4 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 8 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 12 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 16 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 20 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 24 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 28 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 32 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 36 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 40 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 44 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 48 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 52 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 56 | 0, value4); + GROWABLE_HEAP_STORE_I32(ptr + 60 | 0, value4); + ptr = ptr + 64 | 0; + } + while ((ptr | 0) < (aligned_end | 0)) { + GROWABLE_HEAP_STORE_I32(ptr | 0, value4); + ptr = ptr + 4 | 0; + } + } + while ((ptr | 0) < (end | 0)) { + GROWABLE_HEAP_STORE_I8(ptr >> 0 | 0, value); + ptr = ptr + 1 | 0; + } + return end - num | 0; +} +Module["_memset"] = _memset; function _tzset() { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(23, 1); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(22, 1); if (_tzset.called) return; _tzset.called = true; GROWABLE_HEAP_STORE_I32(__get_timezone() | 0, (new Date).getTimezoneOffset() * 60); @@ -6953,7 +7135,7 @@ function _strftime_l(s, maxsize, format, tm) { } Module["_strftime_l"] = _strftime_l; function _sysconf(name) { - if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(24, 1, name); + if (ENVIRONMENT_IS_PTHREAD) return _emscripten_proxy_to_main_thread_js(23, 1, name); switch (name) { case 30: return PAGE_SIZE; @@ -7136,6 +7318,76 @@ function _times(buffer) { return 0; } Module["_times"] = _times; +function _u_strFromWCS_62() { + err("missing function: u_strFromWCS_62"); + abort(-1); +} +Module["_u_strFromWCS_62"] = _u_strFromWCS_62; +function _u_strToWCS_62() { + err("missing function: u_strToWCS_62"); + abort(-1); +} +Module["_u_strToWCS_62"] = _u_strToWCS_62; +function _ucnv_close_62() { + err("missing function: ucnv_close_62"); + abort(-1); +} +Module["_ucnv_close_62"] = _ucnv_close_62; +function _ucnv_fromUnicode_62() { + err("missing function: ucnv_fromUnicode_62"); + abort(-1); +} +Module["_ucnv_fromUnicode_62"] = _ucnv_fromUnicode_62; +function _ucnv_getCCSID_62() { + err("missing function: ucnv_getCCSID_62"); + abort(-1); +} +Module["_ucnv_getCCSID_62"] = _ucnv_getCCSID_62; +function _ucnv_getMaxCharSize_62() { + err("missing function: ucnv_getMaxCharSize_62"); + abort(-1); +} +Module["_ucnv_getMaxCharSize_62"] = _ucnv_getMaxCharSize_62; +function _ucnv_getMinCharSize_62() { + err("missing function: ucnv_getMinCharSize_62"); + abort(-1); +} +Module["_ucnv_getMinCharSize_62"] = _ucnv_getMinCharSize_62; +function _ucnv_getName_62() { + err("missing function: ucnv_getName_62"); + abort(-1); +} +Module["_ucnv_getName_62"] = _ucnv_getName_62; +function _ucnv_openCCSID_62() { + err("missing function: ucnv_openCCSID_62"); + abort(-1); +} +Module["_ucnv_openCCSID_62"] = _ucnv_openCCSID_62; +function _ucnv_open_62() { + err("missing function: ucnv_open_62"); + abort(-1); +} +Module["_ucnv_open_62"] = _ucnv_open_62; +function _ucnv_toUnicode_62() { + err("missing function: ucnv_toUnicode_62"); + abort(-1); +} +Module["_ucnv_toUnicode_62"] = _ucnv_toUnicode_62; +function _usprep_close_62() { + err("missing function: usprep_close_62"); + abort(-1); +} +Module["_usprep_close_62"] = _usprep_close_62; +function _usprep_openByType_62() { + err("missing function: usprep_openByType_62"); + abort(-1); +} +Module["_usprep_openByType_62"] = _usprep_openByType_62; +function _usprep_prepare_62() { + err("missing function: usprep_prepare_62"); + abort(-1); +} +Module["_usprep_prepare_62"] = _usprep_prepare_62; if (!ENVIRONMENT_IS_PTHREAD) PThread.initMainThreadBlock(); else PThread.initWorker(); if (ENVIRONMENT_IS_NODE) { _emscripten_get_now = function _emscripten_get_now_actual() { @@ -7163,7 +7415,7 @@ if (ENVIRONMENT_HAS_NODE) { } var GLctx; GL.init(); -var proxiedFunctionTable = [ null, _atexit, ___syscall10, ___syscall12, ___syscall183, ___syscall192, ___syscall195, ___syscall196, ___syscall220, ___syscall221, ___syscall3, ___syscall39, ___syscall4, ___syscall40, ___syscall5, ___syscall54, ___syscall85, ___syscall91, _emscripten_set_canvas_element_size_main_thread, _fd_close, _fd_read, _fd_seek, _fd_write, _tzset, _sysconf ]; +var proxiedFunctionTable = [ null, _atexit, ___syscall10, ___syscall12, ___syscall183, ___syscall195, ___syscall196, ___syscall220, ___syscall221, ___syscall3, ___syscall39, ___syscall4, ___syscall40, ___syscall5, ___syscall54, ___syscall85, ___syscall91, _emscripten_set_canvas_element_size_main_thread, _fd_close, _fd_read, _fd_seek, _fd_write, _tzset, _sysconf ]; var ASSERTIONS = true; function intArrayFromString(stringy, dontAddNull, length) { var len = length > 0 ? length : lengthBytesUTF8(stringy) + 1; @@ -7188,24 +7440,57 @@ function intArrayToString(array) { } var asmGlobalArg = {}; var asmLibraryArg = { - "_ZN12CPdfRenderer10SaveToFileERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE": __ZN12CPdfRenderer10SaveToFileERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE, - "_ZN12CPdfRenderer11SetPasswordERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE": __ZN12CPdfRenderer11SetPasswordERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE, - "_ZN12CPdfRenderer13SetDocumentIDERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE": __ZN12CPdfRenderer13SetDocumentIDERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE, - "_ZN12CPdfRenderer13SetTempFolderERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE": __ZN12CPdfRenderer13SetTempFolderERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE, - "_ZN12CPdfRenderer14SetThemesPlaceERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE": __ZN12CPdfRenderer14SetThemesPlaceERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE, - "_ZN12CPdfRenderer15OnlineWordToPdfERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb": __ZN12CPdfRenderer15OnlineWordToPdfERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb, - "_ZN12CPdfRenderer25OnlineWordToPdfFromBinaryERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb": __ZN12CPdfRenderer25OnlineWordToPdfFromBinaryERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_RKb, - "_ZN12CPdfRendererC1EPN7NSFonts17IApplicationFontsEb": __ZN12CPdfRendererC1EPN7NSFonts17IApplicationFontsEb, - "_ZN12CPdfRendererD1Ev": __ZN12CPdfRendererD1Ev, - "_ZN14NSDoctRenderer13CDoctrenderer18GetImagesInChangesEv": __ZN14NSDoctRenderer13CDoctrenderer18GetImagesInChangesEv, - "_ZN14NSDoctRenderer13CDoctrenderer7ExecuteERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERS7_": __ZN14NSDoctRenderer13CDoctrenderer7ExecuteERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERS7_, - "_ZN14NSDoctRenderer13CDoctrendererC1ERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEE": __ZN14NSDoctRenderer13CDoctrendererC1ERKNSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEE, - "_ZN14NSDoctRenderer13CDoctrendererD1Ev": __ZN14NSDoctRenderer13CDoctrendererD1Ev, - "_ZN14NSHtmlRenderer17CASCHTMLRenderer316CreateOfficeFileENSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERKS7_": __ZN14NSHtmlRenderer17CASCHTMLRenderer316CreateOfficeFileENSt3__212basic_stringIwNS1_11char_traitsIwEENS1_9allocatorIwEEEERKS7_, - "_ZN14NSHtmlRenderer17CASCHTMLRenderer39CloseFileEb": __ZN14NSHtmlRenderer17CASCHTMLRenderer39CloseFileEb, - "_ZN14NSHtmlRenderer17CASCHTMLRenderer3C1Ev": __ZN14NSHtmlRenderer17CASCHTMLRenderer3C1Ev, - "_ZN14NSHtmlRenderer17CASCHTMLRenderer3D1Ev": __ZN14NSHtmlRenderer17CASCHTMLRenderer3D1Ev, "_ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb": __ZN23CFileDownloader_privateC1ENSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEEb, + "_ZN2v810Uint8Array3NewENS_5LocalINS_11ArrayBufferEEEmm": __ZN2v810Uint8Array3NewENS_5LocalINS_11ArrayBufferEEEmm, + "_ZN2v811ArrayBuffer11ExternalizeEv": __ZN2v811ArrayBuffer11ExternalizeEv, + "_ZN2v811ArrayBuffer3NewEPNS_7IsolateEPvmNS_23ArrayBufferCreationModeE": __ZN2v811ArrayBuffer3NewEPNS_7IsolateEPvmNS_23ArrayBufferCreationModeE, + "_ZN2v811ArrayBuffer9Allocator19NewDefaultAllocatorEv": __ZN2v811ArrayBuffer9Allocator19NewDefaultAllocatorEv, + "_ZN2v811HandleScope12CreateHandleEPNS_8internal10HeapObjectEPNS1_6ObjectE": __ZN2v811HandleScope12CreateHandleEPNS_8internal10HeapObjectEPNS1_6ObjectE, + "_ZN2v811HandleScopeC1EPNS_7IsolateE": __ZN2v811HandleScopeC1EPNS_7IsolateE, + "_ZN2v811HandleScopeD1Ev": __ZN2v811HandleScopeD1Ev, + "_ZN2v814ObjectTemplate11NewInstanceEv": __ZN2v814ObjectTemplate11NewInstanceEv, + "_ZN2v814ObjectTemplate11SetAccessorENS_5LocalINS_6StringEEEPFvS3_RKNS_20PropertyCallbackInfoINS_5ValueEEEEPFvS3_NS1_IS5_EERKNS4_IvEEESB_NS_13AccessControlENS_17PropertyAttributeENS1_INS_17AccessorSignatureEEE": __ZN2v814ObjectTemplate11SetAccessorENS_5LocalINS_6StringEEEPFvS3_RKNS_20PropertyCallbackInfoINS_5ValueEEEEPFvS3_NS1_IS5_EERKNS4_IvEEESB_NS_13AccessControlENS_17PropertyAttributeENS1_INS_17AccessorSignatureEEE, + "_ZN2v814ObjectTemplate21SetInternalFieldCountEi": __ZN2v814ObjectTemplate21SetInternalFieldCountEi, + "_ZN2v814ObjectTemplate3NewEv": __ZN2v814ObjectTemplate3NewEv, + "_ZN2v814ScriptCompiler10CachedDataC1EPKhiNS1_12BufferPolicyE": __ZN2v814ScriptCompiler10CachedDataC1EPKhiNS1_12BufferPolicyE, + "_ZN2v814ScriptCompiler7CompileENS_5LocalINS_7ContextEEEPNS0_6SourceENS0_14CompileOptionsE": __ZN2v814ScriptCompiler7CompileENS_5LocalINS_7ContextEEEPNS0_6SourceENS0_14CompileOptionsE, + "_ZN2v815ArrayBufferView6BufferEv": __ZN2v815ArrayBufferView6BufferEv, + "_ZN2v816FunctionTemplate3NewEPNS_7IsolateEPFvRKNS_20FunctionCallbackInfoINS_5ValueEEEENS_5LocalIS4_EENSA_INS_9SignatureEEEiNS_19ConstructorBehaviorE": __ZN2v816FunctionTemplate3NewEPNS_7IsolateEPFvRKNS_20FunctionCallbackInfoINS_5ValueEEEENS_5LocalIS4_EENSA_INS_9SignatureEEEiNS_19ConstructorBehaviorE, + "_ZN2v819ResourceConstraintsC1Ev": __ZN2v819ResourceConstraintsC1Ev, + "_ZN2v82V812ToLocalEmptyEv": __ZN2v82V812ToLocalEmptyEv, + "_ZN2v84JSON5ParseENS_5LocalINS_6StringEEE": __ZN2v84JSON5ParseENS_5LocalINS_6StringEEE, + "_ZN2v85Array3NewEPNS_7IsolateEi": __ZN2v85Array3NewEPNS_7IsolateEi, + "_ZN2v86Locker10InitializeEPNS_7IsolateE": __ZN2v86Locker10InitializeEPNS_7IsolateE, + "_ZN2v86LockerD1Ev": __ZN2v86LockerD1Ev, + "_ZN2v86Object16SetInternalFieldEiNS_5LocalINS_5ValueEEE": __ZN2v86Object16SetInternalFieldEiNS_5LocalINS_5ValueEEE, + "_ZN2v86Object20SlowGetInternalFieldEi": __ZN2v86Object20SlowGetInternalFieldEi, + "_ZN2v86Object3GetENS_5LocalINS_5ValueEEE": __ZN2v86Object3GetENS_5LocalINS_5ValueEEE, + "_ZN2v86Object3NewEPNS_7IsolateE": __ZN2v86Object3NewEPNS_7IsolateE, + "_ZN2v86Object3SetENS_5LocalINS_5ValueEEES3_": __ZN2v86Object3SetENS_5LocalINS_5ValueEEES3_, + "_ZN2v86Object3SetEjNS_5LocalINS_5ValueEEE": __ZN2v86Object3SetEjNS_5LocalINS_5ValueEEE, + "_ZN2v86Script3RunEv": __ZN2v86Script3RunEv, + "_ZN2v86Script7CompileENS_5LocalINS_6StringEEEPNS_12ScriptOriginE": __ZN2v86Script7CompileENS_5LocalINS_6StringEEEPNS_12ScriptOriginE, + "_ZN2v86String11NewFromUtf8EPNS_7IsolateEPKcNS0_13NewStringTypeEi": __ZN2v86String11NewFromUtf8EPNS_7IsolateEPKcNS0_13NewStringTypeEi, + "_ZN2v86String5ValueC1ENS_5LocalINS_5ValueEEE": __ZN2v86String5ValueC1ENS_5LocalINS_5ValueEEE, + "_ZN2v86String5ValueD1Ev": __ZN2v86String5ValueD1Ev, + "_ZN2v86String9Utf8ValueC1ENS_5LocalINS_5ValueEEE": __ZN2v86String9Utf8ValueC1ENS_5LocalINS_5ValueEEE, + "_ZN2v86String9Utf8ValueD1Ev": __ZN2v86String9Utf8ValueD1Ev, + "_ZN2v87Context3NewEPNS_7IsolateEPNS_22ExtensionConfigurationENS_10MaybeLocalINS_14ObjectTemplateEEENS5_INS_5ValueEEE": __ZN2v87Context3NewEPNS_7IsolateEPNS_22ExtensionConfigurationENS_10MaybeLocalINS_14ObjectTemplateEEENS5_INS_5ValueEEE, + "_ZN2v87Context4ExitEv": __ZN2v87Context4ExitEv, + "_ZN2v87Context5EnterEv": __ZN2v87Context5EnterEv, + "_ZN2v87Context6GlobalEv": __ZN2v87Context6GlobalEv, + "_ZN2v87Integer3NewEPNS_7IsolateEi": __ZN2v87Integer3NewEPNS_7IsolateEi, + "_ZN2v87Isolate10GetCurrentEv": __ZN2v87Isolate10GetCurrentEv, + "_ZN2v87Isolate17GetCurrentContextEv": __ZN2v87Isolate17GetCurrentContextEv, + "_ZN2v87Isolate3NewERKNS0_12CreateParamsE": __ZN2v87Isolate3NewERKNS0_12CreateParamsE, + "_ZN2v87Isolate4ExitEv": __ZN2v87Isolate4ExitEv, + "_ZN2v87Isolate5EnterEv": __ZN2v87Isolate5EnterEv, + "_ZN2v87Isolate7DisposeEv": __ZN2v87Isolate7DisposeEv, + "_ZN2v88External3NewEPNS_7IsolateEPv": __ZN2v88External3NewEPNS_7IsolateEPv, + "_ZN2v88Function4CallENS_5LocalINS_5ValueEEEiPS3_": __ZN2v88Function4CallENS_5LocalINS_5ValueEEEiPS3_, + "_ZN2v88Template3SetENS_5LocalINS_4NameEEENS1_INS_4DataEEENS_17PropertyAttributeE": __ZN2v88Template3SetENS_5LocalINS_4NameEEENS1_INS_4DataEEENS_17PropertyAttributeE, + "_ZN2v88TryCatchC1Ev": __ZN2v88TryCatchC1Ev, + "_ZN2v88TryCatchD1Ev": __ZN2v88TryCatchD1Ev, "_ZN8CXpsFileC1EPN7NSFonts17IApplicationFontsE": __ZN8CXpsFileC1EPN7NSFonts17IApplicationFontsE, "_ZN9CDjVuFileC1EPN7NSFonts17IApplicationFontsE": __ZN9CDjVuFileC1EPN7NSFonts17IApplicationFontsE, "_ZN9CHtmlFile10ConvertMhtERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_S8_": __ZN9CHtmlFile10ConvertMhtERKNSt3__212basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_S8_, @@ -7213,8 +7498,20 @@ var asmLibraryArg = { "_ZN9CHtmlFile7ConvertERKNSt3__26vectorINS0_12basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEENS5_IS7_EEEERKS7_SD_": __ZN9CHtmlFile7ConvertERKNSt3__26vectorINS0_12basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEENS5_IS7_EEEERKS7_SD_, "_ZN9CHtmlFileC1Ev": __ZN9CHtmlFileC1Ev, "_ZN9CHtmlFileD1Ev": __ZN9CHtmlFileD1Ev, - "_ZN9PdfReader10CPdfReader8GetErrorEv": __ZN9PdfReader10CPdfReader8GetErrorEv, - "_ZN9PdfReader10CPdfReaderC1EPN7NSFonts17IApplicationFontsE": __ZN9PdfReader10CPdfReaderC1EPN7NSFonts17IApplicationFontsE, + "_ZNK2v85Int325ValueEv": __ZNK2v85Int325ValueEv, + "_ZNK2v85Value10IsFunctionEv": __ZNK2v85Value10IsFunctionEv, + "_ZNK2v85Value12BooleanValueEv": __ZNK2v85Value12BooleanValueEv, + "_ZNK2v85Value7ToInt32ENS_5LocalINS_7ContextEEE": __ZNK2v85Value7ToInt32ENS_5LocalINS_7ContextEEE, + "_ZNK2v85Value8ToNumberENS_5LocalINS_7ContextEEE": __ZNK2v85Value8ToNumberENS_5LocalINS_7ContextEEE, + "_ZNK2v85Value8ToObjectENS_5LocalINS_7ContextEEE": __ZNK2v85Value8ToObjectENS_5LocalINS_7ContextEEE, + "_ZNK2v85Value8ToUint32ENS_5LocalINS_7ContextEEE": __ZNK2v85Value8ToUint32ENS_5LocalINS_7ContextEEE, + "_ZNK2v86Number5ValueEv": __ZNK2v86Number5ValueEv, + "_ZNK2v86Uint325ValueEv": __ZNK2v86Uint325ValueEv, + "_ZNK2v87Message13GetSourceLineEv": __ZNK2v87Message13GetSourceLineEv, + "_ZNK2v87Message3GetEv": __ZNK2v87Message3GetEv, + "_ZNK2v88External5ValueEv": __ZNK2v88External5ValueEv, + "_ZNK2v88TryCatch7MessageEv": __ZNK2v88TryCatch7MessageEv, + "_ZNK2v88TryCatch9HasCaughtEv": __ZNK2v88TryCatch9HasCaughtEv, "__assert_fail": ___assert_fail, "__call_main": ___call_main, "__clock_gettime": ___clock_gettime, @@ -7227,7 +7524,6 @@ var asmLibraryArg = { "__syscall10": ___syscall10, "__syscall12": ___syscall12, "__syscall183": ___syscall183, - "__syscall192": ___syscall192, "__syscall195": ___syscall195, "__syscall196": ___syscall196, "__syscall220": ___syscall220, @@ -7300,7 +7596,21 @@ var asmLibraryArg = { "table": wasmTable, "testSetjmp": _testSetjmp, "time": _time, - "times": _times + "times": _times, + "u_strFromWCS_62": _u_strFromWCS_62, + "u_strToWCS_62": _u_strToWCS_62, + "ucnv_close_62": _ucnv_close_62, + "ucnv_fromUnicode_62": _ucnv_fromUnicode_62, + "ucnv_getCCSID_62": _ucnv_getCCSID_62, + "ucnv_getMaxCharSize_62": _ucnv_getMaxCharSize_62, + "ucnv_getMinCharSize_62": _ucnv_getMinCharSize_62, + "ucnv_getName_62": _ucnv_getName_62, + "ucnv_openCCSID_62": _ucnv_openCCSID_62, + "ucnv_open_62": _ucnv_open_62, + "ucnv_toUnicode_62": _ucnv_toUnicode_62, + "usprep_close_62": _usprep_close_62, + "usprep_openByType_62": _usprep_openByType_62, + "usprep_prepare_62": _usprep_prepare_62 }; var asm = createWasm(); var real____wasm_call_ctors = asm["__wasm_call_ctors"]; @@ -7381,12 +7691,6 @@ asm["emscripten_get_global_libc"] = (function() { assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); return real__emscripten_get_global_libc.apply(null, arguments); }); -var real____em_js__initPthreadsJS = asm["__em_js__initPthreadsJS"]; -asm["__em_js__initPthreadsJS"] = (function() { - assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); - assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); - return real____em_js__initPthreadsJS.apply(null, arguments); -}); var real____emscripten_pthread_data_constructor = asm["__emscripten_pthread_data_constructor"]; asm["__emscripten_pthread_data_constructor"] = (function() { assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); @@ -7423,18 +7727,6 @@ asm["memalign"] = (function() { assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); return real__memalign.apply(null, arguments); }); -var real__emscripten_builtin_free = asm["emscripten_builtin_free"]; -asm["emscripten_builtin_free"] = (function() { - assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); - assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); - return real__emscripten_builtin_free.apply(null, arguments); -}); -var real__emscripten_builtin_memalign = asm["emscripten_builtin_memalign"]; -asm["emscripten_builtin_memalign"] = (function() { - assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); - assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); - return real__emscripten_builtin_memalign.apply(null, arguments); -}); var real__emscripten_main_browser_thread_id = asm["emscripten_main_browser_thread_id"]; asm["emscripten_main_browser_thread_id"] = (function() { assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); @@ -7789,6 +8081,78 @@ asm["dynCall_viiiiiii"] = (function() { assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); return real_dynCall_viiiiiii.apply(null, arguments); }); +var real_dynCall_iiiiiiiiiiii = asm["dynCall_iiiiiiiiiiii"]; +asm["dynCall_iiiiiiiiiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_iiiiiiiiiiii.apply(null, arguments); +}); +var real_dynCall_iiiddiiiiiiiiiii = asm["dynCall_iiiddiiiiiiiiiii"]; +asm["dynCall_iiiddiiiiiiiiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_iiiddiiiiiiiiiii.apply(null, arguments); +}); +var real_dynCall_viddii = asm["dynCall_viddii"]; +asm["dynCall_viddii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viddii.apply(null, arguments); +}); +var real_dynCall_viidddddd = asm["dynCall_viidddddd"]; +asm["dynCall_viidddddd"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viidddddd.apply(null, arguments); +}); +var real_dynCall_viid = asm["dynCall_viid"]; +asm["dynCall_viid"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viid.apply(null, arguments); +}); +var real_dynCall_viiiiiiiiiiidd = asm["dynCall_viiiiiiiiiiidd"]; +asm["dynCall_viiiiiiiiiiidd"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viiiiiiiiiiidd.apply(null, arguments); +}); +var real_dynCall_viiiiiiddddddi = asm["dynCall_viiiiiiddddddi"]; +asm["dynCall_viiiiiiddddddi"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viiiiiiddddddi.apply(null, arguments); +}); +var real_dynCall_viiddddddiiii = asm["dynCall_viiddddddiiii"]; +asm["dynCall_viiddddddiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viiddddddiiii.apply(null, arguments); +}); +var real_dynCall_iiiddddiii = asm["dynCall_iiiddddiii"]; +asm["dynCall_iiiddddiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_iiiddddiii.apply(null, arguments); +}); +var real_dynCall_viiiiiiii = asm["dynCall_viiiiiiii"]; +asm["dynCall_viiiiiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viiiiiiii.apply(null, arguments); +}); +var real_dynCall_viiiiiiiiiii = asm["dynCall_viiiiiiiiiii"]; +asm["dynCall_viiiiiiiiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viiiiiiiiiii.apply(null, arguments); +}); +var real_dynCall_viidd = asm["dynCall_viidd"]; +asm["dynCall_viidd"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return real_dynCall_viidd.apply(null, arguments); +}); var real_dynCall_viiiiiiiiiiii = asm["dynCall_viiiiiiiiiiii"]; asm["dynCall_viiiiiiiiiiii"] = (function() { assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); @@ -7825,12 +8189,6 @@ asm["dynCall_viidddd"] = (function() { assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); return real_dynCall_viidddd.apply(null, arguments); }); -var real_dynCall_viidddddd = asm["dynCall_viidddddd"]; -asm["dynCall_viidddddd"] = (function() { - assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); - assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); - return real_dynCall_viidddddd.apply(null, arguments); -}); var real_dynCall_iiiiiddd = asm["dynCall_iiiiiddd"]; asm["dynCall_iiiiiddd"] = (function() { assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); @@ -7975,11 +8333,6 @@ var _emscripten_get_global_libc = Module["_emscripten_get_global_libc"] = (funct assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); return Module["asm"]["emscripten_get_global_libc"].apply(null, arguments); }); -var ___em_js__initPthreadsJS = Module["___em_js__initPthreadsJS"] = (function() { - assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); - assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); - return Module["asm"]["__em_js__initPthreadsJS"].apply(null, arguments); -}); var ___emscripten_pthread_data_constructor = Module["___emscripten_pthread_data_constructor"] = (function() { assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); @@ -8010,16 +8363,6 @@ var _memalign = Module["_memalign"] = (function() { assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); return Module["asm"]["memalign"].apply(null, arguments); }); -var _emscripten_builtin_free = Module["_emscripten_builtin_free"] = (function() { - assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); - assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); - return Module["asm"]["emscripten_builtin_free"].apply(null, arguments); -}); -var _emscripten_builtin_memalign = Module["_emscripten_builtin_memalign"] = (function() { - assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); - assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); - return Module["asm"]["emscripten_builtin_memalign"].apply(null, arguments); -}); var _emscripten_main_browser_thread_id = Module["_emscripten_main_browser_thread_id"] = (function() { assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); @@ -8315,6 +8658,66 @@ var dynCall_viiiiiii = Module["dynCall_viiiiiii"] = (function() { assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); return Module["asm"]["dynCall_viiiiiii"].apply(null, arguments); }); +var dynCall_iiiiiiiiiiii = Module["dynCall_iiiiiiiiiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_iiiiiiiiiiii"].apply(null, arguments); +}); +var dynCall_iiiddiiiiiiiiiii = Module["dynCall_iiiddiiiiiiiiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_iiiddiiiiiiiiiii"].apply(null, arguments); +}); +var dynCall_viddii = Module["dynCall_viddii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viddii"].apply(null, arguments); +}); +var dynCall_viidddddd = Module["dynCall_viidddddd"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viidddddd"].apply(null, arguments); +}); +var dynCall_viid = Module["dynCall_viid"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viid"].apply(null, arguments); +}); +var dynCall_viiiiiiiiiiidd = Module["dynCall_viiiiiiiiiiidd"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viiiiiiiiiiidd"].apply(null, arguments); +}); +var dynCall_viiiiiiddddddi = Module["dynCall_viiiiiiddddddi"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viiiiiiddddddi"].apply(null, arguments); +}); +var dynCall_viiddddddiiii = Module["dynCall_viiddddddiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viiddddddiiii"].apply(null, arguments); +}); +var dynCall_iiiddddiii = Module["dynCall_iiiddddiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_iiiddddiii"].apply(null, arguments); +}); +var dynCall_viiiiiiii = Module["dynCall_viiiiiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viiiiiiii"].apply(null, arguments); +}); +var dynCall_viiiiiiiiiii = Module["dynCall_viiiiiiiiiii"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viiiiiiiiiii"].apply(null, arguments); +}); +var dynCall_viidd = Module["dynCall_viidd"] = (function() { + assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); + assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); + return Module["asm"]["dynCall_viidd"].apply(null, arguments); +}); var dynCall_viiiiiiiiiiii = Module["dynCall_viiiiiiiiiiii"] = (function() { assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); @@ -8345,11 +8748,6 @@ var dynCall_viidddd = Module["dynCall_viidddd"] = (function() { assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); return Module["asm"]["dynCall_viidddd"].apply(null, arguments); }); -var dynCall_viidddddd = Module["dynCall_viidddddd"] = (function() { - assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); - assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); - return Module["asm"]["dynCall_viidddddd"].apply(null, arguments); -}); var dynCall_iiiiiddd = Module["dynCall_iiiiiddd"] = (function() { assert(runtimeInitialized, "you need to wait for the runtime to be ready (e.g. wait for main() to be called)"); assert(!runtimeExited, "the runtime was exited (use NO_EXIT_RUNTIME to keep it alive after main() exits)"); diff --git a/www/common/onlyoffice/x2t/x2t.wasm b/www/common/onlyoffice/x2t/x2t.wasm index 3a35af86a..170e6bbee 100644 Binary files a/www/common/onlyoffice/x2t/x2t.wasm and b/www/common/onlyoffice/x2t/x2t.wasm differ diff --git a/www/common/onlyoffice/x2t/x2t.worker.js b/www/common/onlyoffice/x2t/x2t.worker.js deleted file mode 100644 index 9f738e1d7..000000000 --- a/www/common/onlyoffice/x2t/x2t.worker.js +++ /dev/null @@ -1,226 +0,0 @@ -// Copyright 2015 The Emscripten Authors. All rights reserved. -// Emscripten is available under two separate licenses, the MIT license and the -// University of Illinois/NCSA Open Source License. Both these licenses can be -// found in the LICENSE file. - -// Pthread Web Worker startup routine: -// This is the entry point file that is loaded first by each Web Worker -// that executes pthreads on the Emscripten application. - -// Thread-local: -var threadInfoStruct = 0; // Info area for this thread in Emscripten HEAP (shared). If zero, this worker is not currently hosting an executing pthread. -var selfThreadId = 0; // The ID of this thread. 0 if not hosting a pthread. -var parentThreadId = 0; // The ID of the parent pthread that launched this thread. - -var noExitRuntime; - -// performance.now() is specced to return a wallclock time in msecs since that Web Worker/main thread launched. However for pthreads this can cause -// subtle problems in emscripten_get_now() as this essentially would measure time from pthread_create(), meaning that the clocks between each threads -// would be wildly out of sync. Therefore sync all pthreads to the clock on the main browser thread, so that different threads see a somewhat -// coherent clock across each of them (+/- 0.1msecs in testing) -var __performance_now_clock_drift = 0; - -// Cannot use console.log or console.error in a web worker, since that would risk a browser deadlock! https://bugzilla.mozilla.org/show_bug.cgi?id=1049091 -// Therefore implement custom logging facility for threads running in a worker, which queue the messages to main thread to print. -var Module = {}; - -// These modes need to assign to these variables because of how scoping works in them. - -function assert(condition, text) { - if (!condition) abort('Assertion failed: ' + text); -} - -function threadPrintErr() { - var text = Array.prototype.slice.call(arguments).join(' '); - console.error(text); - console.error(new Error().stack); -} -function threadAlert() { - var text = Array.prototype.slice.call(arguments).join(' '); - postMessage({cmd: 'alert', text: text, threadId: selfThreadId}); -} -var err = threadPrintErr; -this.alert = threadAlert; - -// When using postMessage to send an object, it is processed by the structured clone algorithm. -// The prototype, and hence methods, on that object is then lost. This function adds back the lost prototype. -// This does not work with nested objects that has prototypes, but it suffices for WasmSourceMap and WasmOffsetConverter. -function resetPrototype(constructor, attrs) { - var object = Object.create(constructor.prototype); - for (var key in attrs) { - if (attrs.hasOwnProperty(key)) { - object[key] = attrs[key]; - } - } - return object; -} - -Module['instantiateWasm'] = function(info, receiveInstance) { - // Instantiate from the module posted from the main thread. - // We can just use sync instantiation in the worker. - var instance = new WebAssembly.Instance(Module['wasmModule'], info); - // We don't need the module anymore; new threads will be spawned from the main thread. - Module['wasmModule'] = null; - receiveInstance(instance); // The second 'module' parameter is intentionally null here, we don't need to keep a ref to the Module object from here. - return instance.exports; -}; - - -this.onmessage = function(e) { - try { - if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code. - - // Initialize the global "process"-wide fields: - Module['DYNAMIC_BASE'] = e.data.DYNAMIC_BASE; - Module['DYNAMICTOP_PTR'] = e.data.DYNAMICTOP_PTR; - - // Module and memory were sent from main thread - Module['wasmModule'] = e.data.wasmModule; - Module['wasmMemory'] = e.data.wasmMemory; - Module['buffer'] = Module['wasmMemory'].buffer; - - Module['ENVIRONMENT_IS_PTHREAD'] = true; - - if (typeof e.data.urlOrBlob === 'string') { - importScripts(e.data.urlOrBlob); - } else { - var objectUrl = URL.createObjectURL(e.data.urlOrBlob); - importScripts(objectUrl); - URL.revokeObjectURL(objectUrl); - } - PThread = Module['PThread']; - HEAPU32 = Module['HEAPU32']; - - if (typeof FS !== 'undefined' && typeof FS.createStandardStreams === 'function') FS.createStandardStreams(); - postMessage({ cmd: 'loaded' }); - } else if (e.data.cmd === 'objectTransfer') { - PThread.receiveObjectTransfer(e.data); - } else if (e.data.cmd === 'run') { // This worker was idle, and now should start executing its pthread entry point. - __performance_now_clock_drift = performance.now() - e.data.time; // Sync up to the clock of the main thread. - threadInfoStruct = e.data.threadInfoStruct; - Module['__register_pthread_ptr'](threadInfoStruct, /*isMainBrowserThread=*/0, /*isMainRuntimeThread=*/0); // Pass the thread address inside the asm.js scope to store it for fast access that avoids the need for a FFI out. - selfThreadId = e.data.selfThreadId; - parentThreadId = e.data.parentThreadId; - // Establish the stack frame for this thread in global scope - // The stack grows downwards - var max = e.data.stackBase; - var top = e.data.stackBase + e.data.stackSize; - Module['applyStackValues'](top, top, max); - assert(threadInfoStruct); - assert(selfThreadId); - assert(parentThreadId); - assert(top != 0); - assert(max === e.data.stackBase); - assert(top > max); - // Call inside asm.js/wasm module to set up the stack frame for this pthread in asm.js/wasm module scope - Module['establishStackSpace'](e.data.stackBase, e.data.stackBase + e.data.stackSize); - Module['_emscripten_tls_init'](); - Module['writeStackCookie'](); - - PThread.receiveObjectTransfer(e.data); - PThread.setThreadStatus(Module['_pthread_self'](), 1/*EM_THREAD_STATUS_RUNNING*/); - - try { - // pthread entry points are always of signature 'void *ThreadMain(void *arg)' - // Native codebases sometimes spawn threads with other thread entry point signatures, - // such as void ThreadMain(void *arg), void *ThreadMain(), or void ThreadMain(). - // That is not acceptable per C/C++ specification, but x86 compiler ABI extensions - // enable that to work. If you find the following line to crash, either change the signature - // to "proper" void *ThreadMain(void *arg) form, or try linking with the Emscripten linker - // flag -s EMULATE_FUNCTION_POINTER_CASTS=1 to add in emulation for this x86 ABI extension. - var result = Module['dynCall_ii'](e.data.start_routine, e.data.arg); - - Module['checkStackCookie'](); - - } catch(e) { - if (e === 'Canceled!') { - PThread.threadCancel(); - return; - } else if (e === 'SimulateInfiniteLoop' || e === 'pthread_exit') { - return; - } else { - Atomics.store(HEAPU32, (threadInfoStruct + 4 /*C_STRUCTS.pthread.threadExitCode*/ ) >> 2, (e instanceof Module['ExitStatus']) ? e.status : -2 /*A custom entry specific to Emscripten denoting that the thread crashed.*/); - Atomics.store(HEAPU32, (threadInfoStruct + 0 /*C_STRUCTS.pthread.threadStatus*/ ) >> 2, 1); // Mark the thread as no longer running. - if (typeof(Module['_emscripten_futex_wake']) !== "function") { - err("Thread Initialisation failed."); - throw e; - } - Module['_emscripten_futex_wake'](threadInfoStruct + 0 /*C_STRUCTS.pthread.threadStatus*/, 0x7FFFFFFF/*INT_MAX*/); // Wake all threads waiting on this thread to finish. - if (!(e instanceof Module['ExitStatus'])) throw e; - } - } - // The thread might have finished without calling pthread_exit(). If so, then perform the exit operation ourselves. - // (This is a no-op if explicit pthread_exit() had been called prior.) - if (!noExitRuntime) PThread.threadExit(result); - } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread. - if (threadInfoStruct) { - PThread.threadCancel(); - } - } else if (e.data.target === 'setimmediate') { - // no-op - } else if (e.data.cmd === 'processThreadQueue') { - if (threadInfoStruct) { // If this thread is actually running? - Module['_emscripten_current_thread_process_queued_calls'](); - } - } else { - err('worker.js received unknown command ' + e.data.cmd); - console.error(e.data); - } - } catch(e) { - console.error('worker.js onmessage() captured an uncaught exception: ' + e); - console.error(e.stack); - throw e; - } -}; - -// Node.js support -if (typeof process === 'object' && typeof process.versions === 'object' && typeof process.versions.node === 'string') { - // Create as web-worker-like an environment as we can. - self = { - location: { - href: __filename - } - }; - - var onmessage = this.onmessage; - - var nodeWorkerThreads = require('worker_threads'); - - Worker = nodeWorkerThreads.Worker; - - var parentPort = nodeWorkerThreads.parentPort; - - parentPort.on('message', function(data) { - onmessage({ data: data }); - }); - - var nodeFS = require('fs'); - - var nodeRead = function(filename) { - return nodeFS.readFileSync(filename, 'utf8'); - }; - - function globalEval(x) { - global.require = require; - global.Module = Module; - eval.call(null, x); - } - - importScripts = function(f) { - globalEval(nodeRead(f)); - }; - - postMessage = function(msg) { - parentPort.postMessage(msg); - }; - - if (typeof performance === 'undefined') { - performance = { - now: function() { - return Date.now(); - } - }; - } -} - - diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js index 1745d0dd7..23412bf60 100644 --- a/www/common/outer/async-store.js +++ b/www/common/outer/async-store.js @@ -37,6 +37,9 @@ define([ var onReadyEvt = Util.mkEvent(true); var onCacheReadyEvt = Util.mkEvent(true); + // XXX Number of days before deleting the cache for a channel or blob + var CACHE_MAX_AGE = 90; // DAYS + // Default settings for new users var NEW_USER_SETTINGS = { drive: { @@ -334,7 +337,6 @@ define([ if (!s.rpc) { return void cb({error: 'RPC_NOT_READY'}); } s.rpc.removeOwnedChannel(channel, function (err) { - if (!err) { Cache.clearChannel(channel); } cb({error:err}); }); }; @@ -2861,6 +2863,15 @@ define([ }, PING_INTERVAL); }; + Store.disableCache = function (clientId, disabled, cb) { + if (disabled) { + Cache.disable(); + } else { + Cache.enable(); + } + cb(); + }; + /** * Data: * - userHash or anonHash @@ -2901,6 +2912,11 @@ define([ }); }); } + + if (data.disableCache) { + Cache.disable(); + } + initialized = true; postMessage = function (clientId, cmd, d, cb) { data.query(clientId, cmd, d, cb); @@ -2920,6 +2936,27 @@ define([ callback(ret); }); + + // Clear inactive channels from cache + onReadyEvt.reg(function () { + var inactiveTime = (+new Date()) - CACHE_MAX_AGE * (24 * 3600 * 1000); + Cache.getKeys(function (err, keys) { + if (err) { return void console.error(err); } + var next = function (cb) { + if (!keys.length) { return; } + var key = keys.pop(); + var value = Cache.getTime(key, function (err, atime) { + if (err) { return void next(); } + if (!atime || atime < inactiveTime) { + Cache.clearChannel(key, next()); + return; + } + next(); + }); + }; + next(); + }); + }); }; Store.disconnect = function () { diff --git a/www/common/outer/cache-store.js b/www/common/outer/cache-store.js index a7b1bd3d7..45f334bb4 100644 --- a/www/common/outer/cache-store.js +++ b/www/common/outer/cache-store.js @@ -7,10 +7,14 @@ define([ // Check if indexedDB is allowed var allowed = false; + var disabled = false; + var supported = false; + try { var request = window.indexedDB.open('test_db', 1); request.onsuccess = function () { - allowed = true; + supported = true; + allowed = supported && !disabled; onReady.fire(); }; request.onerror = function () { @@ -20,6 +24,15 @@ define([ onReady.fire(); } + S.enable = function () { + disabled = false; + allowed = supported && !disabled; + }; + S.disable = function () { + disabled = true; + allowed = supported && !disabled; + }; + var cache = localForage.createInstance({ driver: localForage.INDEXEDDB, name: "cp_cache" @@ -141,6 +154,30 @@ define([ }); }; + S.getKeys = function (cb) { + cb = Util.once(Util.mkAsync(cb || function () {})); + onReady.reg(function () { + if (!allowed) { return void cb('NOCACHE'); } + cache.keys().then(function (keys) { + cb(null, keys); + }).catch(function (err) { + cb(err); + }); + }); + }; + S.getTime = function (id, cb) { + cb = Util.once(Util.mkAsync(cb || function () {})); + onReady.reg(function () { + if (!allowed) { return void cb('NOCACHE'); } + cache.getItem(id, function (err, obj) { + if (err || !obj || !obj.c) { + return void cb(Util.serializeError(err || 'EINVAL')); + } + cb(null, obj.t); + }); + }); + }; + self.CryptPad_clearIndexedDB = S.clear; return S; diff --git a/www/common/outer/store-rpc.js b/www/common/outer/store-rpc.js index 767448284..5bae1506f 100644 --- a/www/common/outer/store-rpc.js +++ b/www/common/outer/store-rpc.js @@ -14,6 +14,7 @@ define([ CREATE_README: Store.createReadme, MIGRATE_ANON_DRIVE: Store.migrateAnonDrive, PING: function (cId, data, cb) { cb(); }, + CACHE_DISABLE: Store.disableCache, // RPC UPDATE_PIN_LIMIT: Store.updatePinLimit, GET_PIN_LIMIT: Store.getPinLimit, diff --git a/www/common/outer/worker-channel.js b/www/common/outer/worker-channel.js index a359d8836..06b38a96b 100644 --- a/www/common/outer/worker-channel.js +++ b/www/common/outer/worker-channel.js @@ -76,9 +76,15 @@ define([ }; // Fire an event. channel.event('EV_SOMETHING', { args: "whatever" }); - var event = chan.event = function (e, content) { + var event = chan.event = function (e, content, opts) { + opts = opts || {}; evReady.reg(function () { - postMsg(JSON.stringify({ content: content, q: e })); + var toSend = { + content: content, + q: e, + raw: opts.raw + }; + postMsg(opts.raw ? toSend : JSON.stringify(toSend)); }); }; diff --git a/www/common/pinpad.js b/www/common/pinpad.js index 2841656bc..1e2031088 100644 --- a/www/common/pinpad.js +++ b/www/common/pinpad.js @@ -1,6 +1,6 @@ (function () { var factory = function (Util, Rpc) { - var create = function (network, proxy, _cb) { + var create = function (network, proxy, _cb, Cache) { if (typeof(_cb) !== 'function') { throw new Error("Expected callback"); } var cb = Util.once(Util.mkAsync(_cb)); @@ -155,6 +155,9 @@ var factory = function (Util, Rpc) { if (e) { return void cb(e); } if (response && response.length && response[0] === "OK") { cb(); + if (Cache && Cache.clearChannel) { + Cache.clearChannel(channel); + } } else { cb('INVALID_RESPONSE'); } diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js index 6a0367b69..674a98ae8 100644 --- a/www/common/sframe-common-file.js +++ b/www/common/sframe-common-file.js @@ -319,7 +319,7 @@ define([ style: 'display:flex;align-items:center;justify-content:space-between' }, [ UI.createCheckbox('cp-upload-owned', Messages.upload_modal_owner, modalState.owned), - createHelper('/faq.html#keywords-owned', Messages.creation_owned1) + createHelper('https://docs.cryptpad.fr/en/user_guide/share_and_access.html#owners', Messages.creation_owned1) ]), manualStore ]); @@ -374,7 +374,7 @@ define([ style: 'display:flex;align-items:center;justify-content:space-between' }, [ UI.createCheckbox('cp-upload-owned', Messages.uploadFolder_modal_owner, modalState.owned), - createHelper('/faq.html#keywords-owned', Messages.creation_owned1) + createHelper('https://docs.cryptpad.fr/en/user_guide/share_and_access.html#owners', Messages.creation_owned1) ]), manualStore ]); diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js index 1d5597ab2..70aef650a 100644 --- a/www/common/sframe-common-outer.js +++ b/www/common/sframe-common-outer.js @@ -1476,6 +1476,21 @@ define([ }); }); + sframeChan.on('Q_CACHE_DISABLE', function (data, cb) { + if (data.disabled) { + Utils.Cache.clear(function () { + Utils.Cache.disable(); + }); + Cryptpad.disableCache(true, cb); + return; + } + Utils.Cache.enable(); + Cryptpad.disableCache(false, cb); + }); + sframeChan.on('Q_CLEAR_CACHE', function (data, cb) { + Utils.Cache.clear(cb); + }); + sframeChan.on('Q_PIN_GET_USAGE', function (teamId, cb) { Cryptpad.isOverPinLimit(teamId, function (err, overLimit, data) { cb({ diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js index c60402e7b..9304d9469 100644 --- a/www/common/sframe-common.js +++ b/www/common/sframe-common.js @@ -642,6 +642,9 @@ define([ funcs.gotoURL = function (url) { ctx.sframeChan.event('EV_GOTO_URL', url); }; funcs.openURL = function (url) { ctx.sframeChan.event('EV_OPEN_URL', url); }; + funcs.getBounceURL = function (url) { + return window.location.origin + '/bounce/#' + encodeURIComponent(url); + }; funcs.openUnsafeURL = function (url) { var app = ctx.metadataMgr.getPrivateData().app; if (app === "sheet") { @@ -755,7 +758,7 @@ define([ window.cryptpadStore._put(k, v, cb); var x = {}; x[k] = v; - ctx.sframeChan.event('EV_LOCALSTORE_PUT', x); + ctx.sframeChan.event('EV_LOCALSTORE_PUT', x, {raw:true}); }; }); diff --git a/www/common/toolbar.js b/www/common/toolbar.js index 6dcb44024..138cc5590 100644 --- a/www/common/toolbar.js +++ b/www/common/toolbar.js @@ -838,7 +838,7 @@ MessengerUI, Messages) { /*.append($('', { //src: '/customize/images/logo_white.png?' + ApiConfig.requireConf.urlArgs - src: '/customize/main-favicon.png?' + ApiConfig.requireConf.urlArgs + src: '/customize/favicon/main-favicon.png?' + ApiConfig.requireConf.urlArgs }));*/ var onClick = function (e) { e.preventDefault(); diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index 6ee050cc8..92e693efb 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1506,5 +1506,6 @@ "admin_support_normal": "Unbeantwortete Tickets:", "admin_support_premium": "Premium-Tickets:", "access_offline": "Du bist offline. Verwaltung von Zugriffsrechten ist nicht verfügbar.", - "share_noContactsOffline": "Du bist offline. Kontakte sind nicht verfügbar." + "share_noContactsOffline": "Du bist offline. Kontakte sind nicht verfügbar.", + "offlineError": "OFFLINE-MODUS NICHT VERFÜGBAR" } diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index aeca9722f..dc93709fb 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1507,5 +1507,5 @@ "admin_support_answered": "Tickets traité :", "admin_support_normal": "Tickets sans réponse :", "admin_support_premium": "Tickets prime :", - "offlineError": "MODE HORS LIGNE NON DISPONIBLE" + "offlineError": "Impossible de synchroniser les données les plus récentes, cette page ne peut pas être affichée pour le moment. Le chargement continuera au retour de votre connexion au service." } diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 3e94aab03..48601972f 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1507,5 +1507,5 @@ "admin_support_last": "Updated on: ", "access_offline": "You are currently offline. Access management is not available.", "share_noContactsOffline": "You are currently offline. Contacts are not available.", - "offlineError": "OFFLINE MODE NOT AVAILABLE" + "offlineError": "Unable to synchronize the most recent data, this page cannot be displayed at this time. Loading will continue when your connection to the service is restored." } diff --git a/www/contacts/app-contacts.less b/www/contacts/app-contacts.less index 99b927b6c..ba45c962c 100644 --- a/www/contacts/app-contacts.less +++ b/www/contacts/app-contacts.less @@ -5,9 +5,7 @@ // body &.cp-app-contacts { .framework_min_main( - @bg-color: @colortheme_friends-bg, - @warn-color: @colortheme_friends-warn, - @color: @colortheme_friends-color + @bg-color: @colortheme_static_apps[contacts] ); display: flex; diff --git a/www/drive/app-drive.less b/www/drive/app-drive.less index 2cf445524..21ecb6b89 100644 --- a/www/drive/app-drive.less +++ b/www/drive/app-drive.less @@ -2,11 +2,7 @@ @import (reference) '../../customize/src/less2/include/drive.less'; &.cp-app-drive { - .framework_min_main( - @bg-color: @colortheme_drive-bg, - @warn-color: @colortheme_drive-warn, - @color: @colortheme_drive-color - ); + .framework_min_main(); .drive_main(); } diff --git a/www/file/app-file.less b/www/file/app-file.less index be7e067f1..1226ded8d 100644 --- a/www/file/app-file.less +++ b/www/file/app-file.less @@ -5,9 +5,7 @@ &.cp-app-file { .framework_min_main( - @bg-color: @colortheme_file-bg, - @warn-color: @colortheme_file-warn, - @color: @colortheme_file-color + @bg-color: @colortheme_apps[file], ); .tokenfield_main(); diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index a4c7ad743..524d414b4 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -7,9 +7,7 @@ // body &.cp-app-kanban { .framework_main( - @bg-color: @colortheme_kanban-bg, - @warn-color: @colortheme_kanban-warn, - @color: @colortheme_kanban-color + @bg-color: @colortheme_apps[kanban], ); display: flex; diff --git a/www/login/index.html b/www/login/index.html index 31d4c99f8..f1cf1b429 100644 --- a/www/login/index.html +++ b/www/login/index.html @@ -2,10 +2,10 @@ - CryptPad: Zero Knowledge, Collaborative Real Time Editing + CryptPad: Collaboration suite, encrypted and open-source - + diff --git a/www/logout/index.html b/www/logout/index.html index 365c4bbe2..6d72fb30b 100644 --- a/www/logout/index.html +++ b/www/logout/index.html @@ -2,11 +2,11 @@ - CryptPad: Zero Knowledge, Collaborative Real Time Editing + CryptPad: Collaboration suite, encrypted and open-source - +