diff --git a/BrowserMark/img/dashang_alipay.jpg b/BrowserMark/img/dashang_alipay.jpg new file mode 100644 index 0000000..a773c89 Binary files /dev/null and b/BrowserMark/img/dashang_alipay.jpg differ diff --git a/BrowserMark/img/dashang_paypal.png b/BrowserMark/img/dashang_paypal.png new file mode 100644 index 0000000..4fee398 Binary files /dev/null and b/BrowserMark/img/dashang_paypal.png differ diff --git a/BrowserMark/img/dashang_qq.png b/BrowserMark/img/dashang_qq.png new file mode 100644 index 0000000..8ae23df Binary files /dev/null and b/BrowserMark/img/dashang_qq.png differ diff --git a/BrowserMark/img/dashang_wx.jpg b/BrowserMark/img/dashang_wx.jpg new file mode 100644 index 0000000..bc568f4 Binary files /dev/null and b/BrowserMark/img/dashang_wx.jpg differ diff --git a/BrowserMark/img/wx_qrcode.jpg b/BrowserMark/img/wx_qrcode.jpg new file mode 100644 index 0000000..2d6c386 Binary files /dev/null and b/BrowserMark/img/wx_qrcode.jpg differ diff --git a/BrowserMark/js/options.js b/BrowserMark/js/options.js index 642be67..9416884 100644 --- a/BrowserMark/js/options.js +++ b/BrowserMark/js/options.js @@ -1,5 +1,7 @@ -(function($){ +var form = layui.form; +(function($){ 'use strict'; + var form = layui.form; window.mrdocClipperSettings = { init: function(){ var self = this, @@ -14,6 +16,21 @@ mrdocClipperOptions.get(['accountKey'],function(r){ $("input[name='mrdoc_account_key']").val(r['accountKey']); }); + // 鼠标自动选择 + mrdocClipperOptions.get(['mouseAutoSelect'], function(r){ + console.log(r) + if(r['mouseAutoSelect']){ + // 设置启用 + // console.log('鼠标自动选择') + $('input[name="mouse-auto-select"]').prop('checked',true) + form.render('checkbox'); + }else{ + // 设置关闭 + // console.log('鼠标手动选择') + $('input[name="mouse-auto-select"]').prop('checked',false) + form.render('checkbox'); + } + }); //转存图片 // mrdocClipperOptions.get(['retrieveImg'],function(r){ // if(r['retrieveImg'] == true){ @@ -66,4 +83,40 @@ checkAccountKey = function(server_url,account_key){ layer.closeAll('loading'); $('button.layui-btn').attr("disabled",false); $('button.layui-btn').removeClass('layui-btn-disabled'); -} \ No newline at end of file +} + +// 监听鼠标自动选择开关 +form.on('switch(mouseAutoSelect)', function(data){ + // console.log(data.elem.checked); //开关是否开启，true或者false + // console.log(data.value); //开关value值，也可以通过data.elem.value得到 + mrdocClipperOptions = chrome.storage.local + mrdocClipperOptions.set({'mouseAutoSelect':data.elem.checked}) + }); + + +//显示微信公众号二维码图片 +$("#wx_qrcode").click(function(r){ + var layer = layui.layer; + layer.open({ + type: 1, + title: false, + closeBtn: 0, + area: ['auto'], + skin: 'layui-layer-nobg', //没有背景色 + shadeClose: true, + content: $('#wx_qrcode_img') + }); +}) + +// 显示打赏图片 +$("#dashang").click(function(r){ + var layer = layui.layer; + layer.open({ + type: 1, + title: false, + closeBtn: 0, + area: ['400px','400px'], + shadeClose: true, + content: $('#dashang_img') + }); +}) \ No newline at end of file diff --git a/BrowserMark/js/popup.js b/BrowserMark/js/popup.js index 8e6f113..9ea981d 100644 --- a/BrowserMark/js/popup.js +++ b/BrowserMark/js/popup.js @@ -149,12 +149,39 @@ createInspector = function(autoExtractContent) { createInspector(false); // 默认关闭鼠标选择标记框 -hideInspector = function(){ - parent.postMessage({ - name: 'hideinspectorfrommrdocpopup' - }, '*'); -}; -hideInspector(); +// hideInspector = function(){ +// parent.postMessage({ +// name: 'hideinspectorfrommrdocpopup' +// }, '*'); +// }; +// hideInspector(); + +// 获取鼠标选择开关状态 +getMouseSelectStatus = function(){ + var mrdocClipperOptions = chrome.storage.local; + var form = layui.form; + mrdocClipperOptions.get(['mouseAutoSelect'], function(r){ + console.log(r) + if(r['mouseAutoSelect']){ //鼠标自动选择 + // 开启鼠标选择器 + parent.postMessage({ + name: 'showinspectorfrommrdocpopup' + }, '*'); + // 更新渲染popup页面鼠标选择开关状态 + $("#mouse-select").prop('checked',true); + form.render('checkbox'); + }else{ // 鼠标手动选择 + // 关闭鼠标选择器 + parent.postMessage({ + name: 'hideinspectorfrommrdocpopup' + }, '*'); + // 更新渲染popup页面鼠标选择开关状态 + $("#mouse-select").prop('checked',false); + form.render('checkbox'); + } + }); +} +getMouseSelectStatus(); // 处理background发送来的页面剪藏内容，将其添加到文本编辑器中 diff --git a/BrowserMark/options.html b/BrowserMark/options.html index 261d2b7..0079afc 100644 --- a/BrowserMark/options.html +++ b/BrowserMark/options.html @@ -16,30 +16,28 @@ background-color: #fafafa; text-align: center; } - /* .container{ - display: flex; - display: -webkit-flex; - justify-content: center; - align-items: center; - } */ .login-form{ margin-top: 15%; padding: 20px 50px 20px 60px; background-color: #fff; -webkit-box-shadow: #666 0px 0px 10px; - -moz-box-shadow: #666 0px 0px 10px; - box-shadow: #666 0px 0px 10px; + -moz-box-shadow: #666 0px 0px 10px; + box-shadow: #666 0px 0px 10px; } .register-link{ font-size: 12px; } - .layui-input{ - /* width: 500px; */ + .layui-form-label{ + width: auto; } + .layui-form-onswitch { + border-color: #1E9FFF; + background-color: #1E9FFF; + } -
+
+ + + + + + diff --git a/BrowserMark/popup.html b/BrowserMark/popup.html index e3116e7..a3906ca 100644 --- a/BrowserMark/popup.html +++ b/BrowserMark/popup.html @@ -41,15 +41,15 @@
- -
- -
-