Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ludovic Kiefer
erp5
Commits
b2917bd6
Commit
b2917bd6
authored
Aug 13, 2020
by
Ludovic Kiefer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_run_my_doc: moveSlide function now use integer parameters instead of strings
parent
c4064911
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
18 deletions
+17
-18
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/slideeditor.gadget.js.js
...tem/portal_skins/erp5_run_my_doc/slideeditor.gadget.js.js
+17
-18
No files found.
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/slideeditor.gadget.js.js
View file @
b2917bd6
...
@@ -499,6 +499,8 @@
...
@@ -499,6 +499,8 @@
// [x,y] coordinates of the slides
// [x,y] coordinates of the slides
gadget
.
slide_coordinate
=
[];
gadget
.
slide_coordinate
=
[];
// store the data-slide-index of slides in the order we want to show them
// store the data-slide-index of slides in the order we want to show them
// the key is the slide position into the list
// the value is the value of its data-slide-index converted to int
gadget
.
slide_order
=
[];
gadget
.
slide_order
=
[];
gadget
.
slide_order_start
=
[];
//used to restore the slides positions
gadget
.
slide_order_start
=
[];
//used to restore the slides positions
...
@@ -509,15 +511,14 @@
...
@@ -509,15 +511,14 @@
for
(
i
=
0
;
i
<
slide_list
.
length
-
1
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
slide_list
.
length
-
1
;
i
+=
1
)
{
coordinate
=
slide_list
[
i
].
getBoundingClientRect
();
coordinate
=
slide_list
[
i
].
getBoundingClientRect
();
gadget
.
slide_coordinate
[
i
]
=
[
coordinate
.
x
,
coordinate
.
y
];
gadget
.
slide_coordinate
[
i
]
=
[
coordinate
.
x
,
coordinate
.
y
];
gadget
.
slide_order
[
i
]
=
gadget
.
slide_order
[
i
]
=
i
;
slide_list
[
i
].
getAttribute
(
'
data-slide-index
'
);
gadget
.
slide_order_start
[
i
]
=
i
;
gadget
.
slide_order_start
[
i
]
=
gadget
.
slide_order
[
i
];
}
}
}
}
function
moveSlide
(
gadget
,
dragged_id
,
hovered_id
)
{
function
moveSlide
(
gadget
,
dragged_id
,
hovered_id
)
{
// dragged_id : data-slide-index of the dragged slide (
String
)
// dragged_id : data-slide-index of the dragged slide (
Int
)
// hovered_id : data-slide-index of the hovered slide (
String
)
// hovered_id : data-slide-index of the hovered slide (
Int
)
var
slide_list
=
gadget
.
element
.
querySelector
(
"
div.slide_list
"
).
children
,
var
slide_list
=
gadget
.
element
.
querySelector
(
"
div.slide_list
"
).
children
,
j
,
j
,
...
@@ -530,7 +531,7 @@
...
@@ -530,7 +531,7 @@
pos_y
;
pos_y
;
// reset slides positions on dragend event
// reset slides positions on dragend event
if
(
dragged_id
===
"
-1
"
)
{
if
(
dragged_id
===
-
1
)
{
for
(
j
=
0
;
j
<
gadget
.
slide_order
.
length
;
j
+=
1
)
{
for
(
j
=
0
;
j
<
gadget
.
slide_order
.
length
;
j
+=
1
)
{
gadget
.
slide_order
[
j
]
=
gadget
.
slide_order_start
[
j
];
gadget
.
slide_order
[
j
]
=
gadget
.
slide_order_start
[
j
];
slide_list
[
j
].
style
.
left
=
"
0
"
;
slide_list
[
j
].
style
.
left
=
"
0
"
;
...
@@ -551,17 +552,15 @@
...
@@ -551,17 +552,15 @@
gadget
.
hovered_slide
=
hovered_index
.
toString
();
gadget
.
hovered_slide
=
hovered_index
.
toString
();
for
(
i
=
0
;
i
<
gadget
.
slide_order
.
length
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
gadget
.
slide_order
.
length
;
i
+=
1
)
{
// Find slide that should be shown at that index
// Find slide that should be shown at that index
slide
=
slide_list
[
parseInt
(
gadget
.
slide_order
[
i
],
10
)
];
slide
=
slide_list
[
gadget
.
slide_order
[
i
]
];
//displace the slide at this relative position (CSS only, DOM unchanged)
//displace the slide at this relative position (CSS only, DOM unchanged)
pos_x
=
gadget
.
slide_coordinate
[
parseInt
(
pos_x
=
gadget
.
slide_coordinate
[
gadget
.
slide_order
[
i
],
gadget
.
slide_order
[
i
]
10
][
0
];
)][
0
];
pos_y
=
gadget
.
slide_coordinate
[
pos_y
=
gadget
.
slide_coordinate
[
parseInt
(
gadget
.
slide_order
[
i
]
gadget
.
slide_order
[
i
],
][
1
];
10
)][
1
];
slide
.
style
.
left
=
(
gadget
.
slide_coordinate
[
i
][
0
]
-
slide
.
style
.
left
=
(
gadget
.
slide_coordinate
[
i
][
0
]
-
pos_x
).
toString
()
+
"
px
"
;
pos_x
).
toString
()
+
"
px
"
;
slide
.
style
.
top
=
(
gadget
.
slide_coordinate
[
i
][
1
]
-
slide
.
style
.
top
=
(
gadget
.
slide_coordinate
[
i
][
1
]
-
...
@@ -809,7 +808,7 @@
...
@@ -809,7 +808,7 @@
},
false
,
false
)
},
false
,
false
)
.
onEvent
(
"
dragend
"
,
function
(
evt
)
{
.
onEvent
(
"
dragend
"
,
function
(
evt
)
{
moveSlide
(
this
,
"
-1
"
,
"
-1
"
);
moveSlide
(
this
,
-
1
,
-
1
);
var
closest_section
=
evt
.
target
.
closest
(
'
section
'
);
var
closest_section
=
evt
.
target
.
closest
(
'
section
'
);
if
(
closest_section
===
null
)
{
if
(
closest_section
===
null
)
{
return
;
return
;
...
@@ -844,7 +843,7 @@
...
@@ -844,7 +843,7 @@
hovered
=
closest_section
.
getAttribute
(
'
data-slide-index
'
);
hovered
=
closest_section
.
getAttribute
(
'
data-slide-index
'
);
if
(
dragged
!==
hovered
)
{
if
(
dragged
!==
hovered
)
{
if
(
closest_section
.
getAttribute
(
'
data-slide-index
'
))
{
if
(
closest_section
.
getAttribute
(
'
data-slide-index
'
))
{
moveSlide
(
this
,
dragged
,
hovered
);
moveSlide
(
this
,
parseInt
(
dragged
,
10
),
parseInt
(
hovered
,
10
)
);
}
}
}
}
...
@@ -861,7 +860,7 @@
...
@@ -861,7 +860,7 @@
closest_slidelist
=
evt
.
relatedTarget
.
closest
(
'
div.slide_list
'
);
closest_slidelist
=
evt
.
relatedTarget
.
closest
(
'
div.slide_list
'
);
if
(
closest_slidelist
===
null
)
{
if
(
closest_slidelist
===
null
)
{
// We are no longer over the slides, reset slide's positions
// We are no longer over the slides, reset slide's positions
moveSlide
(
this
,
"
-1
"
,
"
-1
"
);
moveSlide
(
this
,
-
1
,
-
1
);
}
}
}
}
},
false
,
false
)
},
false
,
false
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment