mktb
/
openct-tasks
forked from Open-CT/openct-tasks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!12 Fix some problems 

Merge pull request !12 from stacker/master
This commit is contained in:
没吃过紫薯的猫 2021-07-09 01:04:42 +00:00 committed by Gitee
parent 554edd480e feb4b74ac7
commit 39ad2e81bb
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_common/modules/integrationAPI.01/installationAPI.01/pemFioi/stepGuidance.js
View File

@ -1,11 +1,8 @@
/*
* @Author: stacker
* @Date: 2021-07-06 23:20:58
<<<<<<< HEAD
* @LastEditTime: 2021-07-07 23:36:24
=======
* @LastEditTime: 2021-07-07 00:57:07
>>>>>>> d4539ab313bbbcd8667839f513e5c46604744278
* @LastEditors: Please set LastEditors
* @Description: 步骤引导文件
* @FilePath: \bebras-tasks\_common\modules\integrationAPI.01\installationAPI.01\pemFioi\stepGuidance.js
@ -137,12 +134,9 @@ class StepGuidance{
if(elementLeft>leftValue[1]){
leftValue[1] = elementLeft
value = 0
<<<<<<< HEAD
//value += $(elementItem).width()
value += elementTarget.isSVG?$(elementItem).get(0).getBBox().width:$(elementItem).outerWidth()
=======
value += $(elementItem).width()
>>>>>>> d4539ab313bbbcd8667839f513e5c46604744278
}
}
return value + leftValue[1] - leftValue[0]
@ -162,12 +156,9 @@ class StepGuidance{
if(elementTop>topValue[1]){
topValue[1] = elementTop
value = 0
<<<<<<< HEAD
//value += $(elementItem).height()
value += elementTarget.isSVG?$(elementItem).get(0).getBBox().height:$(elementItem).outerHeight()
=======
value += $(elementItem).height()
>>>>>>> d4539ab313bbbcd8667839f513e5c46604744278
}
}
return value + topValue[1] - topValue[0]

3
bebras/2019/FR-2019-15-shape-compression/index_en.html
View File

@ -131,11 +131,8 @@
borderRadius:16,
isSVG:true
}]
<<<<<<< HEAD
let stepGuidance = new StepGuidance(elementList,'shape-compression')
=======
let stepGuidance = new StepGuidance(elementList,'align-strips')
>>>>>>> d4539ab313bbbcd8667839f513e5c46604744278
stepGuidance.init()
</script>