github
/
layui
mirror of https://github.com/layui/layui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1202 from layui/2.x 

release v2.8.0-rc.8
pull/1209/head v2.8.0-rc.8
贤心 2023-02-14 00:48:46 +08:00 committed by GitHub
parent 4198f1be26 a7ce133b89
commit fbd8b9ed5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/layui.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "layui", "name": "layui",
"version": "2.8.0-rc.7", "version": "2.8.0-rc.8",
"description": "Classic modular Front-End UI library", "description": "Classic modular Front-End UI library",
"main": "dist/layui.js", "main": "dist/layui.js",
"license": "MIT", "license": "MIT",

2
src/layui.js
View File

@ -15,7 +15,7 @@
} }
,Layui = function(){ ,Layui = function(){
this.v = '2.8.0-rc.7'; // Layui 版本号 this.v = '2.8.0-rc.8'; // Layui 版本号
} }
//识别预先可能定义的指定全局对象 //识别预先可能定义的指定全局对象

4
src/modules/colorpicker.js
View File

@ -59,9 +59,9 @@ layui.define(['jquery', 'lay'], function(exports){
hsb.b = max; hsb.b = max;
hsb.s = max !== 0 ? 255*delta/max : 0; hsb.s = max !== 0 ? 255*delta/max : 0;
if(hsb.s !== 0){ if(hsb.s !== 0){
if(rgb.r === max){ if(rgb.r == max){ // 因 rgb 中返回的数字为 string 类型
hsb.h = (rgb.g - rgb.b) / delta; hsb.h = (rgb.g - rgb.b) / delta;
}else if(rgb.g === max){ }else if(rgb.g == max){
hsb.h = 2 + (rgb.b - rgb.r) / delta; hsb.h = 2 + (rgb.b - rgb.r) / delta;
}else{ }else{
hsb.h = 4 + (rgb.r - rgb.g) / delta; hsb.h = 4 + (rgb.r - rgb.g) / delta;