update

TerryZ · Dec 1, 2017 · a24fe21 · a24fe21
1 parent c639e4a
commit a24fe21
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selectpage",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "A simple style and powerful selection jQuery plugin, including ajax remote data, autocomplete, pagination, tags, i18n, keyboard navigation functions",
   "main": "selectpage.js",
   "dependencies": {

diff --git a/selectpage.base.css b/selectpage.base.css
@@ -174,7 +174,6 @@ ul.sp_results > li.sp_selected {
 .sp_control_box{
     padding: 0px;
     height: 27px;
-    background-color: #F6F6F6;
 }
 .sp_control_box p{
     margin: 0;
@@ -192,16 +191,24 @@ ul.sp_results > li.sp_selected {
     font-size: 13px !important;
     padding: 0 12px;
     border: 0;
-    background-color: #F6F6F6;
+    background-color: white;
     color: #666666;
     text-align: left;
     -webkit-transition: all .5s cubic-bezier(.175,.885,.32,1);
     transition: all .5s cubic-bezier(.175,.885,.32,1);
     outline: none !important;
     float: right;
+    opacity: .3;
+}
+.sp_control_box:hover{
+    background-color: #F8F8F8;
+}
+.sp_control_box:hover button{
+    background-color: #F8F8F8;
+    opacity: 1;
 }
-.sp_control_box button:hover{
-    background-color: #E8E8E8;
+.sp_control_box:hover button:hover{
+    background-color: #EEEEEE;
     color: black;
 }
 /**

diff --git a/selectpage.bootstrap3.css b/selectpage.bootstrap3.css
@@ -174,7 +174,6 @@ ul.sp_results > li.sp_selected {
 .sp_control_box{
 	padding: 0px;
 	height: 27px;
-	background-color: #F6F6F6;
 }
 .sp_control_box p{
     margin: 0;
@@ -192,16 +191,24 @@ ul.sp_results > li.sp_selected {
     font-size: 13px !important;
     padding: 0 12px;
     border: 0;
-    background-color: #F6F6F6;
+    background-color: white;
     color: #666666;
     text-align: left;
     -webkit-transition: all .5s cubic-bezier(.175,.885,.32,1);
     transition: all .5s cubic-bezier(.175,.885,.32,1);
     outline: none !important;
     float: right;
+    opacity: .3;
+}
+.sp_control_box:hover{
+    background-color: #F8F8F8;
+}
+.sp_control_box:hover button{
+    background-color: #F8F8F8;
+    opacity: 1;
 }
-.sp_control_box button:hover{
-	background-color: #E8E8E8;
+.sp_control_box:hover button:hover{
+	background-color: #EEEEEE;
     color: black;
 }
 /**

diff --git a/selectpage.css b/selectpage.css
@@ -170,7 +170,6 @@ ul.sp_results > li.sp_selected {
 .sp_control_box{
     padding: 0px;
     height: 27px;
-    background-color: #F6F6F6;
 }
 .sp_control_box p{
     margin: 0;
@@ -188,16 +187,24 @@ ul.sp_results > li.sp_selected {
     font-size: 13px !important;
     padding: 0 12px;
     border: 0;
-    background-color: #F6F6F6;
+    background-color: white;
     color: #666666;
     text-align: left;
     -webkit-transition: all .5s cubic-bezier(.175,.885,.32,1);
     transition: all .5s cubic-bezier(.175,.885,.32,1);
     outline: none !important;
     float: right;
+    opacity: .3;
+}
+.sp_control_box:hover{
+    background-color: #F8F8F8;
+}
+.sp_control_box:hover button{
+    background-color: #F8F8F8;
+    opacity: 1;
 }
-.sp_control_box button:hover{
-    background-color: #E8E8E8;
+.sp_control_box:hover button:hover{
+    background-color: #EEEEEE;
     color: black;
 }
 

diff --git a/selectpage.js b/selectpage.js
@@ -2,7 +2,7 @@
  * @summary     SelectPage
  * @desc        Simple and powerful selection plugin
  * @file        selectpage.js
- * @version     2.16
+ * @version     2.17
  * @author      TerryZeng
  * @contact     https://terryz.github.io/
  * @license     MIT License
@@ -130,19 +130,20 @@
 		 * @return string
 		 */
 		formatItem : undefined,
+        /**
+         * Have some highlight item and lost focus, auto select the highlight item
+         * @type boolean
+         * @default false
+         */
+        autoFillResult: false,
 		/**
          * Auto select first item in show up result list or search result
+         * depend on `autoFillResult` option set to true
 		 * @type boolean
          * @default false
 		 */
 		autoSelectFirst: false,
 		/**
-         * Have some highlight item and lost focus, auto select the highlight item
-		 * @type boolean
-         * @default false
-		 */
-		autoFillResult: false,
-		/**
          * Whether clear input element text when enter some keywords to search and no result return
 		 * @type boolean
          * @default true
@@ -226,7 +227,7 @@
 	/**
 	 * Plugin version number
 	 */
-	SelectPage.version = '2.16';
+	SelectPage.version = '2.17';
 	/**
 	 * Plugin object cache key
 	 */
@@ -259,10 +260,6 @@
 			option.autoFillResult = false;
 			option.autoSelectFirst = false;
 		}
-
-		if($.type(option.data) === 'string'){
-		    option.autoSelectFirst = false;
-        }
         //show all item when pagination bar close, limited 200
         if(!option.pagination) option.pageSize = 200;
 		if($.type(option.listSize) !== 'number' || option.listSize < 0) option.listSize = 10;

diff --git a/selectpage.min.js b/selectpage.min.js