diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml new file mode 100644 index 000000000..ad6203270 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -0,0 +1,53 @@ +name: 🛠æäº¤ Bug +description: 请æäº¤ä½ çš„ Bug +body: + - type: markdown + attributes: + value: | + 谢谢帮忙æäº¤ Bug 这会让简悦å˜å¾—更好。 + - type: textarea + id: what-happened + attributes: + label: æè¿°è¿™ä¸ªé”™è¯¯ + description: 请尽é‡è¯¦ç»†æè¿°ä½ çš„错误 + validations: + required: true + - type: textarea + id: repro-steps + attributes: + label: å¤çŽ°æ­¥éª¤ + description: 请尽é‡ç”¨æ¸…晰的步骤(哪怕比较多)的æè¿°ä½ çš„问题,最好å¯ä»¥çš„è¯ï¼Œè¯·æˆªå›¾æˆ–者视频说明。 + placeholder: | + 1. 步骤1 + 2. 步骤2 + 3. 步骤3 + validations: + required: true + - type: textarea + id: others + attributes: + label: 其他相关说明 + description: 如果有需è¦ï¼Œå¯ä»¥åœ¨è¿™é‡Œç»§ç»­è¯´æ˜Ž + validations: + required: false + - type: input + id: os + attributes: + label: æ“作系统 + placeholder: macOS + validations: + required: true + - type: input + id: browser + attributes: + label: æµè§ˆå™¨ + placeholder: 请说明æµè§ˆå™¨ä»¥åŠå°½é‡è¯´æ˜Žæµè§ˆå™¨ç‰ˆæœ¬ + validations: + required: true + - type: input + id: website + attributes: + label: å‘ç”Ÿé—®é¢˜çš„ç½‘å€ + placeholder: 如果任æ„网站å‡å¯çš„è¯ï¼Œè¯·éšä¾¿ç•™ä¸‹ä¸€ä¸ªä½ é‡åˆ°é—®é¢˜çš„åœ°å€ + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..62f9bcd32 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,68 @@ +blank_issues_enabled: false +contact_links: + - name: 🆘 当å‡çº§ Chrome åŽæ— æ³•使用简悦的解决方案 + url: https://www.yuque.com/kenshin/simpread/fxszlhpp1iht441s + about: | + 当 Chrome 应用商店æç¤ºã€æ­¤æ‰©å±•ç¨‹åºæœªéµå¾ª Chrome 扩展程åºçš„æœ€ä½³å®žè·µï¼Œå› æ­¤å·²æ— æ³•å†ä½¿ç”¨ã€‘的解决方案 + - name: 📮 订阅中心 + url: https://simpread.pro/subscribe + about: | + 我æ¯å‘¨éƒ½ä¼šæŽ¨ 3 ~ 4 篇关于简悦的新功能ã€è”动等内容,建议简悦用户(尤其是ç»å¸¸ä½¿ç”¨ç®€æ‚¦é«˜çº§åŠŸèƒ½çš„ç”¨æˆ·ï¼‰è®¢é˜…ã€å‘布汇总】。 + - name: 📚 简悦手册 + url: https://www.yuque.com/kenshin/simpread/ + about: | + 简悦的阅读模å¼ç›¸å…³åŠŸèƒ½æ˜¯ä¸éœ€è¦è®¾ç½®çš„。 + å¦‚æžœä½ ä½¿ç”¨äº†æ›´é«˜çº§çš„åŠŸèƒ½ï¼Œå¦‚ï¼šåŒæ­¥åŠ©æ‰‹ï¼Œæˆ–è€…ä½ æ˜¯ Obsidian / Logseq ç­‰åŒé“¾ç¬”记用户,或者你本地快照等功能的è¯ï¼Œåˆ™éœ€è¦é…置。 + 简悦官方已ç»å‡†å¤‡å¥½äº†ç›¸å…³çš„æ•™ç¨‹ã€‚ + - name: 📦 é…置库(强烈建议åŒé“¾ç¬”记用户使用此方å¼ï¼‰ + url: https://www.yuque.com/kenshin/simpread/ds8zk0 + about: | + 这是简悦官方推出的å…é…置包方案,包括:Notion / Obsidian / Logseq 等用法。 + - name: 📗 Notion é…置库 + url: https://www.yuque.com/kenshin/simpread/mwda8s + about: | + 通过简悦导入到 Notion 的内容包括:Notion 图床ã€é¢˜å›¾ã€Faviconã€æ ‡ç­¾ç­‰è¯¸å¤šåŠŸèƒ½ã€‚ + - name: 📘 Obsidian é…置库 + url: https://www.yuque.com/kenshin/simpread/psugef + about: | + 简悦与 Obsidian çš„è”动å¯ä»¥å°†ç®€æ‚¦çš„æ ‡æ³¨ç³»ç»Ÿå†…置到 Obsidian 中。 + - name: 🖥 如何é…ç½®åŒæ­¥åŠ©æ‰‹ + url: https://www.yuque.com/kenshin/simpread/pwpnsx + about: | + åŒæ­¥åŠ©æ‰‹ç›¸å½“äºŽä¸€ä¸ªåŸºäºŽç”¨æˆ·ç³»ç»Ÿçš„æœåŠ¡å™¨ï¼Œå¯ä»¥å®žçŽ°è¯¸å¤šé«˜çº§åŠŸèƒ½ï¼ˆå¦‚æžœä½ åªæ˜¯é˜…读模å¼ç”¨æˆ·ï¼Œä¸éœ€è¦è¿™äº›ï¼‰ + - name: 💾 如何é…置本地快照系统 + url: https://www.yuque.com/kenshin/simpread/wkswh7 + about: | + ç®€æ‚¦æœ€å¤§çš„ä¼˜åŠ¿åœ¨äºŽï¼šç”¨æˆ·æ‹¥æœ‰å…¨éƒ¨çš„æ•°æ®æ‰€æœ‰æƒï¼Œåªéœ€è¦ç®€å•的几步就能实现一个基于本地的快照系统。 + - name: 📓 ä¸€ç«™å¼æ•™ç¨‹ + url: https://www.yuque.com/kenshin/simpread/pn4bbg + about: | + 如果ä¸éœ€è¦é…置库方案的è¯ï¼Œä¹Ÿå¯ä»¥ç›´æŽ¥æŸ¥çœ‹ Notion / Obsidian / Logseq çš„ä¸€ç«™å¼æ•™ç¨‹ï¼Œé€‚åˆå–œæ¬¢æ›´çµæ´»æ–¹æ¡ˆçš„用户。 + - name: 👤 高级账户相关功能 + url: https://www.yuque.com/kenshin/simpread/xs0gp0 + about: | + 这是简悦的高级账户相关æ“作,基本上你出现的问题大部分都å¯ä»¥é€šè¿‡æ­¤æ–¹å¼è§£å†³ã€‚ + - name: 🔒 首次绑定高级账户ä»å‡ºçŽ°å¸¦ðŸ”’çš„é—®é¢˜ + url: https://www.yuque.com/kenshin/simpread/xs0gp0 + about: | + 首次å‡çº§ä¸ºé«˜çº§è´¦æˆ·åŽï¼Œè¯·é‡å¯æµè§ˆå™¨ï¼Œå¦‚果没有é‡å¯çš„è¯ï¼Œè¯·ä½¿ç”¨æ­¤é“¾æŽ¥è§£å†³ã€‚ + - name: 1ï¸âƒ£ 如何找回丢失的 UID (高级账户资格) + url: https://www.yuque.com/kenshin/simpread/bvcunx + about: | + 如果ä¸å°å¿ƒä¸¢å¤±äº† UID 请通过此教程找回。 + - name: 2ï¸âƒ£ 找回 UID åŽå¦‚何æ¢å¤é«˜çº§è´¦æˆ·èµ„æ ¼ + url: https://www.yuque.com/kenshin/simpread/pkq3d1 + about: | + 找回 UID åŽå¯ä½¿ç”¨æ­¤æ•™ç¨‹æ¢å¤ä½ çš„高级账户资格。 + - name: 3ï¸âƒ£ 在哪里å¯ä»¥é‡æ–°æ‰¾åˆ° License(兑æ¢ç ï¼‰ + url: https://www.yuque.com/kenshin/simpread/hgvw56 + about: | + 找回 UID å‰éœ€è¦çŸ¥é“ä½ çš„ License,一般æ¥è¯´å½“å‡çº§é«˜çº§è´¦æˆ·åŽä¼šè‡ªåŠ¨ä¸‹è½½å«æœ‰é«˜çº§è´¦æˆ· UID 与 License 到本地。 + - name: 📗 Notion 相关问题 + url: https://www.yuque.com/kenshin/simpread/wwk65u + about: | + 如:无法授æƒåˆ° Notion,使用导入到 Notion 辅助增强æ’件失败等常规性问题。 + - name: 🆘 无法打开简悦的选项页或ç¨åŽè¯» + url: https://www.yuque.com/kenshin/simpread/lwuterg3u83sq0b2 + about: | + 如:一般æ¥è¯´åªæœ‰ä½¿ç”¨äº†åŒæ­¥åŠ©æ‰‹åŽæ‰ä¼šé‡åˆ°æ­¤ç±»é—®é¢˜ï¼Œå¯é€šè¿‡æ­¤é“¾æŽ¥è§£å†³ã€‚ diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 000000000..0b9f04e6e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,19 @@ +name: ✨ 功能建议或改善 +description: 你的建议会让简悦å˜å¾—更好 +body: + - type: markdown + attributes: + value: | + ä½ çš„æ¯ä¸ªæƒ³æ³•都是对简悦最大的支æŒï¼Œç®€æ‚¦ 60% 的功能都æ¥è‡ªç”¨æˆ·çš„简悦。 + - type: textarea + id: feature + attributes: + label: 请æè¿°ä½ çš„建议或任何内容 + description: 如有å¯èƒ½è¯·è¯¦ç»†è¯´æ˜Žå®ƒ + validations: + required: true + - type: textarea + id: context + attributes: + label: 补充说明 + description: 如有å¯èƒ½è¯·è¯´æ˜Žä¸‹è¿™ä¸ªå»ºè®®å…·ä½“使用场景(或如果有这个功能åŽï¼Œä¼šæ”¹å–„你的什么æµç¨‹ï¼Ÿ diff --git a/.github/ISSUE_TEMPLATE/new_site.yml b/.github/ISSUE_TEMPLATE/new_site.yml new file mode 100644 index 000000000..700ab7bc4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/new_site.yml @@ -0,0 +1,22 @@ +name: 🔗 æ–°ç«™é€‚é… +description: æäº¤éœ€è¦é€‚é…的站点 +labels: ["new site"] +body: + - type: markdown + attributes: + value: | + 大部分网页都å¯ä»¥æ­£å¸¸ä½¿ç”¨ç®€æ‚¦çš„阅读模å¼ï¼Œç®€æ‚¦å®˜æ–¹æ”¶å½•的新站具有大众类型的网站。 + - type: textarea + id: website + attributes: + label: 需è¦é€‚é…的新站 + placeholder: 请输入这个站点的 URL,如果这个站的规则比较多,请多帮忙æä¾›ä¸€äº› URL 作为å‚考 + validations: + required: true + - type: textarea + id: what-happened + attributes: + label: 有需è¦è¯·æè¿°è¿™ä¸ªç«™çš„æ€§è´¨ + description: 尤其是英文类型的网站,我需è¦åˆ¤æ–­è¿™ä¸ªç«™æ˜¯å¦å…·æœ‰é€‚é…的必è¦ã€‚ + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/yinxiang_code.yml b/.github/ISSUE_TEMPLATE/yinxiang_code.yml new file mode 100644 index 000000000..7aa5ec668 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/yinxiang_code.yml @@ -0,0 +1,22 @@ +name: 🚑 å°è±¡ç¬”记或代ç é«˜äº®é—®é¢˜ +description: 关于å°è±¡ç¬”记或代ç é«˜äº®çš„集中åé¦ˆæ¸ é“ +body: + - type: markdown + attributes: + value: | + 谢谢帮忙æäº¤ Bug 这会让简悦å˜å¾—更好。 + - type: dropdown + id: browsers + attributes: + label: 请选择 + multiple: false + options: + - å°è±¡ç¬”è®° + - 代ç é«˜äº® + - type: input + id: website + attributes: + label: å‘ç”Ÿé—®é¢˜çš„ç½‘å€ + placeholder: 如果任æ„网站å‡å¯çš„è¯ï¼Œè¯·éšä¾¿ç•™ä¸‹ä¸€ä¸ªä½ é‡åˆ°é—®é¢˜çš„åœ°å€ + validations: + required: true diff --git a/LICENSE b/LICENSE index 3b3e49cb8..a662e6ee5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License - -Copyright (c) 2016 kenshin - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {simpread} Copyright (C) {2017~2020} {Wang lei} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/README.md b/README.md index f27abb71d..c44a0078b 100644 --- a/README.md +++ b/README.md @@ -1,194 +1,297 @@

-

简悦 - SimpRead

+

简悦1.0 - SimpRead

让你瞬间进入沉浸å¼é˜…读的扩展,还原阅读的本质,æå‡ä½ çš„阅读体验。

为了达到完美的阅读模å¼è¿™ä¸ªå°ç›®æ ‡ ,我适é…了 数百ç§ç±»åž‹ 的网站,因此诞生了简悦。

- + +

- - - - + + +

+

简悦2.0 - 真正æˆä¸ºä½ çš„生产力工具

+

é˜…è¯»æ¨¡å¼ + å‰ªè— + 标注 + ç¨åŽè¯» = åšä½ çš„知识管ç†ç²˜åˆå‰‚

