Skip to content

Commit 1a659b2

Browse files
committed
Merge branch 'release/v1.1.1'
2 parents 57a355b + 22ab1d4 commit 1a659b2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

__src/bibi/resources/scripts/bibi.heart.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -2807,9 +2807,9 @@ I.FlickObserver = { create: () => {
28072807
if(!I.Loupe.Transforming) {
28082808
if(FlickObserver.StartedOn.LaunchingAxis == C.A_AXIS_B && Math.abs(Passage[C.A_AXIS_B] / 100) >= 1) {
28092809
// Orthogonal Pan/Releace
2810-
cb = FlickObserver.switchAxis_or_toggleUtilities();
2810+
cb = FlickObserver.getOrthogonalTouchMoveFunction();
28112811
}
2812-
if(!cb && Math.abs(Passage.X) >= 3 || Math.abs(Passage.Y) >= 3) {
2812+
if(!cb && (Math.abs(Passage.X) >= 3 || Math.abs(Passage.Y) >= 3)) {
28132813
// Moved (== not Tap)
28142814
Eve.preventDefault();
28152815
Par.Speed = Math.sqrt(Math.pow(Passage.X, 2) + Math.pow(Passage.Y, 2)) / (Eve.timeStamp - FlickObserver.StartedOn.TimeStamp);
@@ -2842,7 +2842,7 @@ I.FlickObserver = { create: () => {
28422842
if(!Dist) {
28432843
// Orthogonal (not for "move")
28442844
return new Promise(resolve => {
2845-
FlickObserver.switchAxis_or_toggleUtilities()();
2845+
FlickObserver.getOrthogonalTouchMoveFunction()();
28462846
resolve();
28472847
});
28482848
} else if(S.RVM == 'paged' || S.RVM != (/^[lr]/.test(Dir) ? 'horizontal' : /^[tb]/.test(Dir) ? 'vertical' : '')) {
@@ -2875,8 +2875,8 @@ I.FlickObserver = { create: () => {
28752875
Duration: !I.isScrollable() ? 0 : S['content-draggable'][0] ? 123 : 0
28762876
});
28772877
},
2878-
switchAxis_or_toggleUtilities: () => { switch(I.orthogonal('touch-moves')) {
2879-
case 'switch': if(S.RVM != 'paged' && I.AxisSwitcher) return I.AxisSwitcher.switchAxis; break;
2878+
getOrthogonalTouchMoveFunction: () => { switch(I.orthogonal('touch-moves')) {
2879+
case 'switch': if(I.AxisSwitcher) return I.AxisSwitcher.switchAxis; break;
28802880
case 'utilities': return I.Utilities.toggleGracefuly; break;
28812881
} },
28822882
getCNPf: (Ele) => Ele.ownerDocument == document ? '' : 'bibi-',
@@ -4568,7 +4568,7 @@ I.AxisSwitcher = { create: () => { if(S['fix-reader-view-mode']) return I.AxisSw
45684568
switchAxis: () => new Promise(resolve => {
45694569
if(S.RVM == 'paged') return resolve();
45704570
const ViewMode = S.RVM == 'horizontal' ? 'vertical' : 'horizontal';
4571-
I.Menu.Config.ViewModeSection.ButtonGroups[0].Buttons.filter(I => I.Mode == ViewMode)[0].BibiTapObserver.onTap();
4571+
I.Menu.Config.ViewModeSection.ButtonGroups[0].Buttons.filter(Button => Button.Mode == ViewMode)[0].BibiTapObserver.onTap();
45724572
resolve();
45734573
})
45744574
};

0 commit comments

Comments
 (0)