Merge branch 'release/1.1.2'

README.md

@@ -3,12 +3,12 @@
 <p align="center">让你瞬间进入沉浸式阅读的扩展，还原阅读的本质，提升你的阅读体验。</p>
 <p align="center">为了达到完美的阅读模式这个小目标 ，我适配了 <a target="_blank" href="https://github.com/kenshin/simpread/wiki/适配站点列表">数百种类型</a> 的网站，因此诞生了简悦。</p>
 <p align="center">
- <a href="https://github.com/kenshin/simpread/releases"><img src="https://img.shields.io/badge/lastest_version-1.1.1-blue.svg"></a>
+ <a href="https://github.com/kenshin/simpread/releases"><img src="https://img.shields.io/badge/lastest_version-1.1.2-blue.svg"></a>
  <a target="_blank" href="http://ksria.com/simpread"><img src="https://img.shields.io/badge/website-_simpread.ksria.com-1DBA90.svg"></a>
 </p>
 <p align="center">
  <a target="_blank" href="https://chrome.google.com/webstore/detail/%E7%AE%80%E6%82%A6-simpread/ijllcpnolfcooahcekpamkbidhejabll"><img src="https://img.shields.io/badge/download-_chrome_webstore-brightgreen.svg"></a>
- <a href="http://ksria.com/simpread/crx/1.1.1/simpread.crx"><img src="https://img.shields.io/badge/download-_crx-brightgreen.svg"></a>
+ <a href="http://ksria.com/simpread/crx/1.1.2/simpread.crx"><img src="https://img.shields.io/badge/download-_crx-brightgreen.svg"></a>
  <a target="_blank" href="https://addons.mozilla.org/zh-CN/firefox/addon/simpread"><img src="https://img.shields.io/badge/download-_firefox_addon-DD512A.svg"></a>
  <a target="_blank" href="https://greasyfork.org/zh-CN/scripts/39998"><img src="https://i.imgur.com/JFhxHeR.png"></a>
  <a target="_blank" href="https://xteko.com/redir?url=http://ojec5ddd5.bkt.clouddn.com/jsbox/simpread-1.0.0.box?201805251238&name=%E7%AE%80%E6%82%A6"><img src="https://i.imgur.com/zZeOllB.png"></a>
@@ -17,7 +17,7 @@
 ***
 
 #### 马上使用：
