Merge branch 'dev'

zimocode · Sep 28, 2019 · 3703d0b · 3703d0b
2 parents 1067082 + f5900a5
commit 3703d0b
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 30 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -908,9 +908,6 @@
   "msg_setbg":{
     "message":"Something is wrong!!"
   },
-  "msg_first":{
-    "message":"Thank you for installing this extension.<br \/><li>smartUp is free, I'm glad, if you give a five stars rating.<li>If it's the first time to install, it has been working. Try to hold right button to draw up and right?! If you have installed, wait a minute, it is syncing your settings data in background.<li>For some reasons, some actions can not work in this options page.(scroll,script...).<li>Becouse of Chrome's limitations, smartUp cant work in some tabs too.(newtab,setting page...)<li>There are a few actions, you'll add more."
-  },
   "test_mges": {
     "message": "Drawing line in here."
   },
@@ -1031,9 +1028,6 @@
   "getper_fail":{
     "message":"Failure to get permissions! \nChrome must be upgraded to latest version."
   },
-  "wel_title":{
-    "message":"Welcome"
-  },
   "notif_title":{
     "message":"smartUp Notification"
   },

diff --git a/change.log b/change.log
@@ -1,8 +1,8 @@
 {
 	"log": [
 		{
-			"ver":"6.5.1232.1015",
-			"date":"2019.09.20",
+			"ver":"6.5.1240.1020",
+			"date":"2019.09.26",
 			"content":[
 				"new mini-apps: homepage,tbkjx.",
 				"new action: close all mini-apps in tab.",

diff --git a/css/inject/tbkjx.css b/css/inject/tbkjx.css
@@ -2,7 +2,7 @@ smartup.su_apps#su_apps_tbkjx .su_tbkjx_box{
 	width: 600px;
 	height: 420px;
 	padding: 8px;
-	height: 440px;
+	height: 436px;
 	padding: 0;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_boxcontent{
@@ -11,26 +11,38 @@ smartup.su_apps#su_apps_tbkjx .su_tbkjx_boxcontent{
 	/*border-right: 1px solid #ccf;*/
 	padding: 8px;
 	padding-right: 20px;
+
+position: sticky;
+width: 340px;
+float: left;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_boxlist{
 	width: 224px;
 	height: 100%;
 	float: right;
 	background-color: #f7f3f3;
+
+overflow: auto;
 }
 
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_listhead{
 	position: fixed;
-width: 208px;
-    background-color: #f7f3f3;
-padding: 2px 8px;
+	width: 208px;
+	background-color: #f7f3f3;
+	padding: 2px 8px;
+/**/
+position: absolute;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_boxsearch{
 
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_boxsearch input{
 	display: inline-block;
 	width: 90px;
+/**/
+padding: 0px 4px;
+width: 120px;
+margin: 3px 4px;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_boxsearch button{
 	min-width: 10px;
@@ -40,6 +52,9 @@ smartup.su_apps#su_apps_tbkjx .su_tbkjx_boxsearch button{
 	display: inline-block;
 	float: right;
 	margin: 4px auto;
+/**/
+float: initial;
+margin-left: 4px;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_headspan{
     font-size: 10px;
@@ -87,10 +102,22 @@ smartup.su_apps#su_apps_tbkjx .su_tbkjx_buy{
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_listjing{
 	padding-top: 72px;
+
+padding-top: 0;
+margin-top: 72px;
+position: initial;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_listjing ul{
 	/*background-color: #ccf*/
 	padding-bottom: 40px;
+/**/
+padding-bottom: 0;
+height: 288px;
+overflow-y: auto;
+overflow-x: hidden;
+height: 328px;
+height: 320px;
+padding: 2px 0;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_listjing li{
 	width: 224px;
@@ -109,6 +136,8 @@ smartup.su_apps#su_apps_tbkjx .su_tbkjx_listjing li{
 	/*font-weight: bold;*/
 	cursor: pointer;
 	transition:all .1s ease-in-out;
+/**/
+width: 206px;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_listjing li:hover{
 	border: 1px solid #ccc;
@@ -131,6 +160,10 @@ smartup.su_apps#su_apps_tbkjx .su_tbkjx_listbottom{
 	text-align: center;
 	padding-top: 8px;
 	height: 32px;
+/**/
+position: initial;
+bottom: 0;
+width: 206px;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_listbottom button{
 	min-width: auto;
@@ -140,6 +173,9 @@ smartup.su_apps#su_apps_tbkjx .su_tbkjx_listbottom button{
 	height: 24px;
 	line-height: 24px;
 	border: none !important;
+/**/
+width: 70px;
+margin: 4px 0;
 }
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_listbottom button:disabled,
 smartup.su_apps#su_apps_tbkjx .su_tbkjx_listbottom button:disabled:hover{

diff --git a/js/background.js b/js/background.js
@@ -4242,7 +4242,7 @@ var sub={
 		tbkjx:{
 			getData:function(message,sender,sendResponse){
 				console.log("tbkjx.getdata");
-				//let _url="tbkjx.json";
+				// let _url="tbkjx.json";
 				let _url="https://quan.zimoapps.com/push/tbkjx.json";
 				let _date=new Date();
 				_url=_url+"?"+_date.getFullYear()+((_date.getMonth()+1)<10?("0"+(_date.getMonth()+1)):(_date.getMonth()+1))+(_date.getDate()<10?("0"+_date.getDate()):_date.getDate())

diff --git a/js/options.js b/js/options.js
@@ -2149,11 +2149,6 @@ var suo={
 				suo.clickMenuLI(document.querySelector("li[data-id0='11'][data-id1='5']"));
 				localStorage.removeItem("showabout");
 		}
-		//show first msg
-		if(localStorage.getItem("first")==null){
-			suo.first();
-			localStorage.setItem("first",true);
-		}
 		//init webstore url
 		if(browserType=="cr"){
 			suo.cons.webstoreURL="https://chrome.google.com/webstore/detail/"+chrome.runtime.id+"?hl="+navigator.language;
@@ -2183,17 +2178,6 @@ var suo={
 			suo.donateBox.init();
 		}
 	},
-	first:function(){
-		var confid,btn,
-			dom=document.querySelector("smartup.su_apps").cloneNode(true),
-			domcontent=dom.querySelector(".box_content"),
-			btn=["",suo.getI18n("btn_done"),""];
-		domcontent.id="box_first";
-		domcontent.textContent=suo.getI18n("msg_first");	
-		suo.initBoxBtn(dom,btn);
-		dom.style.cssText+="display:block;";
-		suo.initPos(dom);
-	},
 	initBoxBtn:function(dom,btn){
 		var dombtn=dom.querySelectorAll(".box_submit input[type=button]");
 		for(var i=0,i_btn=0;i<btn.length;i++){

diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
 	"minimum_chrome_version": "22",
 	"name": "__MSG_ext_name__",
 	"short_name":"smartUp",
-	"version": "6.5.1232.1015",
+	"version": "6.5.1240.1020",
 	"description": "__MSG_ext_des__",
 	"default_locale": "en",
 	"author":"zimo",