Skip to content

Commit

Permalink
Merge branch 'release/1.1.4.6016'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kenshin committed Jun 17, 2020
2 parents b2b19af + 9efed97 commit c493eeb
Show file tree
Hide file tree
Showing 18 changed files with 221 additions and 103 deletions.
12 changes: 12 additions & 0 deletions src/assets/css/options_notice.css
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,18 @@ notice .detail .preview .desc {
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;
Expand Down
6 changes: 3 additions & 3 deletions src/assets/css/theme_mobile.css
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
* iPad pro 12 and below
*/
@media only screen and (max-device-width: 1024px) {
html, .simpread-theme-root {
html.simpread-theme-root, .simpread-theme-root {
font-size: 80%!important;
}

Expand All @@ -154,7 +154,7 @@
* iPhone XS Max and below
*/
@media only screen and (max-device-width: 414px) {
html, .simpread-theme-root {
html.simpread-theme-root, .simpread-theme-root {
font-size: 70%!important;
}

Expand All @@ -170,7 +170,7 @@
* iPhone SE and below
*/
@media only screen and (max-device-width: 320px) {
html, .simpread-theme-root {
html.simpread-theme-root, .simpread-theme-root {
font-size: 90%!important;
}

Expand Down
5 changes: 4 additions & 1 deletion src/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ storage.Read( () => {
});
ver.version == storage.version && ver.patch != storage.patch &&
storage.Write(()=> {
browser.tabs.create({ url: browser.extension.getURL( "options/options.html#update?patch=" + ver.patch ) });
// 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();
Expand Down
7 changes: 6 additions & 1 deletion src/contentscripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,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" )
) {
Expand Down Expand Up @@ -88,7 +89,11 @@ browser.runtime.onMessage.addListener( function( request, sender, sendResponse )
case msg.MESSAGE_ACTION.tab_selected:
if ( isLazyload() ) {
browser.runtime.sendMessage( msg.Add( msg.MESSAGE_ACTION.browser_action, { code: 0 , url: window.location.href } ));
} else browserAction( request.value.is_update );
} 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:
Expand Down
2 changes: 1 addition & 1 deletion src/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name" : "__MSG_extension_name__",
"default_locale" : "en",
"version" : "1.1.4",
"version" : "1.1.4.6016",
"short_name" : "SimpRead",
"description" : "__MSG_extension_desc__",
"homepage_url" : "http://ksria.com/simpread",
Expand Down
2 changes: 1 addition & 1 deletion src/module/about.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ urls = {
},

badges: {
version: "data:image/png;base64,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",
version: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAAUCAYAAAAN+ioeAAAAAXNSR0IArs4c6QAABR5JREFUWIXtmV1Mk1cYx3+nfd++tmtxm1YpYYNMR4YkpkYzQULIhpJJNCoOP4BEgiFsqUKi82J3ZpFMk0UIF1yQ6RiBwO42h0GncRGyG4cIF6uYScKMm3TdpkBXoF9nF4R3VAGFodTFf3KSpn3O8/E/5/m/5z0V+/btSzCZTKeFEO8Cdp5jDLk6FzuFKESQXoG84g/4jiiqqtYCu6WUi53Xf0as1SDADmLvEsWmKMCWWEtwvojVOoRgiyKljFvsRBYKsUo0kjglZpObB2K5lhdEPyMYpJQs1mhoaEBRlKcao2ZtG22b7tC26Q4pVueC2U6O3Qkf0LbpDqm2DbPaLeqO3rx5Mw6HAyHEgvibrpbiL3MI+SJ8Xd5F6O/IrLt+LrYAr1veJE3L4Je/bhP0zW4/I9H5+flYrVYaGxsBsFqt1NTU4HK5GB8fJyUlhQMHDpCYmIjX66WpqYmenh4AWltbaWpqIi8vj6tXr2K321m/fj1msxmv18vhw4cBuHz5MqWlpQSDQdatW0dxcTHLli2jv7+f+vp6PB6P7q+xsZHt27cDcObMGbq6uh7JebpaXllrmvgg0HfXTJiLrQEDHyZX8cmFCk5vbXm8/Uxb/fz586SnpyOEQEpJRkYGHR0d+P1+LBYLpaWlnDp1iq1bt3LixAnKyspQVVUPZjKZKCws5MaNG1itVvLz88nKyqKgoCAqTiQSIS4ujkOHDlFbW8uOHTvo7e3F5XJFJa+qKvv37+fkyZOUlJTMWUImF2KhbAsSXVz66RuGl/86uczzkw6fz8fAwABOp5Pr16+TnZ1NXV0dQghSUlJITk6mvr4+ao7dbufu3bsAtLS0YLPZ8Hq9JCUlUVlZidvtpru7m0AgoM+RUrJ69Wrcbjc3b97EZrPR3NzMnj170DSNsbGxKH+TNgaDgXA4HBV/1laXIOUTPjAfY5v80lusWbKRj37bizneqMeel3QYDAYuXrxIdnY2Ho8Hs9lMf38/JpOJUChEd3e3LgGTsNvtqKqqzwcYHBykrKyMnJwcMjMzKSws5OjRozrZUkpCoRBCCDRNAyZkCiAcDkd1CICmaUQiEX1uFD+PJXF2Mp7UdoMth7cd79Cx93f9u9rMb/msr5LvBr+ads6sp45r166RlpbGtm3baG9v16XB7XazatUqioqKSEpKwuFw4HA49BMEoEuO0WgkHA5z7tw5qqurMZvNWK3WqBZ1u92kpqbidDrRNI2CggJu3brF6OhoVLHzkYGnIR0NP1bjrHpZHwN//kxJ43t809s8v1OHEILOzk7y8vI4e/asnsTo6CjHjh2jsrKSgwcP6i1eVFQURQpAbm4u5eXlSCl58OABra2teDwejMZ/W87n83H8+HEqKiqw2+309fVRVVWlL9ZUf9OR/nDMqfh4TR058e8DUJd1gYgMk/u9A4DPN3bwRf+n/PBH+5xszQlGzAnGKdsVrMlGtJBhxi4Qu3btmrWXhoaG8Pv9rFixQicHIBAIMDIyQjAYREqJEIL4+HgA7t27h8MxkaDf72doaAgAo9GIxWLRpWFwcJCVK1cihGB8fJzh4WHC4TCqqrJ06VIURXnE38PzonKd5vZu5HaIce8ULReC5ekTMnS/N4jlNSPaq4Y5207F/Z4A1jcU1LhHf9Nd7dy5M3Zfp+aIWLsmnYoXr+DPCIqUchj4X9zgxSrREoYVKeUlYPdiJ7MQiF2i5SVlbGysQtO0EPDc/5UVa0RLpFdIrviCw0f+AfHcgFQrOD9QAAAAAElFTkSuQmCC",
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,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",
Expand Down
1 change: 1 addition & 0 deletions src/module/authorize.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ export default class Auth extends React.Component {
state == "pocket" && ( storage.secret.pocket.tags = value.trim() );
state == "linnk" && ( storage.secret.linnk.group_name = value.trim() );
state == "notion" && ( storage.secret.notion.folder_id = value.trim() );
state == "notion" && ( storage.secret.notion.type = this.state.notion.filter( item => item.value == value.trim() )[0].type );
state == "youdao" && ( storage.secret.youdao.folder_id = value.trim() );
storage.Safe( () => this.setState({ secret: storage.secret }), storage.secret );
}
Expand Down
2 changes: 1 addition & 1 deletion src/module/notice.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default class Notice extends React.Component {

componentWillMount() {
if ( this.props.is_update ) {
$.ajax( storage.notice_service.message )
$.ajax( storage.notice_service.message + "?" + Math.round(+new Date()) )
.done( result => {
storage.Notice( undefined, result.notice );
storage.notice.latest = result.notice.length;
Expand Down
8 changes: 7 additions & 1 deletion src/options/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import Button from 'button';
import * as side from 'sidebar';

import { storage, STORAGE_MODE as mode } from 'storage';
import local from 'local';
import * as ss from 'stylesheet';
import * as conf from 'config';
import * as ver from 'version';
Expand Down Expand Up @@ -215,6 +216,11 @@ function vernotify( first ) {
patch == "5005" && welcomeRender( false, patch );
history.pushState( "", "", "/options/options.html" );
}
// silent update
if ( local.Patch( "get" ) ) {
new Notify().Render( "简悦 版本提示", ver.SilentUpdate() );
local.Patch( "remove" );
}
}

/**
Expand Down Expand Up @@ -381,7 +387,7 @@ function noticeRender() {
if ( $.isEmptyObject( result ) ) {
storage.notice.latest = 0;
}
$.get( storage.notice_service.latest, result => {
$.get( storage.notice_service.latest + "?" + Math.round(+new Date()), result => {
console.log( "notice latest id ", result )
if ( storage.notice.latest == 0 ) {
$( "body" ).append( tmpl );
Expand Down
2 changes: 1 addition & 1 deletion src/read/controlbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export default class ReadCtlbar extends React.Component {
delete readItems.send.items.bear;
delete readItems.send.items.ulysses;
}
storage.Safe( () => {
readItems.send && storage.Safe( () => {
storage.secret.webdav.forEach( item => {
item = JSON.parse( item );
readItems.send.items[ "webdav_" + item.name ] = {
Expand Down
5 changes: 5 additions & 0 deletions src/service/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ const keyboard = {
"type" : "gdrive",
"desc" : "保存到 Google 云端硬盘",
},
nt: {
"kbd" : "nt",
"type" : "notion",
"desc" : "保存到 Notion",
},
jg: {
"kbd" : "jg",
"type" : "jianguo",
Expand Down
Loading

0 comments on commit c493eeb

Please sign in to comment.