-* [Chrome 应用商店](https://chrome.google.com/webstore/detail/%E7%AE%80%E6%82%A6-simpread/ijllcpnolfcooahcekpamkbidhejabll) 或者 [离线下载](http://ksria.com/simpread/crx/1.1.1/simpread.crx)
+* [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) 
 * [支持 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://ojec5ddd5.bkt.clouddn.com/jsbox/simpread-1.0.0.box?201805251238&name=%E7%AE%80%E6%82%A6) 详细 [请看这里](https://github.com/Kenshin/simpread/wiki/JSBox)
@@ -46,14 +46,20 @@
  自动识别出 Wordpress · Hexo · Ghost · Discuz 等博客 / 论坛的页面以及只要是结构良好的页面，（无需适配）自动生成阅读模式，详细请看 [智能适配](https://github.com/kenshin/simpread/wiki/智能适配模式)
 
 - 站点适配源： 
- 包括：`官方（主）适配源` `官方（次）适配源以及第三方适配源` `本地适配源` 并支持导入第三方适配源，详细请看 [站点适配源](https://github.com/Kenshin/simpread/wiki/站点适配源)
+ 包括：`官方（主）适配源` `第三方适配源` `站点集市适配源` `自定义适配源`，详细请看 [站点适配源](https://github.com/Kenshin/simpread/wiki/站点适配源)
 
 - 站点编辑器： 
  页面任意元素，均可隐藏，`可编程，定制化`，详细请看 [站点编辑器](https://github.com/kenshin/simpread/wiki/站点编辑器)
 
 - 站点管理器： 
  可管理全部的适配站点，详细请看 [站点管理器](https://github.com/kenshin/simpread/wiki/站点管理器)
 
+- ![Imgur](https://i.imgur.com/G1nQZxr.png) 站点集市： 
+ 上传并共享自己的适配站点，一键分享临时阅读模式，适配失败的站一键提交，详细请看 [站点集市](https://simpread.ksria.cn/sites)
+
+- ![Imgur](https://i.imgur.com/G1nQZxr.png) 插件系统： 
+ 现在开始可以使用 JavaScript 编写基于 `简悦` 的插件了，更上线了 [插件中心](https://simpread.ksria.cn/plugins/) ，如何编写插件请看 → [说明文档](https://github.com/Kenshin/simpread/wiki/插件系统)
+
 - 多种主题： 
  `白练、白磁、卯之花色、丁子色、娟鼠、月白、百合、紺鼠、黒鸢` 等
 
@@ -71,7 +77,7 @@
 
 - 高级定制，包括：`右键菜单` `控制栏可隐藏` `阅读进度可隐藏` `自动进入阅读模式` [白名单](https://github.com/kenshin/simpread/wiki/faq#白名单) 以及 [排除列表](https://github.com/kenshin/simpread/wiki/faq#排除列表) 等
 
-- 稍后读
+- 稍后读；
 
 #### 截图：
 ![简单阅读，愉悦心情！](http://ojec5ddd5.bkt.clouddn.com/welcome-readme-1.png)
@@ -84,7 +90,7 @@
 * <http://ksria.com/simpread/gallery/>
 
 #### 全部功能：
-![功能一览](http://ojec5ddd5.bkt.clouddn.com/feature%201.1.1.png)
+![功能一览](http://ojec5ddd5.bkt.clouddn.com/feature%201.1.2.png)
 
 #### 如何使用（阅读模式）：
 
@@ -176,11 +182,11 @@ _如发现下图显示不全，请直接访问 http://ojec5ddd5.bkt.clouddn.com/
 <!-- 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.1-blue.svg
+[version-badge]: https://img.shields.io/badge/lastest_version-1.1.2-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.1/simpread.crx
+[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

ext/background.js

@@ -105,6 +105,18 @@ browser.runtime.onMessage.addListener( function( request, sender, sendResponse )
  case msg.MESSAGE_ACTION.auth:
  browser.tabs.create({ url: browser.extension.getURL( "options/options.html#labs?auth=" + request.value.name.toLowerCase() ) });
  break;
+ case msg.MESSAGE_ACTION.update_site:
+ getCurTab({ active: true, url: request.value.url }, tabs => {
+ tabs.length > 0 && ( upTabId = tabs[0].id );
+ browser.tabs.create({ url: browser.extension.getURL( "options/options.html#sites?update=" + encodeURI( JSON.stringify( request.value.site ))) });
+ });
+ break;
+ case msg.MESSAGE_ACTION.save_site:
+ browser.tabs.create({ url: browser.extension.getURL( "options/options.html#sites?pending=" + encodeURI( JSON.stringify( request.value ))) });
+ break;
+ case msg.MESSAGE_ACTION.temp_site:
+ browser.tabs.create({ url: browser.extension.getURL( "options/options.html#sites?temp=" + encodeURI( JSON.stringify( request.value ))) });
+ break;
  case msg.MESSAGE_ACTION.auth_success:
  getCurTab( { url: request.value.url }, tabs => {
  if ( tabs && tabs.length > 0 ) {
@@ -155,12 +167,31 @@ browser.tabs.onUpdated.addListener( function( tabId, changeInfo, tab ) {
  browser.tabs.remove( tabId );
  }
  });
+ } else if ( tab.url.startsWith( "https://simpread.ksria.cn/plugins/install/" )) {
+ const url = tab.url.replace( "https://simpread.ksria.cn/plugins/install/", "" );
+ browser.tabs.create({ url: browser.extension.getURL( "options/options.html#plugins?install=" + encodeURIComponent(url) ) });
+ browser.tabs.remove( tabId );
+ } else if ( tab.url.startsWith( "https://simpread.ksria.cn/sites/install/" )) {
+ const url = tab.url.replace( "https://simpread.ksria.cn/sites/install/", "" );
+ browser.tabs.create({ url: browser.extension.getURL( "options/options.html#sites?install=" + encodeURIComponent(url) ) });
+ browser.tabs.remove( tabId );
+ } else if ( tab.url == browser.runtime.getURL( "options/options.html#sites?update=success" ) ) {
+ browser.tabs.remove( tabId );
+ upTabId > 0 && chrome.tabs.reload( upTabId, () => { upTabId == -1; });
+ } else if ( tab.url == browser.runtime.getURL( "options/options.html#sites?update=failed" ) ) {
+ browser.tabs.remove( tabId );
+ } else if ( tab.url == browser.runtime.getURL( "options/options.html#sites?update=complete" ) ) {
+ browser.tabs.remove( tabId );
+ } else if ( tab.url == browser.runtime.getURL( "options/options.html#sites?update=pending" ) ) {
+ browser.tabs.remove( tabId );
+ upTabId > 0 && browser.tabs.sendMessage( upTabId, msg.Add( msg.MESSAGE_ACTION.pending_site ));
+ upTabId == -1;
  }
 
  if ( !tab.url.startsWith( "moz-extension://" ) ) {
  browser.tabs.sendMessage( tabId, msg.Add( msg.MESSAGE_ACTION.tab_selected, { is_update: true } ));
- storage.ReadAsync( ( simpread, secret ) => {
- browser.tabs.sendMessage( tabId, msg.Add( msg.MESSAGE_ACTION.storage, { simpread, secret } ));
+ storage.ReadAsync( ( simpread, secret, plugins ) => {
+ browser.tabs.sendMessage( tabId, msg.Add( msg.MESSAGE_ACTION.storage, { simpread, secret, plugins } ));
  });
  } else {
  setMenuAndIcon( tab.id, -1 );

ext/contentscripts.js

@@ -108,7 +108,7 @@ browser.runtime.onMessage.addListener( function( request, sender, sendResponse )
  break;
  case msg.MESSAGE_ACTION.storage:
  if ( storage_load ) return;
- storage.WriteAsync( request.value.simpread, request.value.secret );
+ storage.WriteAsync( request.value.simpread, request.value.secret, request.value.plugins );
  if ( blacklist() ) {
  $( "style" ).map( ( idx, item ) => {
  if ( item.innerText.includes( "simpread" ) || 
@@ -127,6 +127,13 @@ browser.runtime.onMessage.addListener( function( request, sender, sendResponse )
  browserAction( false );
  storage_load = true;
  break;
+ case msg.MESSAGE_ACTION.pending_site:
+ 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;
  }
 });
 

ext/manifest.json

@@ -1,7 +1,7 @@
 {
  "name" : "__MSG_extension_name__",
  "default_locale" : "zh_CN",
- "version" : "1.1.1",
+ "version" : "1.1.2",
  "short_name" : "SimpRead",
  "description" : "__MSG_ext_extension_desc__",
  "homepage_url" : "http://ksria.com/simpread",

package.json

@@ -37,6 +37,7 @@
  "expose-loader": "^0.7.1",
  "file-loader": "^0.9.0",
  "minimatch": "^3.0.4",
+ "nanoid": "1.0.3",
  "postcss-cssnext": "^2.10.0",
  "postcss-loader": "^1.3.3",
  "react": "^0.14.8",

src/assets/css/options_page.css

@@ -3,7 +3,7 @@
  --text-color: #333;
  --secondary-color: color(#333 alpha(-30%));
  --background-color: #fff;
- --width: 740px;
+ --width: 835px;
 }
 
 * {
@@ -237,4 +237,148 @@ a {
  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAAV1BMVEUAAAD////ExMS2tra/v7/Dw8O8vLzCwsK5ubnCwsK6urq+vr68vLy9vb29vb28vLy9vb29vb29vb29vb29vb29vb29vb29vb2+vr6+vr69vb29vb29vb2oiyseAAAAHHRSTlMAAQ0OEBETFRYZGkpMg8rLzM7R0tPW19je4uTlotOuxwAAAAFiS0dEAf8CLd4AAAB1SURBVCjPrdLHDoAgEATQUbH33vb/v1PEEnVXT85pM48QCAC/JhloC3AOJiO9wDms8UoZdN9KEHZUuAKEPeUuOGw9h0j36nqPHVi/g19RE9y3NoNenylwcGqqfQiANFMQwbIhAz/lB0z0yHg81Hzvp/jfj7AA4P8P+rUn4dEAAAAASUVORK5CYII=);
  background-position: center;
  background-repeat: no-repeat;
-}
+}
+
+cards {
+ display: flex;
+ flex-flow: row wrap;
+}
+
+card {
+ display: flex;
+ flex-direction: column;
+
+ margin: 6px;
+
+ width: 259px;
+
+ color: rgba(51, 51, 51, .87);
+ background-color: #fff;
+
+ border-radius: 2px;
+ box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12);
+
+ transition: all .25s ease-out;
+}
+
+card:hover {
+ box-shadow: 0 10px 20px 0 rgba(168,182,191,0.6);
+ transform: translateY(-1px);
+}
+
+card-header {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+
+ width: 100%;
+ height: 196px;
+
+ background-color: #40C4FF;
+}
+
+card-header title {
+ display: block;
+
+ font-size: 30px;
+ font-weight: 500;
+
+ line-height: 30px;
+}
+
+card-header icon {
+ display: block;
+
+ width: 100px;
+ height: 100px;
+
+ font-size: 80px;
+}
+
+card-content {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+
+ width: 100%;
+ height: 134px;
+
+ padding: 16px;
+}
+
+card-content title {
+ display: block;
+
+ font-size: 20px;
+ font-weight: 500;
+
+ height: 32px;
+ line-height: 32px;
+}
+
+card-content desc {
+ display: block;
+
+ font-size: 14px;
+ font-weight: 500;
+
+ height: 22px;
+ line-height: 22px;
+}
+
+card-content note {
+ display: block;
+
+ margin-top: 16px;
+
+ text-align: left;
+ font-size: 14px;
+ font-weight: 400;
+
+ line-height: 20px;
+}
+
+card-footer {
+ display: flex;
+ align-items: flex-end;
+ justify-content: flex-end;
+
+ width: 100%;
+ height: 52px;
+}
+
+card-footer i {
+ font-size: 16px;
+}
+
+card-empty {
+ width: 100%;
+ padding: 50px;
+}
+
+card-empty a {
+ color: #9b9b9b;
+
+ font-size: 30px;
+ font-weight: 500;
+}
+
+.avatar {
+ margin: 10px;
+ padding: 5px;
+
+ width: 100px;
+ height: 100px;
+ line-height: 80px;
+
+ font-size: 50px;
+ font-weight: bold;
+
+ color: #fff;
+ background-color: rgb(111, 122, 155);
+
+ border-radius: 50%;
+ border: 5px solid #fff;
+ box-shadow: 0 10px 20px 0 rgba(168,182,191,0.6);
+}

src/assets/css/options_sitemgr.css

@@ -1,8 +1,43 @@
 
+.hide {
+ display: none;
+}
+
+.row {
+ display: flex;
+ flex-direction: row;
+}
+
+.space {
+ width: 30px;
+}
+
+.box-large {
+ padding-top:30px;
+}
+
 .header {
  background-color: #8BC34A;
 }
 
+.editor {
+ width: 100%;
+ padding-right: 20px;
+}
+
+.box {
+ margin-top: 20px;
+ margin-bottom: 25px;
+ padding: 10px;
+
+ width: 100%;
+
+ background-color: #fff;
+
+ border-radius: 2px;
+ box-shadow: 0 1px 3px 0 rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 2px 1px -1px rgba(0,0,0,.12);
+}
+
 .custom .preview {
  display: block;
  width: 100%;
@@ -17,6 +52,7 @@
  align-items: center;
 
  padding-top: 50px;
+ min-height: 550px;
 
  color: #9b9b9b;
  font-size: 3.2rem;

src/assets/css/simpread.css

@@ -376,7 +376,7 @@ kbd-mapping {
  flex-direction: column;
 
  width: 500px;
- height: 500px;
+ height: 550px;
 
  background-color: #fff;