*** -#### 马上使用: -* [Chrome 应用商店](https://chrome.google.com/webstore/detail/%E7%AE%80%E6%82%A6-simpread/ijllcpnolfcooahcekpamkbidhejabll) 或者 [离线下载](http://ksria.com/simpread/crx/1.1.2/simpread.crx) -* [Firefox 扩展中心](https://addons.mozilla.org/zh-CN/firefox/addon/simpread) +## 目录 + +* [下载](#马上使用) + +* [入门指å—](#入门指å—) + +* [主è¦åŠŸèƒ½ä¸€è§ˆ](#主è¦åŠŸèƒ½ä¸€è§ˆ) + +* [全部功能](#全部功能) + +* [如何使用](#如何使用) + +* [简悦å„å¹³å°ç‰ˆæœ¬ä¹‹é—´çš„差异](#简悦å„å¹³å°ç‰ˆæœ¬ä¹‹é—´çš„差异) + +* [截图](#截图) + +* [投票](#投票) + +* [相关链接](#相关链接) + +* [贡献者](#感谢) + +* [å作开å‘](#å作开å‘) + +* [å¼€æºåˆ—表](#简悦的诞生离ä¸å¼€å®ƒä»¬) + +* [许å¯](#许å¯) + +*** + +## 马上使用 +* [Chrome 应用商店](https://chrome.google.com/webstore/detail/%E7%AE%80%E6%82%A6-simpread/ijllcpnolfcooahcekpamkbidhejabll) 或者 [离线下载](http://ksria.com/simpread/crx/2.0.0/simpread.crx) + * [æ”¯æŒ UserScript çš„æµè§ˆå™¨](https://greasyfork.org/zh-CN/scripts/39998) 如:Apple Safari · Microsoft Edge · Opera · Dolphin 详细 [请看这里](https://github.com/Kenshin/simpread-little) -* [iOS( iPhone / iPad )版](https://xteko.com/redir?url=http://sr.ksria.cn/jsbox/simpread-1.0.0.box?201805251238&name=%E7%AE%80%E6%82%A6) 详细 [请看这里](http://ksria.com/simpread/docs/#/JSBox) -* 现在就加入 [Telegram 群](https://t.me/simpread),获å–简悦的第一手资料。 -* ä¸åŒç®€æ‚¦å¦‚何使用?想知é“简悦的高级功能,请看简悦的 [帮助中心](http://ksria.com/simpread/docs/#) 。 +* [iPhone / iPad 版](https://xteko.com/redir?url=http://sr.ksria.cn/jsbox/simpread-1.0.0.box?201805251238&name=%E7%AE%80%E6%82%A6) 详细 [请看这里](http://ksria.com/simpread/docs/#/JSBox) -#### 主è¦åŠŸèƒ½ä¸€è§ˆï¼š -- [èšç„¦æ¨¡å¼](http://ksria.com/simpread/docs/#/èšç„¦æ¨¡å¼): - 䏿”¹å˜å½“å‰é¡µé¢çš„结构,仅仅高亮需è¦é˜…读的部分,ä¸åˆ†æ•£ç”¨æˆ·çš„æ³¨æ„åŠ›ï¼›é€‚åˆ `临时阅读` 或者 `未适é…阅读模å¼` 的网站 +* [Android 版](http://ksria.com/simpread/docs/#/Android) 详细 [请看这里](http://ksria.com/simpread/docs/#/Android) -- [阅读模å¼](http://ksria.com/simpread/docs/#/阅读模å¼): - 简悦 `原创` 功能,é€ä¸€é€‚é…了 [数百ç§ç±»åž‹](https://simpread.ksria.cn/sites/) 的网站,自动æå– `标题` `æè¿°` `正文` `媒体资æºï¼ˆ 图片/ 视频 )` ç­‰ï¼Œç”Ÿæˆ `符åˆä¸­æ–‡é˜…读` çš„é¡µé¢ +## å…¥é—¨æŒ‡å— - * æ”¯æŒ `自动生æˆç›®å½•` [TXT 阅读器](http://ksria.com/simpread/docs/#/TXT-阅读器) [论å›ç±»é¡µé¢åŠåˆ†é¡µ](http://ksria.com/simpread/docs/#/论å›ç±»é¡µé¢åŠåˆ†é¡µ) 如:知乎 · 百度贴å§ç­‰ +* 喜欢简悦,但ä¸ä¼šç”¨ï¼Œå¯¹æ–°æ‰‹æžåº¦èˆ’适的 [新手入门](http://ksria.com/simpread/guide) - * æ›´ç¬¦åˆ `中文阅读` 习惯的设置,包括:`å­—é—´è·` `行间è·` ç­‰ ä»¥åŠ `自定义 CSS` ,详细请看 [自定义样å¼](http://ksria.com/simpread/docs/#/自定义样å¼) +* å‚与讨论请加入 [Telegram 群](https://t.me/simpread) + +* 想知é“简悦的高级玩法,请看简悦的 [文档中心](http://ksria.com/simpread/docs/#) [知识库](https://github.com/Kenshin/simpread/discussions/categories/æœåŠ¡) 与 [帮助中心](https://simpread.pro/help) -- 临时阅读模å¼ï¼š - å°† `éžé€‚é…阅读模å¼çš„页é¢` ç”Ÿæˆ `阅读模å¼` 一样的排版,支æŒä»»æ„页é¢ï¼Œè¯¦ç»†è¯·çœ‹ [临时阅读模å¼](http://ksria.com/simpread/docs/#/临时阅读模å¼) ä»¥åŠ [æ“作](http://ksria.com/simpread/welcome/version_1.0.5.html#temp-read-mode) +* 更多è”系方å¼è¯·çœ‹ [相关链接](#相关链接) -- 主动适é…: - 通过简å•的一个步骤,就å¯ä»¥è®© `éžé€‚é…页é¢` 支æŒé˜…读模å¼ï¼Œè¯¦ç»†è¯·çœ‹ [主动适é…](http://ksria.com/simpread/docs/#/主动适é…阅读模å¼) ä»¥åŠ [æ“作](http://ksria.com/simpread/welcome/version_1.0.5.html#mate-read-mode) +## 主è¦åŠŸèƒ½ä¸€è§ˆ -- 智能适é…: - 自动识别出 Wordpress · Hexo · Ghost · Discuz ç­‰åšå®¢ / 论å›çš„页é¢ä»¥åŠåªè¦æ˜¯ç»“构良好的页é¢ï¼Œï¼ˆæ— éœ€é€‚é…)自动生æˆé˜…读模å¼ï¼Œè¯¦ç»†è¯·çœ‹ [智能适é…](http://ksria.com/simpread/docs/#/æ™ºèƒ½é€‚é…æ¨¡å¼) +#### é˜…è¯»æ¨¡å¼ -- ç«™ç‚¹é€‚é…æºï¼š - 包括:`å®˜æ–¹ï¼ˆä¸»ï¼‰é€‚é…æº` `ç¬¬ä¸‰æ–¹é€‚é…æº` `ç«™ç‚¹é›†å¸‚é€‚é…æº` `è‡ªå®šä¹‰é€‚é…æº`,详细请看 [ç«™ç‚¹é€‚é…æº](http://ksria.com/simpread/docs/#/ç«™ç‚¹é€‚é…æº) +- [èšç„¦æ¨¡å¼](http://ksria.com/simpread/docs/#/èšç„¦æ¨¡å¼) -- 站点编辑器: - 页é¢ä»»æ„元素,å‡å¯éšè—,`å¯ç¼–程,定制化`,详细请看 [站点编辑器](http://ksria.com/simpread/docs/#/站点编辑器) + > 䏿”¹å˜å½“å‰é¡µé¢çš„结构,仅仅高亮需è¦é˜…读的部分,ä¸åˆ†æ•£ç”¨æˆ·çš„æ³¨æ„åŠ›ï¼›é€‚åˆ `临时阅读` 或者 `未适é…阅读模å¼` 的网站 -- 站点管ç†å™¨ï¼š - å¯ç®¡ç†å…¨éƒ¨çš„适é…站点,详细请看 [站点管ç†å™¨](http://ksria.com/simpread/docs/#/站点管ç†å™¨) +- [阅读模å¼](http://ksria.com/simpread/docs/#/阅读模å¼) ![important](https://s1.ax1x.com/2020/07/25/UzKr8O.png) -- ![new纯色.png](https://i.loli.net/2018/09/05/5b8f718046acb.png) 站点集市: - 上传并共享自己的适é…站点,一键分享临时阅读模å¼ï¼Œé€‚é…失败的站一键æäº¤ï¼Œè¯¦ç»†è¯·çœ‹ [站点集市](https://simpread.ksria.cn/sites) + > 简悦 **原创** 功能,é€ä¸€é€‚é…了 [数百ç§ç±»åž‹](https://simpread.ksria.cn/sites/) 的网站,自动æå– `标题` `æè¿°` `正文` `媒体资æºï¼ˆ 图片/ 视频 )` ç­‰ï¼Œç”Ÿæˆ `符åˆä¸­æ–‡é˜…读` çš„é¡µé¢ -- ![new纯色.png](https://i.loli.net/2018/09/05/5b8f718046acb.png) æ’件系统: - 现在开始å¯ä»¥ä½¿ç”¨ JavaScript 编写基于 `简悦` çš„æ’件了,更上线了 [æ’件中心](https://simpread.ksria.cn/plugins/) ,如何编写æ’件请看 → [说明文档](http://ksria.com/simpread/docs/#/æ’件系统) + * æ”¯æŒ [自动生æˆç›®å½•](http://ksria.com/simpread/docs/#/目录) -- 多ç§ä¸»é¢˜ï¼š - `白练ã€ç™½ç£ã€å¯ä¹‹èŠ±è‰²ã€ä¸å­è‰²ã€å¨Ÿé¼ ã€æœˆç™½ã€ç™¾åˆã€ç´ºé¼ ã€é»’鸢` ç­‰ + * æ”¯æŒ [论å›ç±»é¡µé¢åŠåˆ†é¡µ](http://ksria.com/simpread/docs/#/论å›ç±»é¡µé¢åŠåˆ†é¡µ) 如:知乎 · 百度贴å§ç­‰ -- 丰富的导出功能,包括: + * æ”¯æŒ [ä»£ç æ®µçš„高亮](https://github.com/Kenshin/simpread/issues/500),包å«äº†å¤§éƒ¨åˆ†å¸¸è§çš„网站 - - 导出 [Markdown](https://github.com/Kenshin/simpread#感谢) · `HTML` · `PNG` · `PDF` · [epub](http://ksria.com/simpread/docs/#/å‘é€åˆ°-Epub) + * æ”¯æŒ **本地 HTML** · [TXT 阅读器](http://ksria.com/simpread/docs/#/TXT-阅读器) · æ”¯æŒ [LaTeX è§£æž](http://ksria.com/simpread/docs/#/LaTeX-阅读器) · [Markdown 阅读器](http://ksria.com/simpread/docs/#/Markdown-阅读器) + + * 适é…了一些 [常è§çš„科研期刊类网站](https://github.com/Kenshin/simpread/discussions/2103) + + * æ›´ç¬¦åˆ `中文阅读` 习惯的设置,包括:`å­—é—´è·` `行间è·` ç­‰ ä»¥åŠ `自定义 CSS` ,详细请看 [自定义样å¼](http://ksria.com/simpread/docs/#/自定义样å¼) + +- [手动模å¼](http://ksria.com/simpread/docs/#/手动框选) + + > 将页é¢å†…容内容å‡å¯ç”Ÿæˆ èšç„¦æ¨¡å¼ or é˜…è¯»æ¨¡å¼ + +#### 丰富的导出功能 ![important](https://s1.ax1x.com/2020/07/25/UzKr8O.png) + + > 借助于简悦的阅读模å¼ä¼˜åŒ–æ•´ç†ï¼Œå¯¼å…¥åˆ°å„ç§ç”Ÿäº§åŠ›çš„å·¥å…·çš„ä¼šæ¯”å…¶åŽŸç”Ÿå‰ªè¾‘å·¥å…· **更具有优势**,关于这部份内容 [请看这里](http://ksria.com/simpread/docs/#/æœåŠ¡) 。 + + - 导出 `Markdown` · `HTML` · `PNG` · [PDF](http://ksria.com/simpread/docs/#/å‘é€åˆ°-Epub) · [Epub](http://ksria.com/simpread/docs/#/å‘é€åˆ°-Epub) · [离线 HTML](http://ksria.com/simpread/docs/#/离线HTML) · `å¤åˆ¶ Markdown 到剪切æ¿` · [Textbundle](http://ksria.com/simpread/docs/#/Textbundle) · [Markdeep](http://ksria.com/simpread/docs/#/定制化导出?id=markdeep) 甚至 [ä»»æ„æ ¼å¼å‡å¯å¯¼å‡º](http://ksria.com/simpread/docs/#/定制化导出?id=自定义导出) - å‘é€é˜…读模å¼ä¼˜åŒ–åŽçš„页é¢åˆ° `Kindle`,详细é…ç½® [请看这里](http://ksria.com/simpread/docs/#/å‘é€åˆ°-Kindle) - - 导出到 `Pocket` `Linnk` `Instapaper` 的功能,包括:`当å‰é¡µé¢çš„链接` `ç¨åŽè¯»` + - 导出到 `Pocket` · `Instapaper` 的功能,包括:`当å‰é¡µé¢çš„链接` + + - 导出到生产力工具,包括:`语雀` · [åšæžœäº‘](http://ksria.com/simpread/docs/#/åšæžœäº‘) · flomo · [有é“云笔记](http://ksria.com/simpread/docs/#/有é“云笔记) · [专注笔记](http://ksria.com/simpread/docs/#/专注笔记) · [为知笔记](http://ksria.com/simpread/docs/#/为知笔记) · [Joplin](http://ksria.com/simpread/docs/#/Joplin) · `Dropbox` · [Github](http://ksria.com/simpread/docs/#/Github) · [Notion](http://ksria.com/simpread/docs/#/Notion) · `Onenote` · `Google Drive` · `å°è±¡ç¬”è®° / Evernote`,详细请看 [导出到生产力](http://ksria.com/simpread/docs/#/导出到生产力工具) + + - 定制化导出,å¯ä»¥æ–¹ä¾¿å¯¼å…¥åˆ° Obsidian · Roam Research · Logseq ç­‰åŒé“¾ç¬”记,更多说明åŠç”¨æ³• [请看这里](https://github.com/Kenshin/simpread/discussions/2085)。 + + - æ”¯æŒ [Webhooks](http://ksria.com/simpread/docs/#/%E5%AE%9A%E5%88%B6%E5%8C%96%E5%AF%BC%E5%87%BA?id=webhook) + + - 将多ç§ç¬¦åˆæ•´åˆåœ¨ä¸€èµ·çš„ [自动化方案](http://ksria.com/simpread/docs/#/自动化),å¯ä»¥ç†è§£ä¸º **简悦的 IFTTT**。 + +#### 标注系统 ![new](https://s1.ax1x.com/2020/07/25/UzKubn.png) ![important](https://s1.ax1x.com/2020/07/25/UzKr8O.png) + +> **[标注系统](http://ksria.com/simpread/docs/#/标注)** 是简悦 2.0 最é‡è¦çš„一个功能,借用此功能,å¯ä»¥è®©ç®€æ‚¦çœŸæ­£ä½ çš„æˆä¸ºç”Ÿäº§åŠ›å·¥å…·ã€‚ + + + +> 在 1.0.0 版上线之åˆå°±å·²ç»æž„æƒ³äº†æ­¤åŠŸèƒ½ï¼Œæ‰€ä»¥åœ¨æž„ç­‘æ­¤åŠŸèƒ½æ—¶ï¼ŒåŠ å…¥äº†å¾ˆå¤šåªæœ‰ **简悦 · 标注** æ‰å…·æœ‰çš„功能。 + +- äº”ç§æ ‡æ³¨é¢œè‰² + +- å››ç§æ ‡æ³¨æ ·å¼ + +- 自动识别 **文字** · **图片** · **ä»£ç æ®µ** - - 导出到生产力工具,包括:`Dropbox` `Onenote` `Google Drive` `å°è±¡ç¬”è®° / Evernote`,详细请看 [æŽˆæƒæœåŠ¡](http://ksria.com/simpread/docs/#/æŽˆæƒæœåŠ¡) +- **æ— é™å±‚级** 的标签系统 -- åŒæ­¥ · 上传/下载 é…ç½® · åŒæ­¥é€‚é…列表 · [å¿«æ·é”®æ”¯æŒ](http://ksria.com/simpread/docs/#/å¿«æ·é”®) 等; +- æ¯ä¸ªæ ‡ç­¾å‡æ”¯æŒå¤‡æ³¨ä¸Žæ ‡ç­¾ç³»ç»Ÿ -- 高级定制,包括:`å³é”®èœå•` `控制æ å¯éšè—` `阅读进度å¯éšè—` `自动进入阅读模å¼` [白åå•](http://ksria.com/simpread/docs/#/FAQ?id=白åå•) ä»¥åŠ [排除列表](http://ksria.com/simpread/docs/#/FAQ?id=排除列表) ç­‰ +- 结åˆç®€æ‚¦å¼ºå¤§çš„å‘é€åˆ°ç”Ÿäº§åŠ›å·¥å…·çš„åŠŸèƒ½ï¼Œå¯å°†å½“剿 ‡æ³¨å‘é€åˆ°ç®€æ‚¦æ”¯æŒçš„å„ç§ç”Ÿäº§åЛ工具 -- ç¨åŽè¯»ï¼› +- 连续标注 -#### 截图: +- [浮动标注æ ](http://ksria.com/simpread/docs/#/标注?id=浮动工具æ ) + +- [标注侧æ ](http://ksria.com/simpread/docs/#/标注?id=标注侧æ ) + +> 如何使用以åŠè¯¦ç»†å†…容 [请看这里](http://ksria.com/simpread/docs/#/标注) + +#### ç¨åŽè¯» ![new](https://s1.ax1x.com/2020/07/25/UzKubn.png) ![important](https://s1.ax1x.com/2020/07/25/UzKr8O.png) + +> 简悦 2.0 å¯ç”¨äº†å…¨æ–°çš„ **[ç¨åŽè¯» 2.0](http://ksria.com/simpread/docs/#/ç¨åŽè¯»)**, 相比较之å‰çš„版本,此版本的ç¨åŽè¯»ç®—åšæ˜¯ä¸€ä¸ªçœŸæ­£æ„义的ç¨åŽè¯»ã€‚ + + + +> 简悦的ç¨åŽè¯»å€Ÿé‰´äº† ZK 笔记法的一些特点,专门针对信æ¯çš„æ•´åˆå¢žåŠ äº†å¦‚ä¸‹ä¸€äº›æ–°åŠŸèƒ½ï¼š + +- [**åŒå‘链接**](http://ksria.com/simpread/docs/#/åŒå‘链接) +- [**知识图谱**](http://ksria.com/simpread/docs/#/åŒå‘链接?id=图谱) +- [**Mindmap**](http://ksria.com/simpread/docs/#/ç¨åŽè¯»?id=Mindmap) +- **多ç§ä¿¡æ¯å±•示方å¼ï¼ˆå¸ƒå±€ï¼‰**:[Evergreen](http://ksria.com/simpread/docs/#/ç¨åŽè¯»-多ç§å¸ƒå±€?id=Evergreen) · [Workflowy](http://ksria.com/simpread/docs/#/ç¨åŽè¯»-多ç§å¸ƒå±€?id=Workflowy) · [Kanban](http://ksria.com/simpread/docs/#/ç¨åŽè¯»-多ç§å¸ƒå±€?id=Kanban) +- [**è¯»å–æœ¬åœ° HTML**](https://github.com/Kenshin/simpread/discussions/2146) + +![知识图谱](https://z3.ax1x.com/2021/05/16/ggmmSf.gif) + +![Evergree Notes](https://z3.ax1x.com/2021/05/17/g2IHyQ.gif) + +#### åŒæ­¥åŠ©æ‰‹ ![new](https://s1.ax1x.com/2020/07/25/UzKubn.png) ![important](https://s1.ax1x.com/2020/07/25/UzKr8O.png) + +![](https://z3.ax1x.com/2021/05/19/g4vN9S.png) + +> [简悦 · åŒæ­¥åŠ©æ‰‹](http://ksria.com/simpread/docs/#/Sync) 是 **éšç€ç®€æ‚¦ 2.1.0 å‘布的一个全新的 Desktop App**,用于对简悦已知功能的补充,以åŠä¼š **æŒç»­æä¾›æ›´å¤š** çš„å¯çŽ©æ€§ï¼ŒåŒ…æ‹¬ï¼š + +1. **[è‡ªåŠ¨åŒæ­¥](http://ksria.com/simpread/docs/#/è‡ªåŠ¨åŒæ­¥)** +2. **å°ä¹¦ç­¾** +3. 导出到文件 **本地的任æ„ä½ç½®** +4. **原生 PDF · Epub** 导出 +5. **直接å‘é€åˆ°ä½ çš„ Kindle** +6. å†…ç½®è§£æž +7. **邮件å‘é€** + +åŒæ­¥åŠ©æ‰‹çš„ Logo 自于社区用户 [Shawn](https://shawnan.design/) 的设计。 + +#### æ’件系统 ![important](https://s1.ax1x.com/2020/07/25/UzKr8O.png) + + > 使用 JavaScript 编写基于 `简悦` çš„æ’件了,请看 [æ’件中心](https://simpread.ksria.cn/plugins/) + +## 全部功能 + +
+ +
+ +## 截图 ![简å•阅读,愉悦心情ï¼](http://sr.ksria.cn/welcome-readme-1.png) -![多ç§å¯¼å‡ºæ–¹å¼](http://sr.ksria.cn/welcome-readme-3.png) -![定制化,å¯ç¼–程](http://sr.ksria.cn/welcome-readme-4.png) -#### 照片集: -> 包å«äº† `ç¨åŽè¯»` `é˜…è¯»æ¨¡å¼ Â· 设置界é¢` `导出到生产力工具` `å‘é€åˆ° Kindle` `自定义样å¼` `åŒæ­¥é…ç½®` `论å›ç±»é¡µé¢ · 分页` 等功能的截图(动图) +
更多截图 + + + -* + + + + + + + -#### 全部功能: -![功能一览](http://sr.ksria.cn/feature%201.1.2.png) + + + + +
-#### 如何使用(阅读模å¼ï¼‰ï¼š +## 如何使用 -`简悦`会自动检测当å‰é¡µé¢æ˜¯å¦å·²ç»é€‚é…,如适é…则在æµè§ˆå™¨å³ä¸Šè§’显示 ![Imgur](http://i.imgur.com/dyROEBi.png) ï¼Œä½¿ç”¨ä»¥ä¸‹ä¸‰ç§æ–¹å¼å¯åŠ¨ï¼š +> ç®€æ‚¦è™½ç„¶æ‹¥æœ‰ä¼—å¤šåŠŸèƒ½ï¼Œä½†å®ƒæ”¯æŒ **开箱å³ç”¨**ï¼Œæ–°æ‰‹ï¼ˆä¸æƒ³æŠ˜è…¾å…šï¼‰æ¥è¯´ï¼Œåªéœ€è¦çœ‹æ‡‚下é¢ä¸¤ç§æ“作å³å¯ã€‚ + +### é˜…è¯»æ¨¡å¼ + +> `简悦`会自动检测当å‰é¡µé¢æ˜¯å¦å·²ç»é€‚é…,如适é…则在æµè§ˆå™¨å³ä¸Šè§’显示 ![Imgur](http://i.imgur.com/dyROEBi.png) ï¼Œä½¿ç”¨ä»¥ä¸‹ä¸‰ç§æ–¹å¼å¯åŠ¨ï¼š - 点击æµè§ˆå™¨å³ä¸Šè§’ `红色icon`ï¼› - å³é”®é€‰æ‹© `简悦 - SimpRead` → `阅读模å¼`ï¼› -- å¿«æ·é”®ï¼›ï¼ˆé»˜è®¤ä¸º åŒå‡» A ) +- å¿«æ·é”®ï¼›_默认为 åŒå‡» A_ + +- 简悦支æŒè‡ªåŠ¨è¿›å…¥é˜…è¯»æ¨¡å¼ï¼Œè¯¦ç»†è¯·çœ‹ [自动进入阅读模å¼](http://ksria.com/simpread/docs/#/自动进入阅读模å¼) +### èšç„¦æ¨¡å¼ -#### 如何使用(èšç„¦æ¨¡å¼ï¼‰ï¼š -`èšç„¦æ¨¡å¼` 会自动获å–当å‰é¼ æ ‡æ‰€åœ¨çš„æ®µè½å¹¶é«˜äº®ï¼Œé€‚åˆä»»æ„页é¢ã€‚ +> `èšç„¦æ¨¡å¼` 会自动获å–当å‰é¼ æ ‡æ‰€åœ¨çš„æ®µè½å¹¶é«˜äº®ï¼Œé€‚åˆä»»æ„页é¢ã€‚ - 在需è¦é«˜äº®çš„区域,å³é”®é€‰æ‹© `简悦 - SimpRead` → `èšç„¦æ¨¡å¼`ï¼› -- å¿«æ·é”®ï¼›ï¼ˆé»˜è®¤ä¸º A S ) +- å¿«æ·é”®ï¼›_默认为 A S_ -#### æäº¤æ–°ç«™ï¼š +### æ ‡æ³¨æ¨¡å¼ -* æ–¹å¼1:通过 **æäº¤åˆ° 站点集市** 的方å¼ï¼Œè¯¦ç»†è¯·çœ‹ [站点管ç†å™¨ · 上传](http://ksria.com/simpread/docs/#/站点管ç†å™¨?id=上传) +> 通过鼠标按下 → 移动 的方å¼å°†ä¼šäº§ç”Ÿä¸€ä¸ªæ ‡æ³¨ï¼Œæ›´å¤šç»†èŠ‚ [请看这里](http://ksria.com/simpread/docs/#/标注?id=如何使用) -* æ–¹å¼2:通过 **æäº¤ issues** 的方å¼ï¼ˆä¸è¦ä½¿ç”¨ `pr` æ–¹å¼ï¼‰ï¼Œè¯·æäº¤ç½‘å€ [到这里](https://github.com/kenshin/simpread/labels/new%20site)ï¼› - > 当适é…完æˆåŽå…³é—­æ­¤ `issues`,之åŽé€šè¿‡ `简悦` → `选项` → `æ‰‹åŠ¨åŒæ­¥é€‚é…列表` æ›´æ–°ï¼› +### ç¨åŽè¯» -* æ–¹å¼3:通过 **新增站点编辑器** 的方å¼ï¼ˆé€‚åˆé€ä¸€æ·»åŠ å•个新站),详细说明 [请看这里](http://ksria.com/simpread/docs/#/站点编辑器?id=如何新增修改)ï¼› +> 在任æ„界é¢å¯ä»¥ä½¿ç”¨ **标注模å¼äº§ç”Ÿä¸€æ¡æ ‡æ³¨** 或 **å¿«æ·é”®** æ–¹å¼å°†å½“å‰é¡µé¢åŠ å…¥ï¼Œæ›´å¤šç»†èŠ‚ [请看这里](http://ksria.com/simpread/docs/#/ç¨åŽè¯») -* æ–¹å¼4:通过 **æäº¤é€‚é…æº** 的方å¼ï¼ˆé€‚åˆåŒæ—¶æ·»åŠ å¤šä¸ªæ–°ç«™ï¼‰ï¼Œè¯¦ç»†è¯´æ˜Žè¯·çœ‹ [ä½¿ç”¨è‡ªå®šä¹‰é€‚é…æº](http://ksria.com/simpread/docs/#/ç«™ç‚¹é€‚é…æº?id=如何æäº¤åˆ°ç®€æ‚¦çš„å®˜æ–¹ï¼ˆæ¬¡ï¼‰é€‚é…æº) +- å¿«æ·é”®ï¼›_默认为 D D_ -* 更多说明请看 [站点编辑器](http://ksria.com/simpread/docs/#/站点编辑器) [站点管ç†](http://ksria.com/simpread/docs/#/站点管ç†å™¨) [ç«™ç‚¹é€‚é…æº](http://ksria.com/simpread/docs/#/ç«™ç‚¹é€‚é…æº)ï¼› +## 简悦å„å¹³å°ç‰ˆæœ¬ä¹‹é—´çš„差异 -#### Chrome / Firefox / 轻阅版(UserScript)功能差别: -![Chrome / Firefox / 轻阅版(UserScript)功能差别](https://i.imgur.com/z4WI7uK.png) +> 包括:Chrome / Firefox / 轻阅版(UserScript)/ JSBox ,请访问 [简悦 · 新闻页](https://www.notion.so/9c109ec145134297ab461f5b52dbadc7?v=ce94e37d8a794cfbbd39bf9dfaf9017a) -#### 投票: +## 投票 简悦是一个å…费并开æºçš„项目。如果觉得ä¸é”™ï¼Œè¯·ç»™æˆ‘ [投票](https://chrome.google.com/webstore/detail/%E7%AE%80%E6%82%A6-simpread/ijllcpnolfcooahcekpamkbidhejabll/reviews) 。这样让更多人了解并å—用与 `简悦` 带æ¥çš„ä¾¿åˆ©ï¼Œä½ çš„è®¤å¯æ˜¯å¯¹æˆ‘最大的鼓励。 -#### 相关链接: +## 相关链接 * [更新日志](http://ksria.com/simpread/changelog.html) + * [帮助中心](http://ksria.com/simpread/docs/#) -* [新手入门](http://ksria.com/simpread/docs/#/入门指å—(-æ“作指引-)) + +* [新手入门](http://ksria.com/simpread/guide) + * [常è§é—®é¢˜](http://ksria.com/simpread/docs/#/FAQ) + * [å馈](https://github.com/kenshin/simpread/issues) + * [è”ç³»](http://kenshin.wang) · [邮件](kenshin@ksria.com) · [å¾®åš](http://weibo.com/23784148) · [Telegram 群](https://t.me/simpread) -* 想了解简悦背åŽçš„æ•…事? [猛击这里](https://sspai.com/post/39491) - -#### 感谢: -- [ksky521](https://github.com/ksky521) æä¾› `minimatch` å’Œ `markdown转æ¢åŠŸèƒ½` ,解决了 [Fix 11](https://github.com/kenshin/simpread/issues/11),详细请看 Pull requests [#16](https://github.com/kenshin/simpread/pull/16)ï¼› -- [airycanon](https://github.com/airycanon) Pull requests 详细请看 [#23](https://github.com/kenshin/simpread/pull/23) [#44](https://github.com/kenshin/simpread/pull/44) [#124](https://github.com/kenshin/simpread/pull/124)ï¼› -- [mikelei8291](https://github.com/mikelei8291) 详细请看 Pull requests [#114](https://github.com/kenshin/simpread/pull/114)ï¼› - -#### 简悦的诞生离ä¸å¼€å®ƒä»¬ï¼š -- [Node.js](https://nodejs.org/) · [NPM](https://www.npmjs.com) -- [Webpack](https://webpack.github.io/) -- [React](https://facebook.github.io/react) -- [ES6](http://es6-features.org/) · [Babel](https://babeljs.io) -- [PostCSS](http://postcss.org/) · [cssnext](http://cssnext.io/) -- [jQuery](https://jquery.com/) · [Mousetrap](https://craig.is/killing/mice) · [pangu.js](https://github.com/vinta/pangu.js) · [ProgressBar.js](https://kimmobrunfeldt.github.io/progressbar.js/) · [timego.js](http://timeago.org/) · [Velocity.js](http://velocityjs.org/) · [minimatch](https://github.com/isaacs/minimatch) · [to-markdown](https://github.com/domchristie/to-markdown) · [FileSaver.js](https://github.com/eligrey/FileSaver.js) · [dom-to-image](https://github.com/tsayen/dom-to-image) -- [Visual Studio Code](https://code.visualstudio.com/) -- [Sketch](https://www.sketchapp.com/) · [Pixelmator](http://www.pixelmator.com/) -- Icon from -- Mockup Design usage -- Material Design usage -- Mind Maps -- å’–å•¡ · ç½‘æ˜“éŸ³ä¹ Â· Google Chrome · rMBP - -#### å作开å‘: -- Pull requests æ–¹å¼ï¼š - * 请从 `develop` 分支开始;( 注æ„ï¼šéž develop 分支的 pr å°†ä¸ä¼šåˆå¹¶ï¼›ï¼‰ - * Pull requests - * 如果需è¦åˆå¹¶çš„è¯ï¼Œåˆå¹¶åŽæˆ‘会通知你;(在下个版本å‘布时一起å‘布) - -- æºä»£ç ç¼–译: - * git clone https://github.com/Kenshin/simpread.git - * cd simpread - * npm install - * npm run develop ( for Mac ) ç”¨äºŽå¼€å‘ - * npm run publish ( for Mac ) 用于å‘布 - * npmw run develop ( for Win ) ç”¨äºŽå¼€å‘ - * npmw run publish ( for Win ) 用于å‘布 - -#### 请æ¯å’–啡: -如果简悦å¯ä»¥è§£å†³ä½ åœ¨é˜…读上痛点,æå‡ Web 端的阅读体验,å¯ä»¥è¯·æˆ‘å–æ¯å’–啡,想必也是éžå¸¸æ„‰æ‚¦çš„事情。 :smile: -_如å‘现下图显示ä¸å…¨ï¼Œè¯·ç›´æŽ¥è®¿é—® http://sr.ksria.cn/zhifu_m2.png_ -![支付](http://sr.ksria.cn/zhifu_m2.png) - -#### 许å¯ï¼š + +## 感谢 + +[ksky521](https://github.com/ksky521) · [airycanon](https://github.com/airycanon) · [mikelei8291](https://github.com/mikelei8291) · [chenhbc](https://github.com/chenhbc) · [Nihility](https://github.com/NihilityT) · [WangLeto](https://github.com/WangLeto) · [SevenSteven](https://github.com/Seven-Steven) · [Leo](https://github.com/clinyong) · [Jonas · Gao](https://github.com/JonasGao) · [Cologler](https://github.com/Cologler) · [bgh](https://github.com/bldght) · [Ronglong Pu](https://github.com/PuRonglong) · [zqjimlove](https://github.com/zqjimlove) · [javalover123](https://github.com/javalover123) · [1095533987](https://github.com/1095533987) + +## åä½œå¼€å‘ + +> Pull requests æ–¹å¼ï¼š + +* 请务必从 **develop** 分支开始;( **注æ„ï¼šéž develop 分支的 pr å°†ä¸ä¼šè¢«åˆå¹¶** ) + +* Pull requests + +* 如果需è¦åˆå¹¶çš„è¯ï¼Œåˆå¹¶åŽæˆ‘会通知你;(在下个版本å‘布时一起å‘布) + +## 简悦的诞生离ä¸å¼€å®ƒä»¬ + + +## è®¸å¯ + +> 简悦 1.x(截至到 1.1.4.6205)是开æºç‰ˆæœ¬ï¼Œ2.x 为闭æºç‰ˆæœ¬ï¼Œä¸”ä»…é—­æºäº† **标注** 与 **ç¨åŽè¯»** 相关功能。 + [![license-badge]][license-link] [www-badge]: https://img.shields.io/badge/website-_simpread.ksria.com-1DBA90.svg [www-link]: http://ksria.com/simpread -[version-badge]: https://img.shields.io/badge/lastest_version-1.1.2-blue.svg +[version-badge]: https://img.shields.io/badge/lastest_version-2.0.0-blue.svg [version-link]: https://github.com/kenshin/simpread/releases [chrome-badge]: https://img.shields.io/badge/download-_chrome_webstore-brightgreen.svg [chrome-link]: https://chrome.google.com/webstore/detail/%E7%AE%80%E6%82%A6-simpread/ijllcpnolfcooahcekpamkbidhejabll [offline-badge]: https://img.shields.io/badge/download-_crx-brightgreen.svg -[offline-link]: http://ksria.com/simpread/crx/1.1.2/simpread.crx -[license-badge]: https://img.shields.io/github/license/mashape/apistatus.svg -[license-link]: https://opensource.org/licenses/MIT +[offline-link]: http://ksria.com/simpread/crx/2.0.0/simpread.crx +[license-badge]: https://img.shields.io/badge/license-GPL-blue +[license-link]: https://opensource.org/licenses/gpl-license diff --git a/package.json b/package.json index 7e0fda073..d83cd6f28 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "node": ">= 0.10.0" }, "scripts": { - "develop": "cross-env NODE_ENV=development webpack --devtool=source-map --progress --colors --watch", + "develop": "cross-env NODE_ENV=development webpack --devtool=eval-source-map --progress --colors --watch", "publish": "cross-env NODE_ENV=production webpack -p --progress --colors", "ext_dev": "cross-env NODE_ENV=development webpack --devtool=source-map --progress --colors --watch --config webpack.config.ext.js", "ext_pub": "cross-env NODE_ENV=production webpack -p --progress --color --config webpack.config.ext.js", diff --git a/src/assets/css/option.css b/src/assets/css/option.css deleted file mode 100644 index ff47ba824..000000000 --- a/src/assets/css/option.css +++ /dev/null @@ -1,153 +0,0 @@ - -/** - * Option: Focus/Read mode - */ -sr-opt-focus, -sr-opt-read { - display: -webkit-flex; - flex-direction:column; - - width: 100%; - /*height: 100%;*/ -} - -sr-opt-gp { - display: -webkit-flex; - position: relative; - - flex-flow:row nowrap; - justify-content:flex-start; - - width: 100%; - margin-bottom: 25px; - - font-size: 15px; -} - -sr-opt-gp sr-opt-label { - display: block; - position: absolute; - - margin: -8px 0 0 0; - - font-size: 14px; - font-weight: bold; - - color: rgba(0, 137, 123, .8); - - user-select: none; - pointer-events: none; - - transform: scale(0.75) translate( 0px, -8px ); - transform-origin: left top 0px; -} - -sr-opt-themes { - display: -webkit-flex; - flex-flow:row nowrap; - justify-content:space-between; - - width: 100%; - /*height: 100%;*/ - - margin: 8px 0 17px; - padding: 0; -} - -sr-opt-theme { - width: 40px; - height: 20px; - - cursor: pointer; - list-style: none; - - border-radius: 3px; - border: 1px solid #212121; - box-sizing: border-box; - - opacity: 1; - transition: all 500ms opacity 1s cubic-bezier(0.23, 1, 0.32, 1) 0ms; -} - -sr-opt-theme:hover { - opacity: .2; - box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),0 1px 5px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.2); -} - -sr-opt-theme:not(:first-child) { - margin-left: 5px; -} - -sr-opt-theme[sr-type="active"] { - box-shadow: 0 3px 3px 0 rgba(0,0,0,0.14),0 2px 20px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.7); -} - -/* -opacity { - margin: 8px 0 0 0; - - width: 100%; - height: 37px; -} - -opacity input[type=range] { - width: 100%; - - margin: 6px 0; - padding: 0; - - border: none; - background-color: transparent; - -webkit-appearance: none; -} - -opacity input[type=range]:focus { - outline: none; -} - -opacity input[type=range]::-webkit-slider-runnable-track { - width: 100%; - height: 1px; - - background: #9e9e9e; - - box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.5), 0px 0px 0px rgba(13, 13, 13, 0.5); - border-radius: 1.3px; - - transition: all 0.3s; - cursor: pointer; -} - -opacity input[type=range]::-webkit-slider-runnable-track:hover { - background: #00897B; -} - -opacity input[type=range]::-webkit-slider-thumb { - height: 20px; - width: 20px; - - margin-top: -9px; - - background: rgba(0, 137, 123, 1); - - box-shadow: 1px 1px 1px rgba(0, 0, 0, 0), 0px 0px 1px rgba(13, 13, 13, 0); - border: 1px solid rgba(0, 0, 0, 0); - border-radius: 50px; - - cursor: pointer; - -webkit-appearance: none; - transition: all .5s ease-in-out .1s; -} - -opacity input[type=range]:focus::-webkit-slider-thumb { - background: #00897B; -} - -opacity input[type=range]:focus::-webkit-slider-thumb:hover { - background: #00695C; -} - -opacity input[type=range]:focus::-webkit-slider-runnable-track { - background: #00897B; -} -*/ \ No newline at end of file diff --git a/src/assets/css/options_notice.css b/src/assets/css/options_notice.css new file mode 100644 index 000000000..4ab511288 --- /dev/null +++ b/src/assets/css/options_notice.css @@ -0,0 +1,208 @@ +.header { + background-color: #16666f; + opacity: 1; + visibility: visible; +} + +.notice { + margin-top: 65px; + width: 100%; +} + +.notice notice { + display: flex; + flex-direction: row; + + width: 100%; +} + +notice .loading, +notice .failed { + position: fixed; + + top: 0; + left: 0; + + display: flex; + justify-content: center; + align-items: center; + + width: 100%; + height: 100%; + + background-color: #fff; +} + +notice .loading svg { + transform: scale(.8); +} + +notice .failed { + flex-direction: column; +} + +notice .failed span { + color: #9b9b9b; + font-size: 2.5rem; +} + +notice .list { + margin: 20px 20px 0; + width: 300px; + min-height: 589px; +} + +notice .list.controlbar { + min-height: initial; +} + +notice .detail { + display: flex; + justify-content: center; + + margin: 20px 20px 0 0; + padding: 39px 24px 0px; + + width: 100%; + background-color: #fff; + border-radius: 2px; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); +} + +notice .detail img { + width: 60%; +} + +notice .detail .empty { + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; + + padding-bottom: 39px; + min-height: 550px; + + color: #9b9b9b; + font-size: 2.6rem; + font-weight: 400; +} + +notice .detail .empty .icon { + width: 80px; + height: 80px; + background-position: center; + background-repeat: no-repeat; + background-image: url( data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAHdElNRQfhBA0LLBOn/NkLAAABtklEQVRYw+2YPyxDURTGf5WOGCwiETH7s4kaDJo2FokYMBglZ66lOtGEqWIQm9zdoJouGERIEwNlE4NE4i0iBoO0CxIMvW1f26evvJY86Tfdc3LP99137vvuTa6HqlAwzxI9X064ISrxagweE5mfOXp18CHjoCDJFHbYlBCAOiywGWzLSYmAauUIn6koI+2g/Bzb0gMMyDWoZ9pNuTQByUKLbkSyhD6PyZroYcwiN0xSoQUYJGhZ+FKjwKtlNsggeAEIFJIbnJqm7BKpSeAIgHkdjbKgRwGucgIdOrEuYXOdXKo1Fm3pF+QOQBI6Tqg3wnleb8nUVHmtRNQBQueX5AZbclmRTVFYqBcbSKpS9jtocVLcFGgK/I6AhQ/UEPHCsf09GMyU287KaBc/Xm4vF+YbBv5oDzYd8FXUWrRIQoQa+wV1hfsFmj6whTt9IPvFRv3L39Q51AR7AKzKctMHtnCnD2wE6oAbpgF4bJCA3HKbH7vcaCsSdf9ZVCrQVyfW/uIwtwdZHcXUEzuSccKt2pglpoOsfkpQPs4a0p8ROc+1KI3RAHqDdPExpIv78nPQId7plgf4BCjPbVayklPeAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTA0LTEzVDExOjQ0OjE5KzA4OjAwPYuVdQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0wNC0xM1QxMTo0NDoxOSswODowMEzWLckAAAAASUVORK5CYII= ); +} + +notice .detail .preview { + width: 100%; +} + +notice .detail .preview .title { + margin-bottom: 20px; + + font-family: PingFang SC,Hiragino Sans GB,Microsoft Yahei,WenQuanYi Micro Hei,sans-serif; + font-size: 3.4rem; + font-weight: 400; + line-height: 1.2; + + overflow: hidden; + text-overflow: ellipsis; + text-rendering: optimizelegibility; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; +} + +notice .detail .preview .desc { + margin-bottom: 20px; + padding-bottom: 20px; + + border-bottom: 1px solid #E0E0E0; +} + +notice .detail .preview blockquote { + border-left: 5px solid rgb(122, 122, 122); + color: rgb(85, 85, 85); + margin: 0; + padding: 0 0 0 10px; +} + +notice .detail .preview pre { + white-space: pre-wrap; + word-wrap: break-word; +} + +notice .list { + background-color: #fff; + border-radius: 2px; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); +} + +notice list { + display: flex!important; + flex-direction: column; + + padding: 16px; + min-height: 72px; + + border-bottom: 1px solid #E0E0E0; + transition : all 1s cubic-bezier(0.23, 1, 0.32, 1) 0ms; +} + +notice list:hover { + background-color: #f5f5f5; + transition : all 1s cubic-bezier(0.23, 1, 0.32, 1) 0ms; +} + +notice list:hover .meta { + opacity: 1; +} + +notice list.active { + opacity: .5; +} + +notice list.selected { + background-color: #e1f5fe; + border-left: 4px solid #29b6f6; +} + +notice list.active .title { + text-decoration: line-through; +} + +notice list .title { + margin-bottom: 4px; + padding-right: 25px; + + font-size: 1.5rem; + font-weight: 500; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + +notice list .category, +notice .detail .preview .category { + margin-right: 4px; + padding: 2px 7px; + padding: 2px 4px; + + color: #fff; + + font-weight: 400; + font-size: 0.8rem; + border-radius: 2px; +} + +notice list .meta { + position: absolute; + right: 0; + opacity: 0; + transition : all 1s cubic-bezier(0.23, 1, 0.32, 1) 0ms; +} + +notice .date { + color: #9e9e9e; +} \ No newline at end of file diff --git a/src/assets/css/options_page.css b/src/assets/css/options_page.css index 8fca02ce9..c4d2d1246 100644 --- a/src/assets/css/options_page.css +++ b/src/assets/css/options_page.css @@ -1,3 +1,6 @@ +/** + * Options page style + */ :root { --text-color: #333; @@ -34,6 +37,68 @@ a { text-decoration: none; } +input, textarea { + font-family: Raleway, Menlo, "Dank Mono", Inconsolata, "Operator Mono", Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", "Courier New", Courier, monospace!important; +} + +.loadingbar { + position: fixed; + top: 0; + left: 0; + + display: flex; + justify-content: center; + align-items: center; + + height: 100%; + width: 100%; + + background-color: #fafafa; + + z-index: 200; +} + +.animated { + animation-duration: 1s; + animation-fill-mode: both; + animation-iteration-count: infinite; +} + +.heartBeat { + animation-name: heartBeat; + animation-duration: 1.3s; + animation-timing-function: ease-in-out; +} + +@keyframes heartBeat { + 0% { + transform: scale(1); + } + + 14% { + transform: scale(1.3); + } + + 28% { + transform: scale(1); + } + + 42% { + transform: scale(1.3); + } + + 70% { + transform: scale(1); + } +} + +.topnav { + position: fixed; + z-index: 200; + left: 12px; + top: 12px; +} + .header { display: flex; align-items: center; @@ -137,6 +202,9 @@ a { color: var(--secondary-color); font-size: 1.3rem; + + opacity: 1; + transition: all .25s ease-out; } .welcome { @@ -157,6 +225,12 @@ a { z-index: 3; } +.dividers { + margin: 10px 0; + width: 100%; + border-bottom: 1px solid rgba(0,0,0,.12); +} + /** * Labs style */ @@ -217,7 +291,6 @@ a { /*line-height: 37px;*/ user-select: none; - cursor: pointer; } #labs .more .desc { @@ -239,6 +312,10 @@ a { background-repeat: no-repeat; } +/** + * Plugins & sites Card + */ + cards { display: flex; flex-flow: row wrap; @@ -364,6 +441,9 @@ card-empty a { font-weight: 500; } +/** + * Account + */ .avatar { margin: 10px; padding: 5px; @@ -382,3 +462,508 @@ card-empty a { border: 5px solid #fff; box-shadow: 0 10px 20px 0 rgba(168,182,191,0.6); } + +/** + * Notice bubbles + */ + .bubbles { + position: fixed!important; + bottom: 20px; + + display: flex; + justify-content: center; + align-content: center; + + padding: 10px; + + width: 55px; + height: 56px; + + border-radius: 50%; + + box-shadow: 0 2px 6px 0 rgba(0,0,0,.4); + + cursor: pointer; + transition: all 500ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; + overflow: initial; +} + +.bubbles.notice { + right: 164px; + background-color: #16666f; +} + +.bubbles.notice:hover { + background-color: rgba(22, 102, 111, .8); +} + +.bubbles i { + display: flex; + justify-content: center; + align-items: center; +} + +.bubbles em { + position: absolute; + top: 6px; + right: 11px; + + width: 18px; + height: 18px; + line-height: 18px; + + color: #fff; + background-color: #e54545; + + font-weight: bold; + text-align: center; + font-style: initial; + border-radius: 50%; +} + +.bubbles em.init { + line-height: 9px; +} + +.bubbles.effect { + animation-name: popup; + animation-duration: 1s; +} + +/** + * Help bubbles + */ +.bubbles.help { + right: 94px; + background-color: #607D8B; +} + +.help:hover { + background-color: rgba(96, 125, 139, .8); +} + +@keyframes popup { + 0% { + opacity: 0; + -webkit-transform: translateY(20px); + transform: translateY(20px) + } + + 100% { + opacity: 1; + -webkit-transform: translateY(0); + transform: translateY(0) + } +} + +@keyframes popdown { + 0% { + opacity: 0; + transform: translateY(-20px) + } + + 100% { + opacity: 1; + transform: translateY(0) + } +} + +@keyframes popclose { + 0% { + opacity: 1; + transform: translateY(0px) + } + + 100% { + opacity: 0; + transform: translateY(20px) + } +} + +/** + * Guide + */ +.guide-bg { + position: fixed; + right: 10px; + bottom: 90px; + + animation-name: popup; + animation-duration: 1s; + + z-index: 2147483647; +} + +.guide { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-content: center; + + width: 350px; + height: 400px; + + background-color: #F5F6F6; + + border-radius: 2px; + box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 2px 2px rgba(0, 0, 0, .26); + + overflow-x: hidden; + overflow-y: auto; +} + +.guide .title, +.guide .subtitle { + height: 48px; + line-height: 48px; + + color: #fff; + background-color: #26d07c; + + font-size: 17px; + text-align: center; + + border-top-left-radius: 2px; + border-top-right-radius: 2px; +} + +.guide .title { + position: absolute; + + left: 0; + right: 15px; + + display: flex; + justify-content: center; + font-weight: bold; + + z-index: 2; +} + +.guide .title span { + animation: .1s reverse fadein,235ms cubic-bezier(.4,0,.2,1) popdown; +} + +.guide .subtitle { + display: flex; + justify-content: center; + align-items: flex-start; + + margin-top: 48px; + + min-height: 55px; + line-height: initial; + + font-size: 15px; +} + +.guide .loading { + display: flex; + justify-content: center; + align-items: center; + + margin-bottom: 20px; + + font-weight: 500; + font-size: 13px; + + transition : opacity 1s cubic-bezier(0.23, 1, 0.32, 1) 0ms; +} + +.guide .loading span { + padding: 5px; +} + +.guide .group { + margin-top: -30px; + padding: 10px; +} + +guid-card { + display: flex; + + margin-bottom: 10px; + padding: 20px; + + width: 100%; + + background-color: #ffffff; + + border-radius: 4px; + box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(193, 203, 212, 0.7) 0px 0px 0px 1px inset, rgb(193, 203, 212) 0px -1px 0px 0px inset; + transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0s; + + cursor: pointer; +} + +guid-card:hover { + box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px 0px, rgba(193, 203, 212, 0.7) 0px 0px 0px 1px inset, rgb(193, 203, 212) 0px -1px 0px 0px inset; + transform: translate(0px, -2px); +} + +guid-card-tips span { + margin-left: 5px; + font-size: 14px; + color: #0B242F; +} + +.guide hr { + margin: 0; + border: 0; + + text-align: center; + overflow: visible; +} + +.guide hr:before { + content: '...'; + + position: relative; + top: -10px; + + display: inline-block; + + margin-left: .6em; + + color: rgba(0,0,0,.68); + + font-family: medium-content-slab-serif-font,Georgia,Cambria,"Times New Roman",Times,serif; + font-weight: 400; + font-style: italic; + font-size: 30px; + letter-spacing: .6em; +} + +/** + * Feedback bubbles + */ +.bubbles.feedback { + right: 24px; + background-color: #fb7756; +} + +.feedback:hover { + background-color: rgba(251, 119, 86, .8); +} + +/** + * URL Scheme source form simpread.css + */ + +.simpread-urlscheme, +.simpread-feedback { + position: fixed; + right: 20px; + bottom: 20px; + + z-index: 2147483646; +} + +simpread-urlscheme, +simpread-feedback { + display: flex; + justify-content: center; + align-items: flex-start; + flex-direction: column; + + padding: 20px 20px 0; + + width: 500px; + + color: rgba(51, 51, 51, .87); + background-color: #fff; + border-radius: 3px; + + box-shadow: rgba(0, 0, 0, 0.12) 0px 0px 2px, rgba(0, 0, 0, 0.26) 0px 2px 2px; + overflow: hidden; + + transform-origin: bottom; + transition: all .6s ease; +} + +simpread-urlscheme *, +simpread-feedback * { + font-size: 12px!important; + box-sizing: border-box; +} + +simpread-urlscheme.active, +simpread-feedback.active { + animation-name: srFadeInUp; + animation-duration: 450ms; + animation-fill-mode: both; +} + +simpread-urlscheme.hide, +simpread-feedback.hide { + animation-name: srFadeInDown; + animation-duration: 450ms; + animation-fill-mode: both; +} + +simpread-urlscheme sr-urls-label, +simpread-feedback sr-fb-label { + width: 100%; +} + +simpread-urlscheme sr-urls-head, +simpread-feedback sr-fb-head { + display: flex; + align-items: center; + flex-direction: row; + + margin-bottom: 5px; + width: 100%; +} + +simpread-urlscheme sr-urls-content, +simpread-feedback sr-fb-content { + margin-bottom: 5px; + width: 100%; +} + +simpread-urlscheme sr-urls-footer, +simpread-feedback sr-urls-footer { + display: flex; + justify-content: flex-end; + width: 100%; +} + +simpread-urlscheme sr-urls-a, +simpread-feedback sr-fb-a { + color: #2163f7; + cursor: pointer; +} + +simpread-urlscheme text-field-state, +simpread-feedback text-field-state { + border-top: none rgba(34, 101, 247, 0.8)!important; + border-left: none rgba(34, 101, 247, 0.8)!important; + border-right: none rgba(34, 101, 247, 0.8)!important; + border-bottom: 2px solid rgba(34, 101, 247, 0.8)!important; +} + +simpread-urlscheme switch, +simpread-feedback switch { + margin-top: 0!important; +} + +@keyframes srFadeInUp { + from { + opacity: 0; + transform: translateY(100px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes srFadeInDown { + from { + opacity: 1; + transform: translateY(0); + } + + to { + opacity: 0; + transform: translateY(100px); + } +} + +/** + * Feeback + */ + +simpread-feedback sr-fb-head { + font-weight: bold; +} + +simpread-feedback sr-fb-content { + display: flex; + flex-direction: column; +} + +simpread-feedback sr-fb-footer { + display: flex; + flex-direction: row; + justify-content: flex-end; + + width: 100%; +} + +/** + * Feeback: stars + */ + +simpread-feedback sr-close { + position: absolute; + right: 20px; + cursor: pointer; + transition: all 1000ms cubic-bezier(0.23, 1, 0.32, 1) 100ms; + z-index: 200; +} + +simpread-feedback sr-close:hover { + transform: rotate(-15deg) scale(1.3); +} + +simpread-feedback sr-stars { + display: flex; + flex-direction: row; + justify-content: center; + + margin-top: 10px; +} + +simpread-feedback sr-stars { + display: flex; + flex-direction: row; + justify-content: center; + + margin-top: 10px; +} + +simpread-feedback sr-stars i { + margin-right: 10px; + cursor: pointer; +} + +simpread-feedback sr-stars i svg { + transition: all 1000ms cubic-bezier(0.23, 1, 0.32, 1) 100ms; +} + +simpread-feedback sr-stars i svg:hover { + transform: rotate(-15deg) scale(1.3); +} + +simpread-feedback sr-stars i.active svg { + transform: rotate(0) scale(1); +} + +simpread-feedback sr-emojis { + display: block; + height: 100px; + overflow: hidden; +} + +simpread-feedback sr-emoji { + display: flex; + flex-direction: column; + align-items: center; + transition: .3s; +} + +simpread-feedback sr-emoji > svg { + margin: 15px 0; + width: 70px; + height: 70px; + flex-shrink: 0; +} + +simpread-feedback sr-stars-footer { + display: flex; + justify-content: center; + margin: 10px 0 20px 0; +} \ No newline at end of file diff --git a/src/assets/css/setting.css b/src/assets/css/setting.css new file mode 100644 index 000000000..067d8536c --- /dev/null +++ b/src/assets/css/setting.css @@ -0,0 +1,88 @@ + +/** + * Setting: Focus/Read setting dailog +*/ + +sr-opt-focus, +sr-opt-read { + display: -webkit-flex; + flex-direction:column; + + width: 100%; +} + +sr-opt-gp { + display: -webkit-flex; + position: relative; + + flex-flow:row nowrap; + justify-content:flex-start; + + width: 100%; + margin-bottom: 25px; + + font-size: 15px; +} + +sr-opt-gp textarea, sr-opt-gp input { + font-family: Inconsolata, "Operator Mono", Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", "Courier New", Courier, monospace!important; +} + +sr-opt-gp sr-opt-label { + display: block; + position: absolute; + + margin: -8px 0 0 0; + + font-size: 14px; + font-weight: bold; + + color: rgba(0, 137, 123, .8); + + user-select: none; + pointer-events: none; + + transform: scale(0.75) translate( 0px, -8px ); + transform-origin: left top 0px; +} + +sr-opt-themes { + display: -webkit-flex; + flex-flow:row nowrap; + justify-content:space-between; + + width: 100%; + /*height: 100%;*/ + + margin: 8px 0 17px; + padding: 0; +} + +sr-opt-theme { + width: 40px; + height: 20px; + + cursor: pointer; + list-style: none; + + border-radius: 3px; + border: 1px solid #212121; + box-sizing: border-box; + + opacity: 1; + transition: all 500ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; +} + +sr-opt-theme:hover { + transform: translateY(-1px); + box-shadow: 0 5px 10px rgba(0,0,0,.2); +} + +sr-opt-theme:not(:first-child) { + margin-left: 5px; +} + +sr-opt-theme[sr-type="active"] { + box-shadow: 0 5px 10px rgba(0,0,0,.2); + border: none; +} diff --git a/src/assets/css/simpread.css b/src/assets/css/simpread.css index a5b72f7fa..09f492a44 100644 --- a/src/assets/css/simpread.css +++ b/src/assets/css/simpread.css @@ -1,5 +1,5 @@ /** - * Golbal style + * SimpRead: Read mode */ .simpread-font { @@ -16,47 +16,10 @@ display: none; } -/** - * Focus: Background( root ) style - */ -.simpread-focus-root { - display: block; - position: fixed; - - top: 0; - left: 0; - right: 0; - bottom: 0; - - background-color: rgba( 235, 235, 235, 0.9 ); - z-index: 2147483645; - - opacity: 0; - transition : opacity 1s cubic-bezier(0.23, 1, 0.32, 1) 0ms; -} - -.simpread-focus-highlight { - position: relative; - - box-shadow: 0 0 0 20px #fff; - background-color: #fff; - - overflow: visible; - z-index: 2147483646; -} - -.sr-controlbar-bg sr-rd-crlbar { - z-index: 2147483647; -} - -.sr-controlbar-bg sr-rd-crlbar fab { - z-index: 2147483647; -} - /** * Read: background( root ) style */ -.simpread-read-root { + .simpread-read-root { display: -webkit-flex; justify-content:center; align-items:center; @@ -148,12 +111,49 @@ sr-rd-footer-text { } sr-rd-footer-copywrite { - margin: 10px 0 20px 0; + margin: 10px 0 0 0; color: inherit; } +sr-rd-footer-copywrite abbr { + font-variant: normal; + text-decoration: none; + /*border-bottom: 1px dotted;*/ +} + +sr-rd-footer-copywrite .second { + margin: 10px 0; +} + +sr-rd-footer-copywrite .third a:hover { + border: none!important; +} + +sr-rd-footer-copywrite .third a:first-child { + margin-right: 50px; +} + +sr-rd-footer-copywrite .sr-icon { + display: inline-flex; + justify-content: center; + align-items: center; + + width: 33px; + height: 33px; + + opacity: .8; + + transition: opacity .5s ease; + cursor: pointer; +} + +sr-rd-footer-copywrite .sr-icon:hover { + opacity: 1; +} + sr-rd-footer-copywrite a, -sr-rd-footer-copywrite a:link { +sr-rd-footer-copywrite a:link, +sr-rd-footer-copywrite a:visited { margin: 0; padding: 0; @@ -166,6 +166,7 @@ sr-rd-footer-copywrite a:link { vertical-align: initial; border: none!important; + /*border-bottom: 1px dotted!important;*/ box-sizing: border-box; } @@ -174,7 +175,69 @@ sr-rd-footer-copywrite a:hover, sr-rd-footer-copywrite a:focus, sr-rd-footer a:active { color: inherit; - text-decoration: underline; + text-decoration: none; + border-bottom: 1px dotted!important; +} + +/** + * Special blocks + */ +.simpread-blocks { + text-decoration: none!important; +} + +.simpread-blocks * { + margin: 0; +} + +.simpread-blocks a { + padding: 0; + text-decoration: none!important; +} + +.simpread-blocks img { + margin: 0; + padding: 0; + border: 0; + background: transparent; + box-shadow: none; +} + +/** + * Focus: Background( root ) style + */ +.simpread-focus-root { + display: block; + position: fixed; + + top: 0; + left: 0; + right: 0; + bottom: 0; + + background-color: rgba( 235, 235, 235, 0.9 ); + z-index: 2147483645; + + opacity: 0; + transition : opacity 1s cubic-bezier(0.23, 1, 0.32, 1) 0ms; +} + +.simpread-focus-highlight { + position: relative; + + box-shadow: 0 0 0 20px #fff; + background-color: #fff; + + overflow: visible; + z-index: 2147483646; +} + +.sr-controlbar-bg sr-rd-crlbar { + z-index: 2147483647; +} + +.sr-controlbar-bg sr-rd-crlbar fab { + z-index: 2147483647; } /** @@ -224,11 +287,60 @@ sr-rd-crlbar.controlbar:hover { * Highlight */ .simpread-highlight-selector { - background-color: #fafafa; - outline: 3px dashed #1976d2; - opacity: .8; + background-color: #fafafa !important; + outline: 3px dashed #1976d2 !important; + opacity: .8 !important; + cursor: pointer !important; + transition: opacity .5s ease !important; +} + +.simpread-highlight-controlbar { + position: relative !important; + background-color: #fafafa !important; + outline: 3px dashed #1976d2 !important; + opacity: .8 !important; + transition: opacity .5s ease !important; +} + +simpread-highlight, +sr-snapshot-ctlbar { + position: fixed; + + top: 0; + left: 0; + right: 0; + + display: flex; + justify-content: center; + align-items: center; + + padding: 15px; + + height: 50px; + + background-color: rgba(50, 50, 50, .9); + box-shadow: 0 2px 5px rgba(0, 0, 0, .26); + + box-sizing: border-box; + z-index: 2147483640; +} + +sr-highlight-ctl { + display: flex; + justify-content: center; + align-items: center; + + margin: 0 5px; + + width: 50px; + height: 20px; + + color: #fff; + background-color: #1976d2; + + border-radius: 4px; + box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0,0,0,.12); cursor: pointer; - transition: opacity .5s ease; } /** @@ -238,8 +350,8 @@ toc-bg { position: fixed; left: 0; top: 0; - width: 200px; - height: 500px; + width: 50px; + height: 200px; font-size: initial; } @@ -258,6 +370,10 @@ toc-bg:hover { z-index: 3; } +.toc-bg-hidden:hover toc { + width: 180px; +} + toc * { all: unset; } @@ -273,15 +389,31 @@ toc { padding: 10px; + width: 0; max-width: 200px; max-height: 500px; overflow-x: hidden; + overflow-y: hidden; cursor: pointer; border: 1px solid rgba(158, 158, 158, 0.22); - transition: width 1.5s; + transition: width .5s; +} + +toc:hover { + overflow-y: auto; +} + +toc::-webkit-scrollbar { + width: 3px; +} + +toc::-webkit-scrollbar-thumb { + border-radius: 10px; + background-color: rgba(139,137,134,0.5); } + toc outline { position: relative; display: -webkit-box; @@ -290,7 +422,7 @@ toc outline { overflow: hidden; text-overflow: ellipsis; - margin: 2px 0; + padding: 2px 0; min-height: 21px; line-height: 21px; @@ -302,14 +434,21 @@ toc outline a:active, toc outline a:visited, toc outline a:focus { + display: block; + + width: 100%; + color: inherit; font-size: 11px; text-decoration: none!important; + + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } toc outline a:hover { font-weight: bold!important; - text-decoration: underline!important; } toc outline a.toc-outline-theme-dark, @@ -317,8 +456,11 @@ toc outline a.toc-outline-theme-night { color: #fff!important; } +.toc-level-h1 { + padding-left: 5px; +} .toc-level-h2 { - padding-left: 10px; + padding-left: 15px; } .toc-level-h3 { padding-left: 25px; @@ -328,17 +470,20 @@ toc outline a.toc-outline-theme-night { } .toc-outline-active { - background-color: rgb(244, 67, 54); + border-left: 2px solid rgb(244, 67, 54); } toc outline active { position: absolute; - right: 0; + left: 0; top: 0; bottom: 0; padding: 0 0 0 3px; + + border-left: 2px solid #e8e8e8; + } /** @@ -374,9 +519,10 @@ kbd-mapping { display: flex; flex-direction: column; + flex-flow: row; width: 500px; - height: 550px; + height: 625px; background-color: #fff; @@ -387,12 +533,14 @@ kbd-mapping { kbd-maps { display: flex; - flex-flow: column wrap; + flex-flow: column wrap; + margin-top: 40px; } kbd-mapping kbd-map-title { + position: absolute; margin: 5px 0; - + width: 100%; font-size: 14px; font-weight: bold; } @@ -434,4 +582,397 @@ kbd-map kbd-name { kbd-map kbd-desc { padding-left: 3px; +} + +/** + * Share card + */ + +sharecard-bg { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + + display: flex; + justify-content: center; + align-items: center; + + background-color: rgba(0, 0, 0, .4); + + z-index: 2147483647; +} + +sharecard { + display: flex; + flex-direction: column; + + max-width: 450px; + + background-color: rgb(100, 181, 246); +} + +sharecard-head { + display: flex; + flex-direction: column; + + margin: 25px; + + color: #fff; + + border-radius: 10px; + box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.15); +} + +sharecard-card { + display: flex; + flex-direction: column; +} + +sharecard-top { + display: flex; + align-items: center; + justify-content: center; + + padding-right: 5px; + + height: 65px; + background-color: #fff; + + color: #878787; + font-size: 25px; + font-weight: 500; + + border-top-left-radius: 10px; + border-top-right-radius: 10px; +} + +sharecard-top span.logos { + display: block; + + width: 48px; + height: 48px; + + margin: 5px; + + background-repeat: no-repeat; + background-position: 50%; + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAABU1BMVEUAAAAnNJMnNZI3Q5onNJInNJMnNJInNJMnNJI8SJ0tOZY/S55EUKAoNJI6RpwoNJNIU6InNJInNJImNJI7SJwmNJJ2fLUiMJFKVaNCTJ9faK1HUaJOWKVSXaUnNJNYY6pye7cmM5JXYKhwebMjMI8mL4719fW9vb0oNZP/UlLz8/QqN5TAwMAnNJPv7+/Pz8/q6+/p6enNzc3Kysry8vMsOJXc3env7/LU1uXo29vR0dHOzs7ExMTwjo73bW37XV3Aj1TCYELl5u3n5+fW2Obn6O7f4OrZ2+g0QJkxPpgvO5bh4uvS1OTP0ePCwsJQW6ZLVqTs7fHd3d3V1dXqv79VX6lET6A1TIxXUIBSgHxWQnpelHf+WVnopkXqbC7j5Ozi4uLDw8NGUaFATJ9SgH3r6+vGyd7BxNva2trX19ejqM2gpczHx8dze7Zha67Z2dlTgH1aXQeSAAAAJnRSTlMA6ff+497Y8NL+/fv49P379sqab/BeOiX06tzVy8m/tKqpalA7G6oKj0EAAAJlSURBVEjHndNXWxpBFIDhcS2ICRLAkt4Dx4WhLk0E6R0MYoIISrWX5P9f5cwSIRC2+T1czMV5n2FnZwn2eWONUqCAv3H2Uf5Ra1hx4+0WEXtDQW0fCPYJ1EffEfIV4CSROAE4jsePoTFsNmTJF/IeIHF2lgCIn57GodlqDWXBK7IwBYatVlMWFAildPKX7I3m74Z9fsCiQChoimoFQAz04Ad2gH1n9fv9n9hgMNDr9euLWD6fLxQKxaLfb7dTSlahbFVdEPwIQtrAihZQgyKCtCagbQe3xh0QFMgy5MR11+ewYY5/qlZ7vT2xu93ULKjbFLpiUxnIIwjgKmVTLDUFXMrAi2NJWCRLIthTBo4xyOLKpwyqU6CuDCI41hFBCVdOhyLw4FgJ1skCAiyl9BSHbCorgo6VJXTru5hrVCQS8Yr5xLzX59YJSFpVFwD9U0BGC3hGdFpATgRupTGe9R9I1b1ePBvXKDyvq/O/44LT4/E4BUbSCAwj8Evq6HlnOBprx6JhJz8Gktc7xeaP9ndY+0coQvCccFBD4JW60UIY50ciLOAODAQRVOeCHm4Q3Xks6uRDY+CQ+AR4T2wMYh6+jMCIQOp78CFoj0H7EQgIuhI3dGaHCrwgADwCPjJvA372GRigCJg49FUdk3D87pq3zp4SA5zc1Zh9DxfwkpjgUg5Mv+lbeE3McC8Lpu7SA3wk2xzcqL2tN5DfIsQC8HB7UamUy6FQOpTO5QKBQDZbKnWSyUzGjdWCwaDA8+7Le4BNgm3qQGWchYh9s5hNq6wVbBlbwhZYOp3OYOA4zmgEypnM2zj8ByIdedKrH8vDAAAAAElFTkSuQmCC"); + + zoom: .8; +} + +sharecard-content { + padding: 15px; + + max-height: 500px; + + font-size: 20px; + text-align: justify; + + background-color: rgb(33, 150, 243); + + overflow-x: hidden; + overflow-y: auto; +} + +sharecard-via { + padding: 10px; + font-size: 10px; + + background-color: rgb(33, 150, 243); +} + +sharecard-footer { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + + padding-right: 5px; + + height: 100px; + background-color: #fff; + + color: #878787; + font-size: 15px; + font-weight: 500; + + border-bottom-left-radius: 10px; + border-bottom-right-radius: 10px; +} + +sharecard-footer div { + display: flex; + align-items: center; +} + +sharecard-footer span.qrcode { + display: block; + + width: 100px; + height: 100px; + + margin: 5px; + + background-repeat: no-repeat; + background-position: 50%; + background-image: url("data:image/png;base64,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"); +} + +sharecard-control { + display: flex; + flex-direction: row; + align-items: center; + + padding: 0 19px; + + height: 80px; + background-color: #fff; +} + +/** + * Snapshot + */ + +simpread-snapshot { + position: fixed; + left: 0; + top: 0; + + width: 100%; + height: 100%; + + cursor: move; + z-index: 2147483645; +} + +sr-mask { + position: fixed; + left: 0; + top: 0; + background-color: rgba(0, 0, 0, .1); +} + +/** + * URL Scheme + */ + +.simpread-urlscheme, +.simpread-feedback { + position: fixed; + right: 20px; + bottom: 20px; + + z-index: 2147483646; +} + +simpread-urlscheme, +simpread-feedback { + display: flex; + justify-content: center; + align-items: flex-start; + flex-direction: column; + + padding: 20px 20px 0; + + width: 500px; + + color: rgba(51, 51, 51, .87); + background-color: #fff; + border-radius: 3px; + + box-shadow: rgba(0, 0, 0, 0.12) 0px 0px 2px, rgba(0, 0, 0, 0.26) 0px 2px 2px; + overflow: hidden; + + transform-origin: bottom; + transition: all .6s ease; +} + +simpread-urlscheme *, +simpread-feedback * { + font-size: 12px!important; + box-sizing: border-box; +} + +simpread-urlscheme.active, +simpread-feedback.active { + animation-name: srFadeInUp; + animation-duration: 450ms; + animation-fill-mode: both; +} + +simpread-urlscheme.hide, +simpread-feedback.hide { + animation-name: srFadeInDown; + animation-duration: 450ms; + animation-fill-mode: both; +} + +simpread-urlscheme sr-urls-label, +simpread-feedback sr-fb-label { + width: 100%; +} + +simpread-urlscheme sr-urls-head, +simpread-feedback sr-fb-head { + display: flex; + align-items: center; + flex-direction: row; + + margin-bottom: 5px; + width: 100%; +} + +simpread-urlscheme sr-urls-content, +simpread-feedback sr-fb-content { + margin-bottom: 5px; + width: 100%; +} + +simpread-urlscheme sr-urls-footer, +simpread-feedback sr-urls-footer { + display: flex; + justify-content: flex-end; + width: 100%; +} + +simpread-urlscheme sr-urls-a, +simpread-feedback sr-fb-a { + color: #2163f7; + cursor: pointer; +} + +simpread-urlscheme text-field-state, +simpread-feedback text-field-state { + border-top: none rgba(34, 101, 247, 0.8)!important; + border-left: none rgba(34, 101, 247, 0.8)!important; + border-right: none rgba(34, 101, 247, 0.8)!important; + border-bottom: 2px solid rgba(34, 101, 247, 0.8)!important; +} + +simpread-urlscheme switch, +simpread-feedback switch { + margin-top: 0!important; +} + +@keyframes srFadeInUp { + from { + opacity: 0; + transform: translateY(100px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes srFadeInDown { + from { + opacity: 1; + transform: translateY(0); + } + + to { + opacity: 0; + transform: translateY(100px); + } +} + +/** + * Feeback + */ + +simpread-feedback sr-fb-head { + font-weight: bold; +} + +simpread-feedback sr-fb-content { + display: flex; + flex-direction: column; +} + +simpread-feedback sr-fb-footer { + display: flex; + flex-direction: row; + justify-content: flex-end; + + width: 100%; +} + +/** + * Feeback: stars + */ + + simpread-feedback sr-close { + position: absolute; + right: 20px; + cursor: pointer; + transition: all 1000ms cubic-bezier(0.23, 1, 0.32, 1) 100ms; + z-index: 200; +} + +simpread-feedback sr-close:hover { + transform: rotate(-15deg) scale(1.3); +} + +simpread-feedback sr-stars { + display: flex; + flex-direction: row; + justify-content: center; + + margin-top: 10px; +} + +simpread-feedback sr-stars { + display: flex; + flex-direction: row; + justify-content: center; + + margin-top: 10px; +} + +simpread-feedback sr-stars i { + margin-right: 10px; + cursor: pointer; +} + +simpread-feedback sr-stars i svg { + transition: all 1000ms cubic-bezier(0.23, 1, 0.32, 1) 100ms; +} + +simpread-feedback sr-stars i svg:hover { + transform: rotate(-15deg) scale(1.3); +} + +simpread-feedback sr-stars i.active svg { + transform: rotate(0) scale(1); +} + +simpread-feedback sr-emojis { + display: block; + height: 100px; + overflow: hidden; +} + +simpread-feedback sr-emoji { + display: flex; + flex-direction: column; + align-items: center; + transition: .3s; +} + +simpread-feedback sr-emoji > svg { + margin: 15px 0; + width: 70px; + height: 70px; + flex-shrink: 0; +} + +simpread-feedback sr-stars-footer { + display: flex; + justify-content: center; + margin: 10px 0 20px 0; } \ No newline at end of file diff --git a/src/assets/css/theme_common.css b/src/assets/css/theme_common.css index 7dcb85198..caf4e6ce1 100644 --- a/src/assets/css/theme_common.css +++ b/src/assets/css/theme_common.css @@ -13,8 +13,13 @@ sr-rd-title, sr-rd-desc, sr-rd-content { } sr-rd-title { - text-rendering: optimizelegibility; + display: -webkit-box; margin: 1em 0px 0.5em; + overflow : hidden; + text-overflow: ellipsis; + text-rendering: optimizelegibility; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; } sr-rd-content { @@ -23,7 +28,7 @@ sr-rd-content { } sr-rd-desc { - text-align: left; + text-align: justify; line-height: 2.4; margin: 0 0 1.2em 0; } @@ -60,7 +65,7 @@ sr-rd-content a { sr-rd-content a, sr-rd-content a:link { color: inherit; - font-size: initial; + font-size: inherit; font-weight: inherit; border:none; } @@ -72,11 +77,19 @@ sr-rd-content a:hover { sr-rd-content img { margin: 10px; padding: 5px; + + max-width: 100%; + background: #fff; border: 1px solid #bbb; box-shadow: 1px 1px 3px #d4d4d4; } +sr-rd-content figcaption { + text-align: center; + font-size: 14px; +} + sr-rd-content sr-blockquote { display: block; position: relative; @@ -186,6 +199,14 @@ sr-rd-content pre code * { font-size: 1.1rem; } +sr-rd-content pre p { + margin: 0; + padding: 0; + color: inherit; + font-size: inherit; + line-height: inherit; +} + sr-rd-content li code, sr-rd-content p code { margin: 0 4px; @@ -193,6 +214,14 @@ sr-rd-content p code { font-size: 1.1rem; } +sr-rd-content mark { + margin: 0 5px; + padding: 2px; + + background: #fffdd1; + border-bottom: 1px solid #ffedce; +} + .sr-rd-content-img { width: 90%; height: auto; @@ -217,6 +246,17 @@ sr-rd-content p code { -webkit-box-orient: vertical; } +.sr-rd-content-center-small { + display: inline-flex; +} + +.sr-rd-content-center-small img { + margin: 0; + padding: 0; + border: 0; + box-shadow: none; +} + .sr-rd-content-nobeautify { margin: 0; padding: 0; @@ -232,12 +272,11 @@ sr-rd-mult { padding: 16px 0 24px; width: 100%; - min-width: 840.72px; - background-color: #fafafa; + background-color: #fff; - border-radius: 2px; - box-shadow: 0 1px 5px rgba(0, 0, 0, 0.16); + border-radius: 4px; + box-shadow: 0px 1px 2px 0px rgba(60,64,67,0.3), 0px 2px 6px 2px rgba(60,64,67,0.15); } sr-rd-mult:hover { @@ -257,6 +296,8 @@ sr-rd-mult sr-rd-mult-avatar { display: flex; flex-direction: column; align-items: center; + + margin: 0 15px; } sr-rd-mult sr-rd-mult-avatar span { diff --git a/src/assets/css/theme_dark.css b/src/assets/css/theme_dark.css index f1cda3347..0b059d2ec 100644 --- a/src/assets/css/theme_dark.css +++ b/src/assets/css/theme_dark.css @@ -23,7 +23,7 @@ sr-rd-content sr-blockquote { * Custom style, include: background; title; desc; sr-rd-content; p,div; a; pre */ -.simpread-theme-root { +.simpread-theme-root, .simpread-multi-root { color: rgb(235, 235, 235); background: rgb(34, 34, 34); } diff --git a/src/assets/css/theme_engwrite.css b/src/assets/css/theme_engwrite.css index f921b5bd8..fe31e4c06 100644 --- a/src/assets/css/theme_engwrite.css +++ b/src/assets/css/theme_engwrite.css @@ -31,7 +31,7 @@ sr-blockquote >:last-child { * Custom style, include: background; title; desc; sr-rd-content; p,div; a; pre */ -.simpread-theme-root { +.simpread-theme-root, .simpread-multi-root { background-color: rgb(252, 245, 237); color: rgb(51, 51, 51); } diff --git a/src/assets/css/theme_github.css b/src/assets/css/theme_github.css index 2368be8e0..86367ccda 100644 --- a/src/assets/css/theme_github.css +++ b/src/assets/css/theme_github.css @@ -89,4 +89,12 @@ sr-rd-content li code, sr-rd-content p code { background-color: rgba(0,0,0,0.04); border-radius: 3px; +} + +/** + * Multiple page + */ + +.simpread-multi-root { + background: #F8F9FA; } \ No newline at end of file diff --git a/src/assets/css/theme_gothic.css b/src/assets/css/theme_gothic.css index c76584835..e220e3005 100644 --- a/src/assets/css/theme_gothic.css +++ b/src/assets/css/theme_gothic.css @@ -26,7 +26,7 @@ sr-rd-content sr-blockquote p { * Custom style, include: background; title; desc; sr-rd-content; p,div; a; pre */ -.simpread-theme-root { +.simpread-theme-root, .simpread-multi-root { background: rgb(252, 252, 252); color: #333; } diff --git a/src/assets/css/theme_mobile.css b/src/assets/css/theme_mobile.css new file mode 100644 index 000000000..61af97eb9 --- /dev/null +++ b/src/assets/css/theme_mobile.css @@ -0,0 +1,181 @@ +/** + * Mobile media + */ +@media (pointer:coarse) { + sr-read { + margin: 20px 5%!important; + min-width: initial!important; + max-width: 90%!important; + } + + sr-rd-title { + margin-top: 0; + font-size: 2.7rem; + } + + sr-rd-desc, + sr-rd-content sr-blockquote { + margin: 10 0!important; + padding: 0 0 0 10px !important; + width: 90%; + + font-size: 1.8rem; + font-style: normal; + line-height: 1.7; + text-align: justify; + } + + sr-rd-content { + font-size: 1.75rem; + font-weight: 300; + } + + sr-rd-content figure { + margin: 0; + padding: 0; + text-align: center; + } + + sr-rd-content a, sr-rd-content a:link { + font-size: inherit; + } + + sr-rd-content li code, sr-rd-content p code { + font-size: inherit; + } + + sr-rd-footer { + margin-top: 20px; + } + + sr-blockquote, sr-blockquote * { + margin: 5px !important; + padding: 5px !important; + } + + sr-rd-title, sr-rd-content h1, sr-rd-content h2, sr-rd-content h3, sr-rd-content h4, sr-rd-content h5, sr-rd-content h6 { + font-family: PingFang SC, Verdana, Helvetica Neue, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans-serif; + color: #000; + font-weight: 100; + line-height: 1.35; + } + + sr-rd-content h1, sr-rd-content h2, sr-rd-content h3, sr-rd-content h4, sr-rd-content h5, sr-rd-content h6, + sr-rd-content-h1, sr-rd-content-h2, sr-rd-content-h3, sr-rd-content-h4, sr-rd-content-h5, sr-rd-content-h6 { + margin-top: 1.2em; + margin-bottom: 0.6em; + line-height: 1.35; + } + + sr-rd-content h1, sr-rd-content-h1 { + font-size: 1.8em; + } + + sr-rd-content h2, sr-rd-content-h2 { + font-size: 1.6em; + } + + sr-rd-content h3, sr-rd-content-h3 { + font-size: 1.4em; + } + + sr-rd-content h4, sr-rd-content-h4 { + font-size: 1.2em; + } + + sr-rd-content h5, sr-rd-content h6, sr-rd-content-h5, sr-rd-content-h6 { + font-size: 1.2em; + } + + sr-rd-content ul, sr-rd-content-ul { + margin-left: 1.3em!important; + list-style: disc; + } + + sr-rd-content ol, sr-rd-content-ol { + list-style: decimal; + margin-left: 1.9em!important; + } + + sr-rd-content li ul, sr-rd-content li ol, sr-rd-content-ul ul, sr-rd-content-ul ol, sr-rd-content-ol ul, sr-rd-content-ol ol { + margin-bottom: 0.8em; + margin-left: 2em!important;; + } + + sr-rd-content img { + margin: 0; + padding: 0; + border: 0; + max-width: 100%!important; + height: auto; + box-shadow: 0 20px 20px -10px rgba(0,0,0,0.1); + } + + sr-rd-mult { + min-width: initial; + background-color: #fff; + box-shadow: 0 1px 6px rgba(32, 33, 36, 0.28); + border-radius: 8px; + } + + sr-rd-mult sr-rd-mult-avatar div { + margin: 0; + } + + sr-rd-mult sr-rd-mult-avatar .sr-rd-content-center-small { + margin: 7px 0!important; + } + + sr-rd-mult sr-rd-mult-avatar span { + display: block; + } + + sr-rd-mult sr-rd-mult-content { + padding-left: 0; + } + + /** + * iPad pro 12 and below + */ + @media only screen and (max-device-width: 1024px) { + html.simpread-theme-root, .simpread-theme-root { + font-size: 80%!important; + } + + sr-rd-mult sr-rd-mult-avatar img { + width: 50px; + height: 50px; + min-width: 50px; + min-height: 50px; + } + } + + /** + * iPhone XS Max and below + */ + @media only screen and (max-device-width: 414px) { + html.simpread-theme-root, .simpread-theme-root { + font-size: 70%!important; + } + + sr-rd-mult sr-rd-mult-avatar img { + width: 30px; + height: 30px; + min-width: 30px; + min-height: 30px; + } + } + + /** + * iPhone SE and below + */ + @media only screen and (max-device-width: 320px) { + html.simpread-theme-root, .simpread-theme-root { + font-size: 90%!important; + } + + sr-rd-content p { + margin-bottom: .5em; + } + } +} diff --git a/src/assets/css/theme_monospace.css b/src/assets/css/theme_monospace.css index b3dbe0dcb..5655cccfb 100644 --- a/src/assets/css/theme_monospace.css +++ b/src/assets/css/theme_monospace.css @@ -84,4 +84,12 @@ sr-rd-content li code, sr-rd-content p code { color: #949415; background-color: transparent; +} + +/** + * Multiple page + */ + +.simpread-multi-root { + background: #F8F9FA; } \ No newline at end of file diff --git a/src/assets/css/theme_newsprint.css b/src/assets/css/theme_newsprint.css index 974f7f407..96ccfc9a5 100644 --- a/src/assets/css/theme_newsprint.css +++ b/src/assets/css/theme_newsprint.css @@ -28,7 +28,7 @@ sr-rd-content sr-blockquote:before { * Custom style, include: background; title; desc; sr-rd-content; p,div; a; pre */ -.simpread-theme-root { +.simpread-theme-root, .simpread-multi-root { background-color: #f3f2ee; color: #2C3E50; } diff --git a/src/assets/css/theme_night.css b/src/assets/css/theme_night.css index eeaa0b2b3..90a969ba2 100644 --- a/src/assets/css/theme_night.css +++ b/src/assets/css/theme_night.css @@ -23,7 +23,7 @@ sr-rd-content sr-blockquote { * Custom style, include: background; title; desc; sr-rd-content; p,div; a; pre */ -.simpread-theme-root { +.simpread-theme-root, .simpread-multi-root { background: rgb(54, 59, 64); color: #b8bfc6; } diff --git a/src/assets/css/theme_octopress.css b/src/assets/css/theme_octopress.css index c9133adfc..eebcf2ece 100644 --- a/src/assets/css/theme_octopress.css +++ b/src/assets/css/theme_octopress.css @@ -23,7 +23,7 @@ sr-rd-content sr-blockquote { * Custom style, include: background; title; desc; sr-rd-content; p,div; a; pre */ -.simpread-theme-root { +.simpread-theme-root, .simpread-multi-root { background: #f8f8f8 url('data:image/png;base64,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') top left; color: #333; } diff --git a/src/assets/css/theme_pixyii.css b/src/assets/css/theme_pixyii.css index f7cd2c7d3..551b3ff6f 100644 --- a/src/assets/css/theme_pixyii.css +++ b/src/assets/css/theme_pixyii.css @@ -92,4 +92,12 @@ sr-rd-content li code, sr-rd-content p code { color: rgb(122, 122, 122); background-color: transparent; +} + +/** + * Multiple page + */ + + .simpread-multi-root { + background: #F8F9FA; } \ No newline at end of file diff --git a/src/assets/images/about_icon.png b/src/assets/images/about_icon.png deleted file mode 100644 index 02c2f08ce..000000000 Binary files a/src/assets/images/about_icon.png and /dev/null differ diff --git a/src/assets/images/bear_icon.png b/src/assets/images/bear_icon.png new file mode 100644 index 000000000..263d59ba2 Binary files /dev/null and b/src/assets/images/bear_icon.png differ diff --git a/src/assets/images/common_icon.png b/src/assets/images/common_icon.png deleted file mode 100644 index bb87ff727..000000000 Binary files a/src/assets/images/common_icon.png and /dev/null differ diff --git a/src/assets/images/sync_icon.png b/src/assets/images/dropbox_icon.png similarity index 100% rename from src/assets/images/sync_icon.png rename to src/assets/images/dropbox_icon.png diff --git a/src/assets/images/focus_mode_icon.png b/src/assets/images/focus_mode_icon.png deleted file mode 100644 index 500aa9d21..000000000 Binary files a/src/assets/images/focus_mode_icon.png and /dev/null differ diff --git a/src/assets/images/fullscreen_icon.png b/src/assets/images/fullscreen_icon.png new file mode 100644 index 000000000..da6fb9151 Binary files /dev/null and b/src/assets/images/fullscreen_icon.png differ diff --git a/src/assets/images/help_icon.png b/src/assets/images/help_icon.png deleted file mode 100644 index 7ba7f62ed..000000000 Binary files a/src/assets/images/help_icon.png and /dev/null differ diff --git a/src/assets/images/icons.svg b/src/assets/images/icons.svg new file mode 100644 index 000000000..110442dfd --- /dev/null +++ b/src/assets/images/icons.svg @@ -0,0 +1 @@ +SimpRead \ No newline at end of file diff --git a/src/assets/images/jianguo_icon.png b/src/assets/images/jianguo_icon.png new file mode 100644 index 000000000..497993df6 Binary files /dev/null and b/src/assets/images/jianguo_icon.png differ diff --git a/src/assets/images/labs_icon.png b/src/assets/images/labs_icon.png deleted file mode 100644 index 23f9d21fa..000000000 Binary files a/src/assets/images/labs_icon.png and /dev/null differ diff --git a/src/assets/images/markdown_icon.png b/src/assets/images/markdown_icon.png index d2bd862fc..c48cd58ee 100644 Binary files a/src/assets/images/markdown_icon.png and b/src/assets/images/markdown_icon.png differ diff --git a/src/assets/images/notion_icon.png b/src/assets/images/notion_icon.png new file mode 100644 index 000000000..33b4e0da2 Binary files /dev/null and b/src/assets/images/notion_icon.png differ diff --git a/src/assets/images/offline_html_icon.png b/src/assets/images/offline_html_icon.png new file mode 100644 index 000000000..8f5157782 Binary files /dev/null and b/src/assets/images/offline_html_icon.png differ diff --git a/src/assets/images/offline_markdown_icon.png b/src/assets/images/offline_markdown_icon.png new file mode 100644 index 000000000..d2bd862fc Binary files /dev/null and b/src/assets/images/offline_markdown_icon.png differ diff --git a/src/assets/images/plugin_icon.png b/src/assets/images/plugin_icon.png new file mode 100644 index 000000000..8b0e18a0e Binary files /dev/null and b/src/assets/images/plugin_icon.png differ diff --git a/src/assets/images/plugins_icon.png b/src/assets/images/plugins_icon.png deleted file mode 100644 index e4204fe69..000000000 Binary files a/src/assets/images/plugins_icon.png and /dev/null differ diff --git a/src/assets/images/read_icon.png b/src/assets/images/read_icon.png new file mode 100644 index 000000000..ea27184ae Binary files /dev/null and b/src/assets/images/read_icon.png differ diff --git a/src/assets/images/read_later_icon.png b/src/assets/images/read_later_icon.png deleted file mode 100644 index 06e067e3a..000000000 Binary files a/src/assets/images/read_later_icon.png and /dev/null differ diff --git a/src/assets/images/read_mode_icon.png b/src/assets/images/read_mode_icon.png deleted file mode 100644 index b0988984e..000000000 Binary files a/src/assets/images/read_mode_icon.png and /dev/null differ diff --git a/src/assets/images/share_card_icon.png b/src/assets/images/share_card_icon.png new file mode 100644 index 000000000..80cb46373 Binary files /dev/null and b/src/assets/images/share_card_icon.png differ diff --git a/src/assets/images/snapshot_icon.png b/src/assets/images/snapshot_icon.png new file mode 100644 index 000000000..b345fac13 Binary files /dev/null and b/src/assets/images/snapshot_icon.png differ diff --git a/src/assets/images/ulysses_icon.png b/src/assets/images/ulysses_icon.png new file mode 100644 index 000000000..b7f4d6999 Binary files /dev/null and b/src/assets/images/ulysses_icon.png differ diff --git a/src/assets/images/webdav_icon.png b/src/assets/images/webdav_icon.png new file mode 100644 index 000000000..f533f7988 Binary files /dev/null and b/src/assets/images/webdav_icon.png differ diff --git a/src/assets/images/wiz_icon.png b/src/assets/images/wiz_icon.png new file mode 100644 index 000000000..667557ba0 Binary files /dev/null and b/src/assets/images/wiz_icon.png differ diff --git a/src/assets/images/youdao_icon.png b/src/assets/images/youdao_icon.png new file mode 100644 index 000000000..6b1930615 Binary files /dev/null and b/src/assets/images/youdao_icon.png differ diff --git a/src/assets/images/yuque_icon.png b/src/assets/images/yuque_icon.png new file mode 100644 index 000000000..696ac1f3b Binary files /dev/null and b/src/assets/images/yuque_icon.png differ diff --git a/src/background.js b/src/background.js index 828703578..1ded9029d 100644 --- a/src/background.js +++ b/src/background.js @@ -7,7 +7,10 @@ import {browser} from 'browser'; import * as ver from 'version'; import * as menu from 'menu'; import * as watch from 'watch'; - +import * as WebDAV from 'webdav'; +import * as permission + from 'permission'; +import * as tips from 'tips'; import PureRead from 'puread'; // global update site tab id @@ -41,8 +44,16 @@ storage.Read( () => { getNewsitesHandler( result ); }); }); + ver.version == storage.version && ver.patch != storage.patch && + storage.Write(()=> { + // when x.x.x.yyyy is silent update + //browser.tabs.create({ url: browser.extension.getURL( "options/options.html#update?patch=" + ver.patch ) }); + //localStorage.setItem( "simpread-patch-update", true ); + local.Patch( "add", true ); + }, ver.FixSubver( ver.patch, storage.simpread )); } menu.CreateAll(); + setTimeout( ()=>uninstall(), 100 ); }); /** @@ -58,17 +69,159 @@ function getNewsitesHandler( result ) { */ menu.OnClicked( ( info, tab ) => { console.log( "background contentmenu Listener", info, tab ); + tracked({ eventCategory: "menu", eventAction: "menu", eventValue: info.menuItemId }); if ( info.menuItemId == "link" ) { info.linkUrl && browser.tabs.create({ url: info.linkUrl + "?simpread_mode=read" }); } else if ( info.menuItemId == "list" ) { browser.tabs.create({ url: browser.extension.getURL( "options/options.html#later" ) }); + } else if ( info.menuItemId == "whitelist" ) { + browser.tabs.sendMessage( tab.id, msg.Add( msg.MESSAGE_ACTION.menu_whitelist, {url: info.pageUrl } )); + } else if ( info.menuItemId == "exclusion" ) { + browser.tabs.sendMessage( tab.id, msg.Add( msg.MESSAGE_ACTION.menu_exclusion, {url: info.pageUrl } )); + } else if ( info.menuItemId == "blacklist" ) { + browser.tabs.sendMessage( tab.id, msg.Add( msg.MESSAGE_ACTION.menu_blacklist, {url: info.pageUrl } )); + } else if ( info.menuItemId == "unrdist" ) { + browser.tabs.sendMessage( tab.id, msg.Add( msg.MESSAGE_ACTION.menu_unrdist, {url: info.pageUrl } )); + } else if ( info.menuItemId == "lazyload" ) { + browser.tabs.sendMessage( tab.id, msg.Add( msg.MESSAGE_ACTION.menu_lazyload, {url: info.pageUrl } )); } else { if ( !tab.url.startsWith( "chrome://" ) ) browser.tabs.sendMessage( tab.id, msg.Add(info.menuItemId)); } }); /** - * Listen runtime message, include: `shortcuts` `browser_action` + * Listen runtime message, include: `corb` + */ +browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) { + if ( request.type == msg.MESSAGE_ACTION.CORB ) { + $.ajax( request.value.settings ) + .done( result => { + sendResponse({ done: result }); + }) + .fail( ( jqXHR, textStatus, errorThrown ) => { + sendResponse({ fail: { jqXHR, textStatus, errorThrown }}); + }); + } + return true; +}); + +/** + * Listen runtime message, include: `jianguo` + */ +browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) { + if ( request.type == msg.MESSAGE_ACTION.jianguo ) { + const { url, user, password, method } = request.value; + const dav = new WebDAV.Fs( url, user, password ); + if ( method.type == "folder" ) { + dav.dir( method.root ).mkdir( result => { + dav.dir( method.root + "/" + method.folder ).mkdir( result => { + sendResponse({ done: result, status: result.status }); + }); + }) + } else if ( method.type == "file" ) { + dav.file( method.path ).write( method.content, result => { + sendResponse({ done: result, status: result.status }); + }); + } else if ( method.type == "read" ) { + dav.file( method.path ).read( result => { + sendResponse({ done: result.response, status: result.status }); + }); + } + } + //return true; +}); + +/** + * Listen runtime message, include: `webdav` + */ +browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) { + if ( request.type == msg.MESSAGE_ACTION.WebDAV ) { + const { url, user, password, method } = request.value; + const dav = new WebDAV.Fs( url, user, password ); + if ( method.type == "folder" ) { + dav.dir( method.root ).mkdir( result => { + sendResponse({ done: result, status: result.status }); + }) + } else if ( method.type == "file" ) { + dav.file( method.root + "/" + method.name ).write( method.content, result => { + sendResponse({ done: result, status: result.status }); + }); + } + } + //return true; +}); + +/** + * Listen runtime message, include: `download`, `base64` && `permission` + */ +browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) { + if ( request.type == msg.MESSAGE_ACTION.download ) { + const { data, name } = request.value; + const blob = new Blob([data], { + type: "html/plain;charset=utf-8" + }); + const url = URL.createObjectURL(blob); + browser.downloads.download({ + url : url, + filename: name.replace( /[|]/ig, "" ), + }, downloadId => { + sendResponse({ done: downloadId }); + }); + } else if ( request.type == msg.MESSAGE_ACTION.base64 ) { + const { url } = request.value; + fetch( url ) + .then( response => response.blob() ) + .then( blob => new Promise(( resolve, reject ) => { + const reader = new FileReader() + reader.onloadend = event => { + sendResponse({ done: { url, uri: event.target.result }}); + }; + reader.onerror = error => { + sendResponse({ fail: { error, url } }); + }; + reader.readAsDataURL( blob ); + })) + .catch( error => { + sendResponse({ fail: { error, url } }); + }); + } else if ( request.type == msg.MESSAGE_ACTION.permission ) { + permission.Get({ permissions: [ "downloads" ] }, result => { + sendResponse({ done: result }); + }); + } + return true; +}); + +/** + * Listen runtime message, include: `snapshot` + */ +browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) { + if ( request.type == msg.MESSAGE_ACTION.snapshot ) { + const { left, top, width, height } = request.value; + chrome.tabs.captureVisibleTab( { format: "png" }, base64 => { + const image = new Image(); + image.src = base64; + image.onload = () => { + const canvas = document.createElement( "canvas" ), + ctx = canvas.getContext( "2d" ), + dpi = window.devicePixelRatio, + sx = left * dpi, + sy = top * dpi, + sWidth = width * dpi, + sHeight = height * dpi; + canvas.width = sWidth; + canvas.height = sHeight; + ctx.drawImage( image, sx, sy, sWidth, height * dpi, 0, 0, sWidth, sHeight ); + const uri = canvas.toDataURL( "image/png" ); + sendResponse({ done: uri }); + }; + }); + } + return true; +}); + +/** + * Listen runtime message */ browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) { console.log( "background runtime Listener", request ); @@ -142,6 +295,12 @@ browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) case msg.MESSAGE_ACTION.speak_stop: browser.tts.stop(); break; + case msg.MESSAGE_ACTION.tips: + tips.Verify( request.value.code, sendResponse ); + break; + case msg.MESSAGE_ACTION.tips_norepeat: + tips.Done( request.value.code ); + break; } }); @@ -257,25 +416,15 @@ function setMenuAndIcon( id, code ) { * * @param {object} google analytics track object */ -function tracked({ eventCategory, eventAction, eventLabel }) { - console.log( "current track is", eventCategory, eventAction, eventLabel ) - ga( 'send', { - hitType : 'event', - eventCategory, - eventAction, - eventLabel - }); +function tracked({ eventCategory, eventAction, eventValue }) { + console.log( "current track is", eventCategory, eventAction, eventValue ) + _gaq.push([ '_trackEvent', eventCategory, eventValue ]); } /** - * Google analytics + * Uninstall */ -analytics(); -function analytics() { - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); - ga('create', 'UA-405976-12', 'auto'); - ga('send', 'pageview'); +function uninstall() { + browser.runtime.setUninstallURL( storage.option.uninstall ? storage.service + "/uninstall" : "" ); + tracked({ eventCategory: "install", eventAction: "install", eventValue: "uninstall" }); } \ No newline at end of file diff --git a/src/contentscripts.js b/src/contentscripts.js index 0c5358ae3..5a683aaf3 100644 --- a/src/contentscripts.js +++ b/src/contentscripts.js @@ -1,25 +1,27 @@ console.log( "=== simpread contentscripts load ===" ) import './assets/css/simpread.css'; -import './assets/css/option.css'; +import './assets/css/setting.css'; import 'notify_css'; -import Velocity from 'velocity'; -import Notify from 'notify'; +import Velocity from 'velocity'; +import Notify from 'notify'; -import {focus} from 'focus'; -import * as read from 'read'; -import * as modals from 'modals'; -import * as kbd from 'keyboard'; +import {focus} from 'focus'; +import * as read from 'read'; +import * as setting from 'setting'; +import * as kbd from 'keyboard'; +import * as highlight from 'highlight'; +import * as scheme from 'urlscheme'; -import * as util from 'util'; +import * as util from 'util'; import { storage, STORAGE_MODE as mode } from 'storage'; -import * as msg from 'message'; -import {browser} from 'browser'; -import * as watch from 'watch'; +import * as msg from 'message'; +import {browser} from 'browser'; +import * as watch from 'watch'; -import PureRead from 'puread'; -import * as puplugin from 'puplugin'; +import PureRead from 'puread'; +import * as puplugin from 'puplugin'; let pr, // pure read object is_blacklist = false, @@ -36,6 +38,7 @@ storage.Read( () => { if ( item.innerText.includes( "simpread" ) || item.innerText.includes( "sr-opt-focus" ) || item.innerText.includes( "sr-rd-theme" ) || + item.innerText.includes( "html.simpread-theme-root, .simpread-theme-root" ) || item.innerText.includes( "notify-gp" ) || item.innerText.includes( "md-waves-effect" ) ) { @@ -44,7 +47,7 @@ storage.Read( () => { }); } else { bindShortcuts(); - autoOpen(); + !isLazyload() && autoOpen(); } }); @@ -54,23 +57,21 @@ storage.Read( () => { * @return {boolean} true: is blacklist; false: is't blacklist */ function blacklist() { - for ( const item of storage.option.blacklist ) { - if ( !item.startsWith( "http" ) ) { - if ( location.hostname.includes( item ) ) { - is_blacklist = true; - break; - } - } else { - if ( location.href == item ) { - is_blacklist = true; - break; - } - } - } + is_blacklist = util.Blacklist( puplugin.Plugin( "minimatch" ), storage.option ); console.log( "current site is blacklist", is_blacklist ) return is_blacklist; } +/** + * isLazyload verify + * + * @return {boolen} true: lazyload; false: preload + */ + +function isLazyload() { + return util.Lazyload( puplugin.Plugin( "minimatch" ), storage.option ); +} + /** * Listen runtime message, include: `focus` `read` `shortcuts` `tab_selected` */ @@ -86,7 +87,13 @@ browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) bindShortcuts(); break; case msg.MESSAGE_ACTION.tab_selected: - browserAction( request.value.is_update ); + if ( isLazyload() ) { + browser.runtime.sendMessage( msg.Add( msg.MESSAGE_ACTION.browser_action, { code: 0 , url: window.location.href } )); + } else { + request.value.is_update ? + setTimeout( () => browserAction( request.value.is_update ), 200 ) + : browserAction( request.value.is_update ); + } break; case msg.MESSAGE_ACTION.read_mode: case msg.MESSAGE_ACTION.browser_click: @@ -96,19 +103,53 @@ browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) new Notify().Render( "é…置文件已更新,刷新当å‰é¡µé¢åŽæ‰èƒ½ç”Ÿæ•ˆã€‚", "刷新", ()=>window.location.reload() ); } else { if ( storage.option.br_exit ) { - modals.Exist() && modals.Exit(); - !modals.Exist() && read.Exist( false ) ? read.Exit() : readMode(); + setting.Exist() && setting.Exit(); + !setting.Exist() && read.Exist( false ) ? read.Exit() : readMode(); } else readMode(); } }); break; case msg.MESSAGE_ACTION.pending_site: - new Notify().Render({ content: "æ˜¯å¦æäº¤ï¼Œä»¥ä¾¿æ›´å¥½çš„é€‚é…æ­¤é¡µé¢ï¼Ÿ", action: "是的", cancel: "å–æ¶ˆ", callback: type => { + new Notify().Render({ content: "æ˜¯å¦æäº¤ï¼Œä»¥ä¾¿æ›´å¥½åœ°é€‚é…æ­¤é¡µé¢ï¼Ÿ", action: "是的", cancel: "å–æ¶ˆ", callback: type => { if ( type == "cancel" ) return; browser.runtime.sendMessage( msg.Add( msg.MESSAGE_ACTION.save_site, { url: location.href, site: storage.pr.current.site, uid: storage.user.uid, type: "failed" })); }}); - localStorage.removeItem( "sr-update-site" ); + break; + case msg.MESSAGE_ACTION.menu_whitelist: + case msg.MESSAGE_ACTION.menu_exclusion: + case msg.MESSAGE_ACTION.menu_blacklist: + case msg.MESSAGE_ACTION.menu_lazyload: + case msg.MESSAGE_ACTION.menu_unrdist: + const menuSrv = ( type, url ) => { + if ( type == msg.MESSAGE_ACTION.menu_whitelist ) { + storage.read.whitelist.push( url ); + new Notify().Render( "已加入到白åå•。" ); + } else if ( type == msg.MESSAGE_ACTION.menu_exclusion ) { + storage.read.exclusion.push( url ); + new Notify().Render( "已加入到排除列表。" ); + } else if ( type == msg.MESSAGE_ACTION.menu_blacklist ) { + storage.option.blacklist.push( url ); + new Notify().Render( "已加入到黑åå•。" ); + } else if ( type == msg.MESSAGE_ACTION.menu_lazyload ) { + storage.option.lazyload.push( url ); + new Notify().Render( "已加入到延迟加载。" ); + } else if ( type == msg.MESSAGE_ACTION.menu_unrdist ) { + storage.UnRead( "add", util.GetPageInfo(), success => { + success && new Notify().Render( 0, "æˆåŠŸåŠ å…¥æœªè¯»åˆ—è¡¨ã€‚" ); + !success && new Notify().Render( 0, "å·²åŠ å…¥æœªè¯»åˆ—è¡¨ï¼Œè¯·å‹¿é‡æ–°åŠ å…¥ã€‚" ); + }); + } + storage.Write( () => { + watch.SendMessage( "option", true ); + }); + }; + if ( storage.option.urlscheme && /whitelist|exclusion|blacklist|lazyload/ig.test( request.type )) { + scheme.Render( request.type.replace( "menu_", "" ), storage.option.urlscheme, ( type, off, value ) => { + storage.option.urlscheme = off; + menuSrv( "menu_" + type, value ); + }); + } else menuSrv( request.type, request.value.url ); break; } }); @@ -121,9 +162,9 @@ function bindShortcuts() { kbd.Bind( [ storage.read.shortcuts.toLowerCase() ], readMode ); kbd.ListenESC( combo => { if ( combo == "esc" && storage.option.esc ) { - modals.Exist() && modals.Exit(); - !modals.Exist() && focus.Exist() && focus.Exit(); - !modals.Exist() && read.Exist() && read.Exit(); + setting.Exist() && setting.Exit(); + !setting.Exist() && focus.Exist() && focus.Exit(); + !setting.Exist() && read.Exist() && read.Exit(); } }); } @@ -179,10 +220,16 @@ function readMode() { } else if ( pr.state == "temp" && pr.dom ) { read.Render(); } else { - new Notify().Render( "当å‰å¹¶æœªé€‚é…阅读模å¼ï¼Œè¯·ç§»åŠ¨é¼ æ ‡æ‰‹åŠ¨ç”Ÿæˆ ä¸´æ—¶é˜…è¯»æ¨¡å¼ã€‚" ); + new Notify().Render( "智能感知 正文失败,请移动鼠标,并通过 手动框选 的方å¼ç”Ÿæˆæ­£æ–‡ã€‚" ); read.Highlight().done( dom => { - pr.TempMode( mode.read, dom ); - read.Render(); + const rerender = element => { + pr.TempMode( mode.read, dom ); + read.Render(); + }; + storage.current.highlight ? + highlight.Control( dom ).done( newDom => { + rerender( newDom ); + }) : rerender( dom ); }); } } @@ -190,13 +237,21 @@ function readMode() { } /** - * Auto open read mode + * Auto open read mode, include: + * + * - http://xxxx?simpread_mode=read + * - auto && location.href not include exclusion list + * - location.href include white list */ function autoOpen() { getCurrent( mode.read ); - if ( window.location.href.includes( "simpread_mode=read" ) || - ( storage.current.auto && util.Exclusion( puplugin.Plugin( "minimatch" ), storage.current )) || - ( !storage.current.auto && util.Whitelist( puplugin.Plugin( "minimatch" ), storage.current )) + const suffix = window.location.href.includes( "simpread_mode=read" ), + auto = storage.current.auto, + minimatch = puplugin.Plugin( "minimatch" ), + whitelist = util.Whitelist( minimatch, storage.current ), + exclusion = util.Exclusion( minimatch, storage.current ); + if ( + suffix || whitelist || ( auto && exclusion == false ) ) { switch ( storage.current.site.name ) { case "my.oschina.net": @@ -215,6 +270,7 @@ function autoOpen() { break; default: pr.state == "adapter" && readMode(); + pr.state == "temp" && pr.current.site.html != "" && whitelist && readMode(); break; } } @@ -267,6 +323,8 @@ function browserAction( is_update ) { */ function pRead() { pr = new PureRead( storage.sites ); + pr.cleanup = storage.read.cleanup == undefined ? true : storage.read.cleanup; + pr.pure = storage.read.pure == undefined ? false : storage.read.pure; pr.AddPlugin( puplugin.Plugin() ); pr.Getsites(); storage.puread = pr; diff --git a/src/focus/controlbar.jsx b/src/focus/controlbar.jsx index a147f5965..41247f90d 100644 --- a/src/focus/controlbar.jsx +++ b/src/focus/controlbar.jsx @@ -1,18 +1,19 @@ console.log( "=== simpread focus controlbar load ===" ) -import * as modals from 'modals'; -import * as se from 'siteeditor'; -import * as conf from 'config'; -import { storage } from 'storage'; -import * as output from 'output'; -import * as watch from 'watch'; -import {browser,br}from 'browser'; -import * as msg from 'message'; +import * as setting from 'setting'; +import * as se from 'siteeditor'; + +import * as conf from 'config'; +import { storage } from 'storage'; +import * as output from 'output'; +import * as watch from 'watch'; +import {browser,br} from 'browser'; +import * as msg from 'message'; import * as highlight from 'highlight'; import Fab from 'fab'; -let timer, $root, selector, callback; +let focusItems, $root, selector, callback; const tooltip_options = { target : "name", @@ -32,6 +33,13 @@ class FControl extends React.Component { }); } + onClose() { + setTimeout( ()=> { + $( "fab-bg" ).css({ width: '100px' }) + $( "fab" ).find( "ul[type=hori]" ).css({ opacity: 0, visibility: "hidden" }) + }, 200 ); + } + onAction( event, type ) { console.log( "fab type is =", type ) @@ -44,10 +52,12 @@ class FControl extends React.Component { $( "html, body" ).animate({ scrollTop: 0 }, "normal" ); break; case "setting": - modals.Render( ()=>setTimeout( ()=>se.Render(), 500 )); + setting.Render( ()=>setTimeout( ()=>se.Render(), 500 )); + this.onClose(); break; case "siteeditor": se.Render(); + this.onClose(); break; case "remove": new Notify().Render( "ç§»åŠ¨é¼ æ ‡é€‰æ‹©ä¸æƒ³æ˜¾ç¤ºçš„内容,åªé’ˆå¯¹æœ¬æ¬¡æœ‰æ•ˆã€‚" ); @@ -64,7 +74,7 @@ class FControl extends React.Component { break; default: if ( type.indexOf( "_" ) > 0 && type.startsWith( "share" ) || - [ "save", "markdown", "png", "epub", "pdf", "kindle", "temp", "html", "dropbox", "pocket", "instapaper", "linnk", "yinxiang","evernote", "onenote", "gdrive" ].includes( type )) { + [ "save", "markdown", "offlinemarkdown", "png", "epub", "pdf", "kindle", "temp", "bear", "ulysses", "html", "offlinehtml", "dropbox", "pocket", "instapaper", "linnk", "yinxiang","evernote", "onenote", "gdrive", "jianguo", "yuque", "notion", "youdao", "weizhi" ].includes( type )) { const [ title, desc, content ] = [ $( "head title" ).text().trim(), "", $( ".simpread-focus-highlight" ).html().trim() ]; output.Action( type, title, desc, content ); } @@ -80,8 +90,9 @@ class FControl extends React.Component { } componentWillMount() { + focusItems = $.extend( true, {}, conf.focusItems ); if ( storage.current.site.name.startsWith( "metaread::" ) || storage.current.site.name.startsWith( "txtread::" ) ) { - delete conf.focusItems.option; + delete focusItems.option; } } @@ -93,7 +104,7 @@ class FControl extends React.Component { render() { return ( - this.onAction(event, type ) } /> + this.onAction(event, type ) } /> ) } diff --git a/src/focus/focus.js b/src/focus/focus.js index 06932f628..afffd518a 100644 --- a/src/focus/focus.js +++ b/src/focus/focus.js @@ -6,6 +6,8 @@ var storage = require( "storage" ).storage, fcontrol = require( "controlbar" ), tooltip = require( "tooltip" ), waves = require( "waves" ), + browser = require( "browser" ).browser, + msg = require( "message" ), focus = ( function () { var $parent, @@ -67,6 +69,7 @@ var storage = require( "storage" ).storage, tooltip.Render( bgclsjq ); waves.Render({ root: bgclsjq }); storage.Statistics( "focus" ); + browser.runtime.sendMessage( msg.Add( msg.MESSAGE_ACTION.track, { eventCategory: "mode", eventAction: "focusmode", eventValue: "focusmode" }) ); // click mask remove it $( bgclsjq ).on( "click", function( event, data ) { diff --git a/src/ga.js b/src/ga.js new file mode 100644 index 000000000..ac94924d9 --- /dev/null +++ b/src/ga.js @@ -0,0 +1,22 @@ + +/** + * Track using the asynchronous tracking API. + * + * See http://code.google.com/apis/analytics/docs/tracking/asyncTracking.html + * for information on how to use the asynchronous tracking API. + * _gaq.push(['_trackEvent', e.target.id, 'clicked']); + */ + +var _AnalyticsCode = 'UA-405976-14'; +var _gaq = _gaq || []; +_gaq.push(['_setAccount', _AnalyticsCode]); +_gaq.push(['_trackPageview']); + +(function() { + var ga = document.createElement('script'); + ga.type = 'text/javascript'; + ga.async = true; + ga.src = 'https://ssl.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(ga, s); +})(); \ No newline at end of file diff --git a/src/help_tips.json b/src/help_tips.json new file mode 100644 index 000000000..7e07d1fba --- /dev/null +++ b/src/help_tips.json @@ -0,0 +1,64 @@ +{ + "tips": [ + { + "idx": 0, + "name": "文档中心", + "icon": "", + "url": "http://ksria.com/simpread/docs" + }, + { + "idx": 1, + "name": "新手入门å¯ä»¥çœ‹è¿™ç¯‡æ–‡ç« ", + "icon": "", + "url": "http://ksria.com/simpread/guide/" + }, + { + "idx": 2, + "name": "查看当å‰ç‰ˆæœ¬æ–°å¢žåŠŸèƒ½", + "icon": "", + "url": "#" + }, + { + "idx": 3, + "name": "查看当å‰é¡µçš„功能æè¿°", + "icon": "", + "url": "#" + }, + { + "idx": 4, + "name": "简悦的汇总(新闻页)", + "icon": "", + "url": "https://simp.red/news" + }, + { + "idx": 5, + "name": "请通过 Github issues æé—®", + "icon": "", + "url": "https://github.com/Kenshin/simpread/issues/new" + }, + { + "idx": 6, + "name": "如果简悦暂时未支æŒä½ ä½¿ç”¨çš„导出æœåŠ¡", + "icon": "", + "url": "https://github.com/Kenshin/simpread/issues/473" + }, + { + "idx": 7, + "name": "YouTube 加载出错的朋å‹è¯·çœ‹è¿™é‡Œ", + "icon": "", + "url": "https://github.com/Kenshin/simpread/issues/487" + }, + { + "idx": 8, + "name": "当使用简悦疑似页é¢å˜æ…¢çš„å¤„ç†æ–¹å¼", + "icon": "", + "url": "@performance" + }, + { + "idx": 9, + "name": "当阅读模å¼å¹¶æœªç¬¦åˆä½ çš„æœŸæœ›æ—¶ï¼Œå¦‚何进一步优化?", + "icon": "", + "url": "https://github.com/Kenshin/simpread/issues/522" + } + ] +} \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index aa4c4afff..edbb471fb 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "name" : "__MSG_extension_name__", "default_locale" : "en", - "version" : "1.1.2.1025", + "version" : "1.1.4.6025", "short_name" : "SimpRead", "description" : "__MSG_extension_desc__", "homepage_url" : "http://ksria.com/simpread", @@ -15,14 +15,16 @@ "contextMenus", "tabs", "storage", - "tts" + "tts", + "" ], + "optional_permissions": [ "cookies", "https://*.youdao.com/", "downloads" ], "background": { - "scripts" : [ "/bundle/common.js", "/bundle/background.js" ] + "scripts" : [ "/ga.js", "/bundle/common.js", "/bundle/background.js" ] }, "content_scripts" : [ { - "matches" : [ "http://*/*", "https://*/*", "file:///*/*.txt" ], + "matches" : [ "http://*/*", "https://*/*", "file:///*/*.txt", "file:///*/*.md" ], "exclude_matches": [ "http://localhost/*", "https://simpread.herokuapp.com/view/*" ], "js" : [ "/bundle/common.js", @@ -40,10 +42,11 @@ "options_page" : "options/options.html", "web_accessible_resources": [ "/assets/images/*", - "website_list.json" + "website_list.json", + "options/corb.html" ], "offline_enabled" : true, "update_url" : "https://clients2.google.com/service/update2/crx", - "content_security_policy" : "script-src 'self' https://www.google-analytics.com; object-src 'self'", + "content_security_policy" : "script-src 'self' 'unsafe-eval' https://ssl.google-analytics.com; object-src 'self'", "manifest_version": 2 } \ No newline at end of file diff --git a/src/module/about.jsx b/src/module/about.jsx index b8c42fc4d..2b31ac216 100644 --- a/src/module/about.jsx +++ b/src/module/about.jsx @@ -58,7 +58,7 @@ urls = { }, badges: { - version: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAAUCAMAAAA6JNosAAACiFBMVEUrqgBVVVU/uBJOxyE9txBNTU1PT09PySJfX19RyiNfX18/uhJNyCBdXV1PT089tw9NTU0ugw4uhA4wiA4wiA8wiQ8wig8xjQ8yjw83jxY3nBE5OTk5kBk7mRc8PDw8mRg8qhI9PT09tw8+Pj4+phg+shM+uBA/Pz8/uRFAuhJBQUFBrxdBuxNCQkJCvBRDtBhDvRVDvRZEREREvhZFRUVFuxlFvhdFvxdGvRlGwBhHR0dHwBpHwRlIwRpIwRtIwhpJSUlJwxtKSkpKxBxLS0tLxR1MTExMxh5NTU1NnS9Nxx9OTk5OyCBPT09PySFQUFBQyiJRUVFSUlJTU1NUVFRVVVVWVlZWxCxXV1dXxS5XyCxYWFhZWVlaWlpbW1tcXFxdXV1dyjReXl5fX19iYmJjY2NkZGRlZWVlyT9mZmZnZ2dpwkhqw0hruU5rxElsbGxsxEpsxUttxkxubm5vb29ycnJy0U51dXV30FV4vl55eXl5umB9fX19zl5+fn5/f3+BgYGCgoKDg4OEhISFhYWGhoaIiIiJiYmKioqLi4uOjo6VxoKYmJiampqcnJydnZ2jo6OlpaWpqamr1Jut5Jmvr6+v45uw5J2x5J2y5J+zs7O1tbW2tra5ubm9vb2/3rTC4bfExMTE6rXFxcXGxsbG7LfIyMjJycnJ7bvKysrLy8vL6cDMzMzQ0NDR0dHU1NTV1dXW1tbX6s/Z8s/a2trc3Nzd3d3e3t7e8dff39/g4ODh4eHi4uLj4+Pj797j79/j8N/l5eXm5ubn5+fo6Ojo9+Po+OPq6urr+Obs+eft7e3t9uru7u7v7+/v+Ozw8PDx8fHy8vL39/f6+vr7+/v9/vz+/v7///8QYwojAAAAEXRSTlMGBo2Njo6Ojo7j4+jo6Ons7CIlfBEAAAABYktHRNeQslo/AAACPUlEQVQ4y5XK91fTUBTA8YcT96wLRSvOqLUqDhRFRBGttea9JD5t02JxgXvgXjhAcW/FBeJe1IFIsRUnxVkbNf+OyUs8p6dVT97nh5dv7r0gIbF1HqV5BrRqCUCil9pcQ5qCdrnU5hjSFnjozTYGuOnNNAaI9GYYA1z/J3njZ1nEmQ/ypthaeLOx8c4irbOA8x/c2qfgL6tMYtWsV+tja/723j1PX9c6E2Di1CWMl3734h2Pa6qLMJbP3jpxo672HsaSBxfX1lVtVGYnK54fIscZxMix9etia8KwSZO3PtE6AwhE3meXcPwyv9jPMbjBLcglo/dUMoxdECQxP5zLlD4TBLkoVWwgx+m6+rXxlT7l/mG9AE/AByV8dSFf/MXnqwqs4WXEL3l3pVTkecl18DbL5/zw8jLLw4hTPU7TBVfHV9rFawP0ApzmQGXhazu37xHDMCkOTkYcO3FX2Vs3Jzn33+U4QfKoMy7iVG/H64Ir4+t8ed9xegKkYb9dPYaQK7wXoW0IyQgtE6dP/ZiPJOwJb0BHfFCdoQhWb8fogiuUZ8uC6LpQ3mfUnzWAGrbslwdCR4Ev8KYCQhnC3X7/y6N2KAmOzTWBhyKZwYig3lqJc6GfX99brS92RtVy+VMo9FTbWwGrG5FkU97slORkhmWTWHaa2WxOVcqhVPJgG5mpfwoL0cvUuUs3i6V7v6ga2KmrydRD21uAg95wY4Cd3lBjQHsbtSGGtAEtcqgNMqQJSGjeMZtSfwM6NAO/AS+YQbktyUjWAAAAAElFTkSuQmCC", + version: "data:image/png;base64,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", website: "data:image/png;base64,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", githubstar: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAAAUCAMAAAAQlCuDAAACplBMVEVVVVXVVSvmcjP0gEFNTU1PT09fX1/kbzD2gUJfX1/3g0VdXV3nczT1gkJPT09NTU3kcDE5OTk7Ozs8PDw9PT0+Pj5BQUFCQkJDQ0NERERFRUVISEhJSUlMTExNTU1OTk5PT09QUFBRUVFSUlJTU1NUVFRVVVVWVlZXV1dYWFhZWVlaWlpbW1tcXFxdXV1eXl5fX19gYGBiYmJlZWVnZ2dra2t4eHh8fHx/f3+CgoKGhoaIiIiJiYmKioqLi4uMjIyQkJCTk5OZmZmampqenp6fn5+jUiajo6OkpKSmpqanp6eqqqqrq6usrKyuVyivWCivWCmwsLCxYDSzXCy0XC21Wyq1XCy3XCq4Xi65YTG6Zzq7Xiu9YS/BajvCwsLDYi3Dw8PEZjTEb0DExMTFxcXGxsbHZC7Hx8fIZjLKjGzPz8/QazTSqJDTqJHVbDPVk2/V1dXWazLWcjzW1tbZczzb29vcnXrcrJLc3NzdgE7d3d3e3t7f39/g4ODht6DicjXkcDHkdDfk5OTlcTLlczXlxrXl5eXmcjPmdTfml2znczTodDXoe0DpdTbpdzjpfULp6enqdjfq6urrdzjreTrrejzrhk/rmWzrzr/r1srseDnsez3sgkjs1MfteTrtfUHthU3twant1cjt7e3uejvvezzvfkDv0sLv7+/wfD3wfkDwgEPwhEnwlGHwzLjw8PDxfT7xfkDxoXXxrorx8fHyfj/y8vLzf0Dzpnz0gEH1gUL1so71v6L149n2gkP3g0T3wKL3waP37Ob37+v39/f4vZ34yK74z7n46eD4+Pj50Lr52Mf58/D60r361MD61sL61sP65tv6+vr73s/739D739H75tr759z76N376uD85dj85tr859z87OT9/f3+/fz+/f3///9Ftc+TAAAAEXRSTlMGBo2Njo6Ojo7j4+jo6Ons7CIlfBEAAAABYktHROFfCM+mAAACOUlEQVQYGZXBT0iTYQDH8e/7vs82l6ibYgYWMrE0QaE/VEKXBJMIBKVDHSLoUhSdO3axbqVEERFENwnqVpMIIoIoioIuSRCUFSFWrkzd9u7Z++udUgnhXJ+PQ9Rrp1IjrGx/kDfRzYhKiZXdoc9EROUs5awxraJyopxbRvyHgLKM+A8BZblabswohZTWcmn9UfgrYQv/MGKZoz4XBwIQy4nf8vzRPOnxlyNCrhY1HR5M3ZWumw6vvz9Cy4FjjYqfl9ybEm1Dh9ZqkQ25bdu2ttt1Tnenm9qybZNn7a6mjUlbYkSo5viZTBeC4FlxrFhH/uqGI5eDQAjB/LXG4eE5QgJiz+878f6x02e1e3xWbX1TkP5c10PIiFA8bRMfEaiauiJMJmZ2XhFCCD4lsumqn4R84Mm+7tkJfwe9HoMpZ2raB9uLT8iIUDHiqgqBhASuTAGL8BDEcp4biJAFqkY3bB14VMCPNDSesw09FtZbFhkRmut79X0dAul1/CcgUC5T+6MBQdP75J7HIpQHWqo/PGzNFr/Fsm+/dlc3Z/IQybPIiNDs6ND8y9cCaWTQv40Acan3yzQC72D0wrxLKACyfVHncn39jVPF63avHW8JIGCJ00qJZp2OjgdkEk4u79R8T0Im4fh5x8slycR9xaOUnAQ+vUNN7byZcrdPWGMWdnGvnyVOipLOLi/zMMtqTlCWESUvnsqNe6xGlGVmkoRiMUCspkg5Z002QeUs5SyYwufqWipVZGWjWf0CDsxBCuuBMAQAAAAASUVORK5CYII=", changelog: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAAUCAYAAABGUvnzAAAABmJLR0QA/wD/AP+gvaeTAAAHa0lEQVRo3uVaaVBU2RV+wYaBmCjjZOJU1kqmUpU/k7/GuFdpLHdFBXcrrj/G/LDUcSGoQUPQCIWZlDNYwdHBYQAdkc1MsyPQsjWLCrgAAg0KCAOoLCL45X6HvGfTpbGtwrFq+lR91eee7fZ7X59zr5Ta8uXLPdavXx+qYFOAK+CdtPLvOmzj0stCtdhYD43krlu3Dq6EcallLgHvlJIQbe3atc0KcCW8nVLqEvBOLWvW1qxZA1eDt7nEZaCtXr0aroaxX1tdBtqqVavgahjzn2KXgbZy5Uo4i/7+frmkvErOm8Tg4OBz7T+8VOQUKM7GjgT6Bp/iXdV1I1lTW7FiBZzF1q1b8SrxrwqOz5GsR4KfZ/9BcqFToDgbOxLoGxjAjy6NbE3Nz88P9uAt02KxoL6+Hnfu3EFRUZHhYwfzkkKdEhUVJXHNzc04cOAAkpKS0NDQINi+fbuRR0lMTMTly5dx48YNHDt2bJgvLi4O+fn5iIiIEFtAQAAqKytRW1uL6upqBAYGGvG5ubmoqamRfQsLC7FhwwbDFxISgqamJsmLjY0Vgh2fjxidVDAMf7RUoqDjIa51deOqwuwrlWKn+Fc2iK22uw9+RbeMnJimNpR0PpKchHvf4Kdmq+GjBFQ1SIxVxdjnrbXexs2HvWI/eMOGgadPDV/fkwG8kzyk+xTeRLmqff1BN7LauvBBZrlTNRyh+fr6wh7BwcHIy8vDjBkzBIsWLTJ8JJhnGHVKWFiYxBw8eBC9vb3Yt28fpk+fjhMnTiAzM9PIoxw5cgSzZs3C4sWLcf/+fWzevHmYb+bMmZg3b54QVldXh2XLlkltEtLa2irdzXjdTvAHceHCBbFv2bIFXV1dMoLpO3XqlBDs+HzE9xPzDfxCEXO/7zGmfB4Hz79/gtHBn+K98+nio2zLKRH77/8djYZHPUbez8JjxE4E5BbjHzdtho+y3GyBZ9gZ/PaTL4y8X6dY0dLbh/c/PgNPtc9HljIMqLGs55HgcUn5+JWKa1Pf6YPwKKn/oTkHRe1dTtVwhKb+kgV7bNy4UTrSbDYjNDRUCNV9JJgvkDplyZIlopOUzs5OLFy4UNY7duzA9evXjTwKiaG+dOlS6UL+kHQfbXos7R0dHaioqBCwjs1mw7Zt28QfHh4u3V1VVSWdXFBQIPajR49KXR8fH1mTSBLs+HyEV8IVA75XKpBWUw/PqJQhW7wFXnE5olO8P0sQ3TM6FT1PnmCMIoDrP5feRm77A+QplLd14FJdk1GTMiby0tD6XCa6+4fyVqi94quq4XU+S3zjT8cLOXoeCX478Qr8VFxKdR28YjPEPjriIh4PDOLHany/rIYjNL54e5C02bNnY//+/TJW7927J91DHwnmGUZdJ4b6pk2bpMv0Grt27RIS9DWFlzN9TVI4dh3rEIcPH0Z5ebnRpcTUqVOl83fv3o3Gxkb5IdHOiWG1WiUvKCgI2dnZRh1+ZxLs+HyEpyJRx7L0IqTdaRxm00HxvJhrrB897od3ggV/yL6KW50PMT7sM3ioLvKJTUZGfdNL8/wyixB/u86wj0+0CDn6mgQzzjejCCm1NsM+WuGxOp/fdaKGIzS+XHtwdLJrOS7nzJmD9vZ2GX/0kWCOTOo6MQS7ngTr6507dwrB+ppy+vRp0dmJ7HYS4FiH4ITgqD106JBh27t3r3zynC8tLZUfIddZWVlCMHXeDVpaWuSHxDWPDxLs+HzEWxfzDPzky6/R0t2DyYo0rvky31PnIHWKfSyJGpuQh3kZxciua8RbX2WLPbqmEelc/y/uRXm/jElBq9rrfXOx2D+6WiPk6HEkmHE/jzajracXv0srEfuHpdUosN1V+11+aQ1HaBxp9uBL5BlI8LJ08uRJOYfpI8EcfdQpeg5HNAnW1zrB+poSGRkpNdmBe/bskY50rEPQzts6xzNH8927d43Ru2DBAqSlpaGkpAQ5OTlykSLBep6/v7/sy/P/7NmzQrDj8xEecbnPoEbotIgYFLZ1olJdaK51PcLM7DLxUexjSdSY+Fx4fZ6M6IrbMDd/g2hbK0KLrwnBetyL8jzUyF19Lhm31D5l6oL0N2sl2hWRehwJHorLxMKzcSjveICqBz3IbGqVs1ziXlLDERq7wR5z587FlClTDPBipPsmTpwoL1LXdTtH5qRJk4z1/PnzZazqawrrsN7kyZNlMtjXdPwOej5jCY5j3UedFzl+8mI2bdo0w8e6zKOP+z2vNuF+IWc4FGGmw/+CKfCfMB36GO5nksQ+am/wsDjTX47CXXWtu+ok07EImILDhz6PR8KkLkN63AvzlD5WnZmmvx6Xff6UakHyzZpncf7P4txPxUuMKfD4UO2oVCPu/9VwhEbCXjco38Y+zsJEgt4QgirrYVX/JGP3pTe24Deffvlaa2gcv68bEyZMwLexj7MYdT77zUF1u5uaFG6qM92CTmDUF+bXWoMEt3DEuhLczmW5Br7KbibBoby8uBK+py4xrgC381kh/EOHh3poktzGy40rQIvJ+G4jNrNNO5ch/2XnvyqleyAtV3GuAAAAAElFTkSuQmCC", @@ -74,7 +74,7 @@ export default class About extends React.Component {
简悦 SimpRead
-
让你瞬间进入沉浸å¼é˜…读的扩展
+
为你æä¾›ã€Œå¦‚æ‚志般沉浸å¼é˜…读体验ã€çš„æ‰©å±•
@@ -89,9 +89,9 @@ export default class About extends React.Component {
-
帮助
+
帮助
-
+
简悦是一个å…费且开æºçš„项目 @@ -111,27 +111,27 @@ export default class About extends React.Component {
-
其它平å°çš„简悦
+
其它平å°çš„简悦
-
+
包括但ä¸é™äºŽï¼šChrome · Firefox · Safari · Apple Safari · Microsoft Edge · Opera · iPhone · iPad
-
å馈
+
å馈
如果有任何问题请æäº¤ issues @@ -145,13 +145,13 @@ export default class About extends React.Component {
-
- å¯ä»¥åœ¨ Twitter 或 æ–°æµªå¾®åš ä¸Šå…³æ³¨æˆ‘ +
+ å¯ä»¥åœ¨ Twitter 或 æ–°æµªå¾®åš ä¸Šå…³æ³¨æˆ‘
-
其它作å“
+
其它作å“
GNVM - 使用 Go 语言编写的 Node.js 多版本管ç†å™¨ diff --git a/src/module/account.jsx b/src/module/account.jsx index 65318de0e..edf389fab 100644 --- a/src/module/account.jsx +++ b/src/module/account.jsx @@ -121,7 +121,7 @@ export default class AccountOpt extends React.Component { this.onChangeEmail(e) } disable={false} /> diff --git a/src/module/actionbar.jsx b/src/module/actionbar.jsx index 3aad9143b..f0abdfc46 100644 --- a/src/module/actionbar.jsx +++ b/src/module/actionbar.jsx @@ -32,7 +32,7 @@ export default class Actionbar extends React.Component { const obj = this.props.items[key].items[item]; return (
} + +
+ this.onChange( "yuque", s ) } /> +
+ +
+ this.onChange( "notion", s ) } /> + + { this.state.secret.notion.access_token && +
+ { this.state.notion ? this.save( "notion", v ) } /> + :
} +
+ +
+ this.onChange( "youdao", s ) } /> + + { this.state.secret.youdao.access_token && +
+ { this.state.youdao ? this.save( "youdao", v ) } /> + :
} +
+ +
+ this.onChange( "weizhi", s ) } /> +
+ { this.state.weizhi && +
+
+ this.weizhiOnChange( "username", evt.target.value ) } + /> + this.weizhiOnChange( "password", evt.target.value ) } + /> +
+ +
} + +
+
WebDAV
+
简悦支æŒä»»æ„ WebDAV çš„æœåŠ¡ï¼ŒåŒ…æ‹¬ï¼šBox · TeraCLOUD ç­‰
+ this.webdavOnChange(e) } + /> +
+
; } diff --git a/src/module/common.jsx b/src/module/common.jsx index 60d4c455d..b51667614 100644 --- a/src/module/common.jsx +++ b/src/module/common.jsx @@ -9,7 +9,8 @@ import * as ver from 'version'; import * as menu from 'menu'; import * as watch from 'watch'; import * as exp from 'export'; -import {br} from 'browser'; +import {browser,br}from 'browser'; +import * as msg from 'message'; export default class CommonOpt extends React.Component { @@ -23,20 +24,43 @@ export default class CommonOpt extends React.Component { sync() { let notify; - const dbx = exp.dropbox, - read = () => { + const dbx = exp.dropbox, + jianguo = exp.jianguo, + write = () => { + storage.option.sync = Now(); + storage.Write( () => { + writeConfig(); + }); + }, + readDropbox = () => { notify = new Notify().Render({ content: "æ•°æ®åŒæ­¥ä¸­ï¼Œè¯·ç¨ç­‰...", state: "loading" }); dbx.Exist( dbx.config_name, ( result, error ) => { if ( result == -1 ) { - storage.option.sync = Now(); - storage.Write( () => { - dbx.Write( dbx.config_name, storage.Export(), callback ); - }); + write(); } else { dbx.Read( dbx.config_name, callback ); } }); }, + readJianguo = ( obj ) => { + notify = new Notify().Render({ content: "æ•°æ®åŒæ­¥ä¸­ï¼Œè¯·ç¨ç­‰...", state: "loading" }); + jianguo.Read( obj.username, obj.password, jianguo.config_name, result => { + if ( result && result.status == 404 ) { + write(); + } else if ( result && result.status == 200 ) { + callback( "read", result.done ); + } + }); + }, + writeConfig = () => { + if ( storage.option.save_at == "dropbox" ) { + dbx.Write( dbx.config_name, storage.Export(), callback ); + } else { + jianguo.Add( storage.secret.jianguo.username, storage.secret.jianguo.password, jianguo.root + "/" + jianguo.config_name, storage.Export(), result => { + callback( "write", undefined, result && [ 201, 204 ].includes( result.status ) ? undefined : "error" ); + }); + } + }, callback = ( type, result, error ) => { notify.complete(); switch ( type ) { @@ -50,11 +74,8 @@ export default class CommonOpt extends React.Component { remote = new Date( json.option.update.replace( /å¹´|月/ig, "-" ).replace( "æ—¥", "" )); if ( ver.Compare( json.version ) == 1 ) { new Notify().Render( "本地版本与远程版本ä¸ä¸€è‡´ï¼Œä¸”本地版本较新,是å¦è¦†ç›–远程版本?", "覆盖", () => { - storage.option.sync = Now(); - storage.Write( () => { - watch.SendMessage( "import", true ); - dbx.Write( dbx.config_name, storage.Export(), callback ); - }, storage.simpread ); + watch.SendMessage( "import", true ); + write(); }); } else if ( local < remote ) { @@ -69,11 +90,8 @@ export default class CommonOpt extends React.Component { }); } else if ( local > remote ) { new Notify().Render( "本地é…置文件较新,是å¦è¦†ç›–远程备份文件?", "覆盖", () => { - storage.option.sync = Now(); - storage.Write( () => { - watch.SendMessage( "import", true ); - dbx.Write( dbx.config_name, storage.Export(), callback ); - }, storage.simpread ); + watch.SendMessage( "import", true ); + write(); }); } else { new Notify().Render( "本地与远程数æ®ç›¸åŒï¼Œæ— éœ€é‡å¤åŒæ­¥ã€‚" ); @@ -83,26 +101,32 @@ export default class CommonOpt extends React.Component { }; storage.Safe( ()=> { - const sec_dbx = storage.secret.dropbox; - !sec_dbx.access_token ? - new Notify().Render( `未对 ${ dbx.name } 授æƒï¼Œè¯·å…ˆè¿›è¡ŒæŽˆæƒæ“作。`, "授æƒ", () => { - dbx.New().Auth(); - dbx.dtd - .done( () => { - sec_dbx.access_token = dbx.access_token; - storage.Safe( () => { - new Notify().Render( "æŽˆæƒæˆåŠŸï¼" ); - read(); - }, storage.secret ); - }) - .fail( error => { - console.error( error ) - new Notify().Render( 2, `èŽ·å– ${ dbx.name } 授æƒå¤±è´¥ï¼Œè¯·é‡æ–°èŽ·å–。` ); - }); - }) : ( () => { - dbx.access_token = sec_dbx.access_token; - read(); - })(); + browser.runtime.sendMessage( msg.Add( msg.MESSAGE_ACTION.track, { eventCategory: "sync", eventAction: "sync", eventValue: storage.option.save_at }) ); + if ( storage.option.save_at == "dropbox" ) { + const sec_dbx = storage.secret.dropbox; + !sec_dbx.access_token ? + new Notify().Render( `未对 ${ dbx.name } 授æƒï¼Œè¯·å…ˆè¿›è¡ŒæŽˆæƒæ“作。`, "授æƒ", () => { + dbx.New().Auth(); + dbx.dtd + .done( () => { + sec_dbx.access_token = dbx.access_token; + storage.Safe( () => { + new Notify().Render( "æŽˆæƒæˆåŠŸï¼" ); + readDropbox(); + }, storage.secret ); + }) + .fail( error => { + console.error( error ) + new Notify().Render( 2, `èŽ·å– ${ dbx.name } 授æƒå¤±è´¥ï¼Œè¯·é‡æ–°èŽ·å–。` ); + }); + }) : ( () => { + dbx.access_token = sec_dbx.access_token; + readDropbox(); + })(); + } else { + const jianguo = storage.secret.jianguo; + !jianguo.access_token ? new Notify().Render( 2, `åšæžœäº‘ æŽˆæƒ åŽæ‰èƒ½ä½¿ç”¨æ­¤åŠŸèƒ½ï¼Œå¦‚ä½•æŽˆæƒ è¯·çœ‹è¿™é‡Œã€‚` ) : readJianguo( storage.secret.jianguo ); + } }); } @@ -112,7 +136,7 @@ export default class CommonOpt extends React.Component { onload = event => { if ( event && event.target && event.target.result ) { try { - let json = JSON.parse( event.target.result ); + let json = ver.FixSubver( ver.patch, JSON.parse( event.target.result )); const result = ver.Compare( json.version ); if ( result < 0 ) { result == -1 && new Notify().Render( 2, "上传失败,当å‰ç‰ˆæœ¬å¤ªä½Žï¼Œè¯·å‡çº§ç®€æ‚¦ã€‚" ); @@ -128,13 +152,15 @@ export default class CommonOpt extends React.Component { storage.version != json.version && storage.Fix( json.read.sites, json.version, storage.version, json.focus.sites ); json = ver.Verify( json.version, json ); - new Notify().Render( "上传版本太低,已自动转æ¢ä¸ºæœ€æ–°ç‰ˆæœ¬ã€‚" ); + new Notify().Render({ type: 2, content: `上传版本太低,已自动转æ¢ä¸ºæœ€æ–°ç‰ˆæœ¬ã€‚`, state: "holdon" }); } menu.Refresh( json.option.menu ); + ver.Incompatible( json.version, json ) && new Notify().Render({ type: 2, content: `检测到你曾ç»ä¿®æ”¹è¿‡ç¬¬ä¸‰æ–¹é€‚é…æºï¼ŒåŠ¡å¿…åˆ·æ–°åŽé‡æ–°å¯¼å…¥ï¼è¯¦ç»†è¯´æ˜Ž`, state: "holdon" }); + ver.VerifyPlugins( json.option ) && new Notify().Render({ type: 2, content: `已清ç†å¤±æ•ˆçš„æ’ä»¶ï¼Œè¯¦ç»†è¯·çœ‹ 失效æ’ä»¶`, state: "holdon" }); json.option.origins && json.option.origins.length > 0 && - new Notify().Render( "导入的é…置文件包å«äº†ç¬¬ä¸‰æ–¹æºï¼Œè¯·é€šè¿‡æ‰‹åŠ¨å¯¼å…¥ã€‚" ); + new Notify().Render({ content: `导入的é…置文件包å«äº†ç¬¬ä¸‰æ–¹æºï¼Œåˆ·æ–°åŽè¯·é‡æ–° 手动导入。`, state: "holdon" }); json.option.plugins && json.option.plugins.length > 0 && - new Notify().Render( "导入的é…置文件包å«äº†æ’件,请通过手动导入。" ); + new Notify().Render({ content: `导入的é…置文件包å«äº†æ’件,刷新åŽè¯·é‡æ–° 手动导入。`, state: "holdon" }); this.importsecret( json.option.secret, { ...json.secret }, () => { delete json.secret; storage.Write( ()=> { @@ -170,6 +196,14 @@ export default class CommonOpt extends React.Component { } } + oldnewsites() { + new Notify().Render( "此功能转移到 ç«™ç‚¹ç®¡ç† é€‰é¡¹å¡é‡Œé¢ï¼Œ3 ç§’é’ŸåŽè‡ªåŠ¨åˆ‡æ¢åˆ°æ­¤é€‰é¡¹å¡ã€‚" ); + setTimeout( ()=> { + location.href = location.origin + "/options/options.html#labs"; + window.dispatchEvent( new CustomEvent( msg.MESSAGE_ACTION.turn_tab, { detail: { page: 3 }})); + }, 3000 ); + } + newsites() { const notify = new Notify().Render({ content: "æ•°æ®åŒæ­¥ä¸­ï¼Œè¯·ç¨ç­‰...", state: "loading" }); storage.GetRemote( "remote", ( result, error ) => { @@ -223,12 +257,15 @@ export default class CommonOpt extends React.Component { render() { return(
-
+
-
+
+
+
+ this.onClick( e, id ) } /> + { this.state.page < this.state.total && +
+
+ } +
+
+
+ + 当剿œªæŸ¥çœ‹ä»»ä½•内容 +
+
+ ; + } + return ( +
{ dom }
+ ) + } +} + +class List extends React.Component { + + static defaultProps = { + list: [], + onClick: undefined, + }; + + static propTypes = { + list : React.PropTypes.array, + onClick: React.PropTypes.func, + } + + onClick( event, id ) { + $( "list" ).removeClass( "selected" ); + $( `list[id="${id}"]` ).addClass( "selected" ); + this.props.onClick( event, id ); + } + + onActive( event, id ) { + $( `list[id="${id}"]` ).addClass( "active" ); + storage.notice.read.push( id ); + write( () => new Notify().Render( "已设置为已读。" ) ); + } + + render() { + const list = this.props.list.map( item => { + const active = storage.notice.read.findIndex( value=>value==item.id ) != -1 ? " active" : ""; + return ( + this.onClick( e, item.id ) }> +
{ item.title }
+ + { item.category.name } + { item.date } + + { active == "" && +
+
+ } +
+ ) + }); + return ( +
+ { list } +
+ ) + } +} \ No newline at end of file diff --git a/src/module/plugins.jsx b/src/module/plugins.jsx index ee59dc7b5..e77770f4e 100644 --- a/src/module/plugins.jsx +++ b/src/module/plugins.jsx @@ -1,4 +1,4 @@ -console.log( "===== simpread option labs load =====" ) +console.log( "===== simpread option plugins load =====" ) import {storage} from 'storage'; import * as run from 'runtime'; @@ -180,14 +180,13 @@ export default class PluginsOpt extends React.Component { storage.option.plugins.forEach( id => { run.Install( id, undefined, result => { if ( !result ) { - new Notify().Render( 2, id + "获å–失败,请ç¨åŽå†è¯•。" ); - return; + new Notify().Render( 2, id + " 获å–失败,请ç¨åŽå†è¯•。" ); } count++; - if ( storage.plugins[id].version != result.version ) { - storage.plugins[result.id] = result; - is_update = true; - } + if ( storage.plugins[id].version != result.version ) { + storage.plugins[result.id] = result; + is_update = true; + } count == storage.option.plugins.length && complete(); }); }); @@ -204,6 +203,7 @@ export default class PluginsOpt extends React.Component { } import() { + let newPlugins = {}; if ( storage.option.plugins.length == 0 ) { new Notify().Render( "当å‰é…置文件没有任何æ’件。" ); return; @@ -214,23 +214,20 @@ export default class PluginsOpt extends React.Component { storage.option.plugins.forEach( id => { run.Install( id, undefined, result => { if ( !result ) { - new Notify().Render( 2, id + "获å–失败,请ç¨åŽå†è¯•。" ); - return; - } + new Notify().Render( 2, id + " 获å–失败,请ç¨åŽå†è¯•。" ); + } else newPlugins[result.id] = result; count++; - storage.plugins[result.id] = result; count == storage.option.plugins.length && complete(); }); }); }}); const complete = () => { storage.Plugins( result => { - storage.option.plugins = Object.keys( storage.plugins ); storage.Write( () => { new Notify().Render( "已从é…置文件导入完毕。" ); this.setState({ plugins: Object.values( storage.plugins ) }); }); - }, storage.plugins ); + }, newPlugins ); } } @@ -245,8 +242,9 @@ export default class PluginsOpt extends React.Component { } componentWillMount() { - $( "head" ).append( '' ); - $( "head" ).append( '' ); + $( "head" ).append( '' ); + $( "head" ).append( '' ); + $( "head" ).append( '' ); storage.Plugins( () => { decodeURIComponent( location.href ).includes( "#plugins?install=" ) && this.install(); this.setState({ plugins: Object.values( storage.plugins ) }); @@ -255,40 +253,53 @@ export default class PluginsOpt extends React.Component { render() { return ( -
+ ) diff --git a/src/module/modals.jsx b/src/module/setting.jsx similarity index 92% rename from src/module/modals.jsx rename to src/module/setting.jsx index 62d16a735..6e91dde02 100644 --- a/src/module/modals.jsx +++ b/src/module/setting.jsx @@ -1,4 +1,4 @@ -console.log( "=== simpread option modals ===" ) +console.log( "=== simpread option setting ===" ) import FocusOpt from 'focusopt'; import ReadOpt from 'readopt'; @@ -25,14 +25,14 @@ let callback; */ class Modals extends React.Component { - // close modals + // close setting close( restore = rollback() ) { dia.Close(); } - // save modals focus option + // save setting focus option save() { - console.log( "modals click submit button.", storage.current ) + console.log( "setting click submit button.", storage.current ) watch.Verify( ( state, result ) => { if ( state ) { console.log( "watch.Lock()", result ); diff --git a/src/module/sharecard.jsx b/src/module/sharecard.jsx new file mode 100644 index 000000000..b15dde08c --- /dev/null +++ b/src/module/sharecard.jsx @@ -0,0 +1,60 @@ +console.log( "=== simpread share card load ===" ) + +import * as exp from 'export'; +import * as ss from 'stylesheet'; + +import Button from 'button'; + +class ShareCard extends React.Component { + + download() { + exp.PNG( $("sharecard-card")[0] , `simpread-${ this.props.title }.png`, result => { + !result && new Notify().Render( 2, "下载失败,请ç¨åŽå†è¯•ï¼" ); + result && this.exit(); + }); + } + + exit() { + ReactDOM.unmountComponentAtNode( $( "sharecard-bg" )[0] ); + } + + componentWillUnmount() { + $( "sharecard-bg" ).remove(); + } + + render() { + return ( + + + + 简 悦 + + 摘自 《{ this.props.title }》 +

获å–简悦" }}>
还原阅读本质 · æå‡é˜…读体验
+
+
+ +
+
+ +
ç¬¬ä¸‰æ–¹é€‚é…æº
+
this.changeOrigins() } />
-
this.onClick('sitemgr') }> -
-
站点管ç†å™¨
- å¯ä»¥ç¼–辑全部的适é…ç«™ç‚¹ï¼ŒåŒ…æ‹¬ï¼šå®˜æ–¹é€‚é…æºã€ç«™ç‚¹é›†å¸‚适酿ºã€ç¬¬ä¸‰æ–¹é€‚é…æºã€è‡ªå®šä¹‰é€‚é…æºã€‚ - -
-
管ç†
+
+
+ +
+ this.onChange(t) } /> +
+
-
已安装
-
- this.onChange(t) } /> +
+
站点管ç†å™¨
+
this.onClick('sitemgr') }> +
+
å¯ä»¥ç®¡ç†å…¨éƒ¨çš„适é…站点
+ åŒ…æ‹¬ï¼šå®˜æ–¹é€‚é…æºã€ç¬¬ä¸‰æ–¹é€‚é…æºã€ç«™ç‚¹é›†å¸‚适酿ºã€è‡ªå®šä¹‰é€‚é…æºã€‚ + +
+
) diff --git a/src/module/unrdist.jsx b/src/module/unrdist.jsx index a780e8a59..aedbb5ca2 100644 --- a/src/module/unrdist.jsx +++ b/src/module/unrdist.jsx @@ -40,6 +40,7 @@ export default class Unrdist extends React.Component { static propsType = { list: React.PropTypes.array, step: React.PropTypes.number, + onLoadMoreClick: React.PropTypes.func, }; state = { @@ -91,6 +92,7 @@ export default class Unrdist extends React.Component { onClick() { this.setState({ page: this.state.page + 1 }); + this.props.onLoadMoreClick && this.props.onLoadMoreClick(); } render() { @@ -104,17 +106,21 @@ export default class Unrdist extends React.Component { items = this.state.items.slice( 0, this.state.page * this.props.step ), content = this.state.items && this.state.items.length > 0 ?
+
this.onAction(e,i,t,d) } /> +
+
:
diff --git a/src/module/urlscheme.jsx b/src/module/urlscheme.jsx new file mode 100644 index 000000000..afc616c9c --- /dev/null +++ b/src/module/urlscheme.jsx @@ -0,0 +1,115 @@ +console.log( "===== simpread url scheme load =====" ) + +import Switch from 'switch'; +import TextField from 'textfield'; +import Button from 'button'; +import Dropdown from 'dropdown'; + +import * as puplugin from 'puplugin'; + +const category = [ + { name: "黑åå•", value: "blacklist" }, + { name: "白åå•", value: "whitelist" }, + { name: "排除列表", value: "exclusion" }, + { name: "延迟加载", value: "lazyload" }, +]; + +export class URLScheme extends React.Component { + + static defaultProps = { + type: "", + url: "", + off: false, + } + + static propType = { + type : React.PropTypes.string, + url : React.PropTypes.string, + off : React.PropTypes.bool, + onChange : React.PropTypes.func, + } + + state = { + error : "", + disable: false, + }; + + onDropdownChange( value ) { + this.props.type = value; + } + + onURLChange( event ) { + const minimatch = puplugin.Plugin( "minimatch" ), + value = event.target.value.trim(); + if ( value == "" ) { + this.setState({ error : "ä¸èƒ½ä¸ºç©º", disable: true }); + } else if ( value.startsWith( "[[/" ) && value.endsWith( "/]]" ) && !new RegExp( value.replace( /\[\[\/|\/\]\]/ig, "" ) ).test( location.href ) ) { + this.setState({ error : "正则表达å¼é”™è¯¯", disable: true }); + } else if ( !value.startsWith( "[[/" ) && !value.startsWith( "http" ) && value != location.hostname.replace( "www.", "" ) ) { + this.setState({ error : "主域åä¸åŒ¹é…", disable: true }); + } else if ( !value.startsWith( "[[/" ) && value.startsWith( "http" ) && !minimatch( location.href, value ) ) { + this.setState({ error : "minimatch 适é…错误", disable: true }); + } else { + this.setState({ error : "", disable: false }); + this.props.url = value; + } + } + + onOpenedChange( value ) { + this.props.off = value; + } + + onClose() { + $( this.refs.target ) + .addClass( "hide" )[0] + .addEventListener( 'animationend', () => { + ReactDOM.unmountComponentAtNode( $( ".simpread-urlscheme" )[0] ); + $( ".simpread-urlscheme" ).remove(); + }, false ); + } + + onSave() { + this.props.onChange && this.props.onChange( this.props.type, this.props.off, this.props.url ); + this.onClose(); + } + + render() { + return ( + + + è¯·é€‰æ‹©æ·»åŠ æ¨¡å¼ + item.value == this.props.type )[0].name } items={ category } width="100%" onChange={ (v)=>this.onDropdownChange(v) } /> + + + æ”¯æŒ åŸŸå · 主域å · æ­£åˆ™è¡¨è¾¾å¼ Â· minimatch 等规则,详细 window.open( 'http://ksria.com/simpread/docs/#/å³é”®èœå•?id=URL编辑器', '_blank') }>请看这里 + this.onURLChange(e) } + /> + + + this.onOpenedChange( v ) } /> + + +
@@ -180,10 +180,23 @@ class Welcome extends React.Component {

é˜…è¯»æ¨¡å¼ ä¸Ž èšç„¦æ¨¡å¼

- 阅读模å¼ï¼š 独有功能,自动æå–适é…页é¢çš„æ ‡é¢˜ã€æè¿°ã€æ­£æ–‡ã€åª’体等资æºã€‚
- æ”¯æŒ ä¸´æ—¶é˜…è¯»æ¨¡å¼ Â· TXT é˜…è¯»æ¨¡å¼ Â· ä¸»åŠ¨é€‚é…æ¨¡å¼ · æ™ºèƒ½é€‚é…æ¨¡å¼ - · 论å›ç±»é¡µé¢ / 分页。
- èšç„¦æ¨¡å¼ï¼šé«˜äº®é¼ æ ‡æ‰€åœ¨çš„æ–‡ç« æ®µè½ï¼Œä¸æ”¹å˜å½“å‰é¡µé¢çš„ç»“æž„ï¼Œé€‚åˆæœªé€‚é…的网站。
+ é˜…è¯»æ¨¡å¼ â†’ 独有功能,自动æå–适é…页é¢çš„æ ‡é¢˜ã€æè¿°ã€æ­£æ–‡ã€åª’体等资æº
+ æ”¯æŒ æ‰‹åŠ¨æ¡†é€‰ · ä¸»åŠ¨é€‚é…æ¨¡å¼ · æ™ºèƒ½é€‚é…æ¨¡å¼ + · 论å›ç±»é¡µé¢ / 分页
+ èšç„¦æ¨¡å¼ → 高亮鼠标所在的文章段è½ï¼Œä¸æ”¹å˜å½“å‰é¡µé¢çš„结构
+
+ +
} + + { (( !first && version == "1.1.1" ) || version == "all" ) && +
+
+ +

更智能的正文æå–功能

+
+ 全新的 è¯æ³•分æžå¼•擎2.0,简悦å¯ä»¥è¯†åˆ«å‡º TXT · Markdown · LaTeX · ä»£ç æ®µ
+ Wordpress · Hexo · Ghost · Discuz ç­‰åšå®¢ / 论å›çš„页é¢äº†ï¼
+ 甚至,åªè¦æ˜¯ç»“构良好的页é¢ï¼Œï¼ˆæ— éœ€é€‚é…)自动生æˆé˜…读模å¼ï¼Œè¯¦ç»† 请看这里
} @@ -194,9 +207,9 @@ class Welcome extends React.Component {

连接你的生产力工具

- 支æŒä¸‹è½½ HTML · PDF · Markdown · PNG · Epub 到本地 ä»¥åŠ å‘é€åˆ° Kindle。
- 支æŒè¾“出到 Dropbox · å°è±¡ç¬”è®° · Evernote · Onenote · Google 云端硬盘。
- å‘é€é¡µé¢é“¾æŽ¥åˆ° Pocket · Instapaper · Linnk,详细 请看这里 。 + 支æŒä¸‹è½½ HTML · PDF · Markdown · PNG · Epub 到本地 ä»¥åŠ å‘é€åˆ° Kindle
+ 支æŒè¾“出到 åšæžœäº‘ · 有é“云笔记 · 为知笔记 · 语雀 · å°è±¡ç¬”è®° · Dropbox · Onenote · Notion ç­‰
+ å‘é€é¡µé¢é“¾æŽ¥åˆ° ç¨åŽè¯» · Pocket · Instapaper · Linnk,详细 请看这里
} @@ -207,9 +220,9 @@ class Welcome extends React.Component {

站点编辑器 · ç«™ç‚¹é€‚é…æº · 站点管ç†å™¨

- 页é¢ä¸Šä»»æ„元素å‡å¯éšè—,更支æŒç¼–程,详细请看 站点编辑器
- æ›´çµæ´»ã€ç¤¾åŒºåŒ–çš„å¤šç§ ç«™ç‚¹é€‚é…æºã€‚
- 内置了 站点管ç†å™¨ï¼Œæ–¹ä¾¿ç®¡ç†å…¨éƒ¨çš„适é…站点。 + 页é¢ä¸Šä»»æ„元素å‡å¯éšè—,更支æŒç¼–程,详细请看 站点编辑器
+ æ›´çµæ´»ã€ç¤¾åŒºåŒ–çš„å¤šç§ ç«™ç‚¹é€‚é…æº
+ 内置了 站点管ç†å™¨ï¼Œæ–¹ä¾¿ç®¡ç†å…¨éƒ¨çš„适é…站点
} @@ -221,20 +234,7 @@ class Welcome extends React.Component {

全新的控制æ é¢æ¿

「告别ã€ä¼ ç»Ÿã€å•一的控制æ ï¼Œå…¨éƒ¨åŠŸèƒ½ã€Œä¸€è§ˆæ— ä½™ã€
- 主题ã€å­—体样å¼ã€å¤§å°ã€ç‰ˆé¢å¸ƒå±€æ›´æ”¹ä¸€é”®å®Œæˆã€‚
-
- -
} - - { (( !first && version == "1.1.1" ) || version == "all" ) && -
-
- -

更智能的正文æå–功能

-
- 从现在开始,简悦å¯ä»¥è¯†åˆ«å‡º Wordpress · Hexo · Ghost ·
- Discuz ç­‰åšå®¢ / 论å›çš„页é¢äº†ï¼
- 甚至,åªè¦æ˜¯ç»“构良好的页é¢ï¼Œï¼ˆæ— éœ€é€‚é…)自动生æˆé˜…读模å¼ï¼Œè¯¦ç»† 请看这里 。 + 主题ã€å­—体样å¼ã€å¤§å°ã€ç‰ˆé¢å¸ƒå±€æ›´æ”¹ä¸€é”®å®Œæˆ
} @@ -245,9 +245,9 @@ class Welcome extends React.Component {

æ’件系统

- 字数统计 · 点击查看大图(Lightbox) · 划è¯ç¿»è¯‘ 一个ä¸èƒ½å°‘。
- å¯ä»¥ä½¿ç”¨ JavaScript 编写基于「简悦ã€çš„æ’ä»¶äº†ï¼Œè¯¦ç»†è¯´æ˜Žè¯·çœ‹ 说明文档
- 现在就安装适åˆä½ çš„æ’ä»¶å§ â†’ æ’件中心 。 + 字数统计 · ä»£ç æ®µå¢žå¼º · 点击查看大图(Lightbox) · 划è¯ç¿»è¯‘ 一个ä¸èƒ½å°‘
+ 使用 JavaScript 编写基于简悦的æ’件,详细说明请看 说明文档
+ 现在就安装适åˆä½ çš„æ’ä»¶å§ â†’ æ’件中心
} @@ -260,7 +260,59 @@ class Welcome extends React.Component {
方便æäº¤ï¼Œè®©ä½ çš„站点为数以万计的简悦用户使用
å®˜æ–¹ä¸»é€‚é…æºã€ç¬¬ä¸‰æ–¹é€‚é…æºã€ç«™ç‚¹é›†å¸‚适酿ºã€è‡ªå®šä¹‰é€‚é…æºä¸€ç«™å¼æµè§ˆ
- 现在就访问 站点集市 å§ï¼Œçœ‹çœ‹æœ‰ä»€ä¹ˆå¢žåŠ çš„æ–°é€‚é…站点。 + 现在就访问 站点集市 å§ï¼Œçœ‹çœ‹æœ‰ä»€ä¹ˆå¢žåŠ çš„æ–°é€‚é…站点 +
+ + } + + { !first && +
+
+ +

è¯æ³•分æžå¼•擎 2.0

+
+ 更加智能,更加专业,Markdown / LaTeX / ä»£ç æ®µ å‡ä¸åœ¨è¯ä¸‹
+ 釿–°æ•´ç†å¹¶æ ¹æ®æ›´é€‚åˆä¸­æ–‡é˜…è¯»çš„æ–¹å¼æŽ’ç‰ˆï¼Œè®©ä½ çˆ±ä¸Šåœ¨ PC 阅读文章
+ 详细说明请看 è¯æ³•分æžå¼•擎 +
+
+
} + + { !first && version == "1.1.3" && +
+
+ +

导出æœåŠ¡åˆæ·»æ–°æˆå‘˜ï¼Œæ›´æ”¯æŒ WebDAV

+
+ 期待已久的 语雀 å’Œ åšæžœäº‘ 现已加入 导出æœåŠ¡ 豪åŽå¤§ç¤¼åŒ…
+ é…ç½®æ–‡ä»¶çš„åŒæ­¥ä¹Ÿå¯ä½¿ç”¨ åšæžœäº‘ 了
+ ä¸ä»…如此,åªè¦æ˜¯æ”¯æŒ WebDAV çš„æœåŠ¡å‡å¯ä½¿ç”¨ç®€æ‚¦çš„导出功能 +
+
+
} + + { !first && version == "1.1.4" && +
+
+ +

更强大,更易用的导出æœåŠ¡

+
+ 期待已久的 Notion · 有é“云笔记 · 为知笔记 · Bear · Ulysses æ¥å•¦~
+ 原生的 离线 HTML / Markdown 下载功能,还有截å–ä»»æ„ä½ç½®çš„ æˆªå›¾ 功能
+ WebDAV 现已定制导出格å¼ï¼ŒåŒ…括: Markdown · HTML +
+
+
} + + { (( !first && version == "1.1.3" ) || version == "all" ) && +
+
+ +

消æ¯ä¸­å¿ƒ · 帮助中心 · 新手入门

+
+ 消æ¯ä¸­å¿ƒ 让沟通更加便利
+ 内置常用的文档说明ã€å¸¸è§é—®é¢˜ã€åŠé€‰é¡¹é¡µå…¨éƒ¨åŠŸèƒ½è¯´æ˜Žçš„ 帮助中心
+ 功能太多,无从下手?新手入门 ä¸å†è®©æ–°æ‰‹æœ›è€Œå´æ­¥
} @@ -269,6 +321,14 @@ class Welcome extends React.Component {

更多功能 等你å‘现ï¼

+ { !first && version == "5005" &&
+ 分享å¡ï¼Œå³é”®èœå•添加 「白åå• / 排除列表 / 黑åå•ã€ç­‰
+ 详细说明请看 更新日志 +
} + { !first && version == "1.1.3" && }
@@ -299,10 +359,10 @@ class Welcome extends React.Component { } /** - * Exit() + * Exit */ function exit() { - $( welcbgclsjq ).velocity({ opacity: 0 }, { complete: ()=>{ + $( welcbgclsjq ).velocity({ opacity: 0 }, { complete: () => { ReactDOM.unmountComponentAtNode( $(welcbgclsjq)[0] ); }}); } diff --git a/src/options/corb.html b/src/options/corb.html new file mode 100644 index 000000000..d70608eb4 --- /dev/null +++ b/src/options/corb.html @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/options/corb.js b/src/options/corb.js new file mode 100644 index 000000000..e9819f80f --- /dev/null +++ b/src/options/corb.js @@ -0,0 +1,79 @@ + +import axios from 'axios'; + +import {browser} from 'browser'; +import * as msg from 'message'; + +/** + * Listen runtime message, include: `axios` + */ +browser.runtime.onMessage.addListener( function( request, sender, sendResponse ) { + if ( request.type == msg.MESSAGE_ACTION.AXIOS ) { + if ( request.value.type == "post" ) { + if ( request.value.form ) { + request.value.data = new FormData(); + Object.keys( request.value.form ).forEach( key => request.value.data.append( key, request.value.form[key] ) ); + } + axios.post( request.value.url, request.value.data ) + .then( response => sendResponse({ done: response })) + .catch( error => sendResponse({ fail: error })); + } else if ( request.value.type == 'put' ) { + axios.put( request.value.url, request.value.content, request.value.data ) + .then( response => sendResponse({ done: response })) + .catch( error => sendResponse({ fail: error })); + } else if( request.value.type == 'download' ) { + axios( request.value ) + .then( response => sendResponse({ done: response })) + .catch( error => sendResponse({ fail: error })); + } + } + return true; +}); + +/** + * Listen runtime message, include: `notion` + */ +const downLoadCache = new Map(); + +browser.runtime.onMessage.addListener( async function ( request, sender, sendResponse ) { + if ( request.type == msg.MESSAGE_ACTION.notion_dl_img ) { + try { + const option = request.value, + { url, protocol } = option, + dlRes = await axios({ method: 'get', url: url.replace( /https?:/, protocol ), responseType: 'blob', }); + let blob = dlRes.data; + + if ( blob.type === 'image/webp' ) { + blob = blob.slice( 0, blob.size, 'image/jpeg' ); + } + downLoadCache.set( url, blob ); + sendResponse({ + done: { + type: blob.type, + size: blob.size, + url, + }, + }); + } catch ( err ) { + sendResponse({ fail: err }); + } + } else if ( request.type == msg.MESSAGE_ACTION.notion_up_img ) { + try { + const option = request.value, + { url, upUrl } = option, + blob = downLoadCache.get( url ); + + await axios.put( upUrl, blob, { + headers: { + 'Content-Type': blob.type, + }, + }); + + downLoadCache.delete( url ); + sendResponse({ done: true }); + } catch ( err ) { + sendResponse({ fail: err }); + } + } + return true; +}); \ No newline at end of file diff --git a/src/options/custom.html b/src/options/custom.html index 1362d4909..e5b8470a3 100644 --- a/src/options/custom.html +++ b/src/options/custom.html @@ -11,7 +11,7 @@
Property
- 简悦 - 让你瞬间进入沉浸å¼é˜…读的扩展 + 简悦 SimpRead - 为你æä¾›ã€Œå¦‚æ‚志般沉浸å¼é˜…读体验ã€çš„æ‰©å±• 为了达到完美的阅读模å¼è¿™ä¸ªå°ç›®æ ‡ ,我适é…了 数百ç§ç±»åž‹ 的网站,因此诞生了简悦。 @@ -82,8 +82,9 @@

表格样å¼ï¼š

- 简悦(SimpRead)- 让你瞬间进入沉浸å¼é˜…读的扩展。  Â© 2017 ksria.com by Kenshin Wang + 简悦 SimpRead - 为你æä¾›ã€Œå¦‚æ‚志般沉浸å¼é˜…读体验ã€çš„æ‰©å±•  Â© 2017 - 2020 ksria.com by Kenshin Wang
+ diff --git a/src/options/custom.js b/src/options/custom.js index 9080327e9..b7b7879b3 100644 --- a/src/options/custom.js +++ b/src/options/custom.js @@ -123,7 +123,7 @@ function propertyRender() {

帮助

-

如何自定义样å¼ï¼Œè¯¦ç»† 请看这里
+

如何自定义样å¼ï¼Œè¯¦ç»† 请看这里
独ä¹ä¹ä¸å¦‚ä¼—ä¹ä¹ï¼ 分享你的主题

diff --git a/src/options/notice.html b/src/options/notice.html new file mode 100644 index 000000000..175f13fc4 --- /dev/null +++ b/src/options/notice.html @@ -0,0 +1,19 @@ + + + + + + 消æ¯ä¸­å¿ƒ - 简悦 · 选项页 + + +
消æ¯ä¸­å¿ƒ
+
+
+ 简悦 SimpRead - 为你æä¾›ã€Œå¦‚æ‚志般沉浸å¼é˜…读体验ã€çš„æ‰©å±•  Â© 2017 - 2020 ksria.com by Kenshin Wang +
+ + + + + + \ No newline at end of file diff --git a/src/options/notice.js b/src/options/notice.js new file mode 100644 index 000000000..c78dae839 --- /dev/null +++ b/src/options/notice.js @@ -0,0 +1,50 @@ +console.log( "==== simpread options page: notice load ====" ) + +import '../assets/css/simpread.css'; +import '../assets/css/options_page.css'; +import '../assets/css/options_notice.css'; +import 'notify_css'; + +import Velocity from 'velocity'; +import Button from 'button'; +import * as waves from 'waves'; +import * as tt from 'tooltip'; + +import Notice from 'notice'; + +import {storage} from 'storage'; +import * as ss from 'stylesheet'; + +/** + * Entry + */ +storage.Read( () => { + console.log( "simpread storage get success!", storage ); + navRender(); + noticeRender(); + tt.Render( "body" ); + waves.Render({ root: "body" }); + $( "body" ).velocity({ opacity: 1 }, { duration: 1000, complete: ()=> { + $( "body" ).removeAttr( "style" ); + }}); +}); + +/** + * navigation Render + */ +function navRender() { + const navClick = () => { + location.href = location.origin + "/options/options.html"; + }; + const button =