Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
augmentor
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
augmentor
Commits
e6fe1d77
Commit
e6fe1d77
authored
May 10, 2023
by
Naveen Valecha
Committed by
Eleo Basili
May 10, 2023
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#3359172
: Augmentor Ckeditor5 select list is broken
parent
9516f42d
No related branches found
No related tags found
1 merge request
!12
Issue #3359172: Augmentor Ckeditor5 select list is broken
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/augmentor_ckeditor5/js/build/augmentor.js
+1
-1
1 addition, 1 deletion
modules/augmentor_ckeditor5/js/build/augmentor.js
modules/augmentor_ckeditor5/js/ckeditor5_plugins/augmentor/src/execute/executecommand.js
+11
-7
11 additions, 7 deletions
...ckeditor5_plugins/augmentor/src/execute/executecommand.js
with
12 additions
and
8 deletions
modules/augmentor_ckeditor5/js/build/augmentor.js
+
1
−
1
View file @
e6fe1d77
!
function
(
e
,
t
){
"
object
"
==
typeof
exports
&&
"
object
"
==
typeof
module
?
module
.
exports
=
t
():
"
function
"
==
typeof
define
&&
define
.
amd
?
define
([],
t
):
"
object
"
==
typeof
exports
?
exports
.
CKEditor5
=
t
():(
e
.
CKEditor5
=
e
.
CKEditor5
||
{},
e
.
CKEditor5
.
augmentor
=
t
())}(
self
,(()
=>
(()
=>
{
var
e
=
{
"
ckeditor5/src/core.js
"
:(
e
,
t
,
o
)
=>
{
e
.
exports
=
o
(
"
dll-reference CKEditor5.dll
"
)(
"
./src/core.js
"
)},
"
ckeditor5/src/ui.js
"
:(
e
,
t
,
o
)
=>
{
e
.
exports
=
o
(
"
dll-reference CKEditor5.dll
"
)(
"
./src/ui.js
"
)},
"
ckeditor5/src/utils.js
"
:(
e
,
t
,
o
)
=>
{
e
.
exports
=
o
(
"
dll-reference CKEditor5.dll
"
)(
"
./src/utils.js
"
)},
"
dll-reference CKEditor5.dll
"
:
e
=>
{
"
use strict
"
;
e
.
exports
=
CKEditor5
.
dll
}},
t
=
{};
function
o
(
r
){
var
s
=
t
[
r
];
if
(
void
0
!==
s
)
return
s
.
exports
;
var
n
=
t
[
r
]
=
{
exports
:{}};
return
e
[
r
](
n
,
n
.
exports
,
o
),
n
.
exports
}
o
.
d
=
(
e
,
t
)
=>
{
for
(
var
r
in
t
)
o
.
o
(
t
,
r
)
&&!
o
.
o
(
e
,
r
)
&&
Object
.
defineProperty
(
e
,
r
,{
enumerable
:
!
0
,
get
:
t
[
r
]})},
o
.
o
=
(
e
,
t
)
=>
Object
.
prototype
.
hasOwnProperty
.
call
(
e
,
t
);
var
r
=
{};
return
(()
=>
{
"
use strict
"
;
o
.
d
(
r
,{
default
:()
=>
c
});
var
e
=
o
(
"
ckeditor5/src/core.js
"
),
t
=
o
(
"
ckeditor5/src/ui.js
"
);
var
s
=
o
(
"
ckeditor5/src/utils.js
"
);
class
n
extends
e
.
Command
{
constructor
(
e
,
t
){
super
(
e
),
this
.
_config
=
t
}
execute
(
e
=
{}){
const
t
=
this
.
editor
,
o
=
t
.
model
.
document
.
selection
.
getFirstRange
();
let
r
=
null
;
for
(
const
e
of
o
.
getItems
())
r
=
e
.
data
;
var
s
=
{
input
:
r
,
augmentor
:
e
,
type
:
"
ckeditor
"
};
t
.
model
.
change
((
e
=>
{
fetch
(
drupalSettings
.
path
.
baseUrl
+
"
augmentor/execute/augmentor
"
,{
method
:
"
POST
"
,
credentials
:
"
same-origin
"
,
body
:
JSON
.
stringify
(
s
)}).
then
((
e
=>
{
if
(
jQuery
(
"
.ajax-progress--fullscreen
"
).
remove
(),
e
.
ok
)
return
e
.
json
();
this
.
_showError
(
JSON
.
parse
(
result
.
responseJSON
))})).
then
((
e
=>
this
.
_updateCkeditor
(
e
,
o
))).
catch
((
e
=>
{
this
.
_showError
(
e
)}))}))}
_updateCkeditor
(
e
,
t
){
var
o
=
JSON
.
parse
(
e
);
o
=
o
.
default
.
toString
();
const
r
=
this
.
editor
,
s
=
r
.
data
.
processor
.
toView
(
o
),
n
=
r
.
data
.
toModel
(
s
);
r
.
model
.
insertContent
(
n
,
t
)}
_showError
(
e
){
const
t
=
new
Drupal
.
Message
;
t
.
clear
(),
t
.
add
(
e
,{
type
:
"
error
"
}),
jQuery
(
"
html, body
"
).
animate
({
scrollTop
:
0
},
"
slow
"
)}}
class
d
extends
e
.
Plugin
{
init
(){
const
e
=
this
.
editor
,
o
=
this
.
editor
.
config
.
get
(
"
augmentors
"
)[
0
].
augmentors
;
e
.
commands
.
add
(
"
executeCommand
"
,
new
n
(
e
,
o
)),
e
.
ui
.
componentFactory
.
add
(
"
augmentor
"
,(
e
=>
{
const
r
=
new
s
.
Collection
;
Object
.
keys
(
o
).
forEach
((
e
=>
{
r
.
add
({
type
:
"
button
"
,
model
:
new
t
.
Model
({
id
:
e
,
label
:
o
[
e
],
withText
:
!
0
,
command
:
"
executeCommand
"
})})}));
const
n
=
(
0
,
t
.
createDropdown
)(
e
,
t
.
DropdownButtonView
);
return
(
0
,
t
.
addListToDropdown
)(
n
,
r
),
n
.
buttonView
.
set
({
label
:
"
Augmentors
"
,
class
:
"
augmentor-dropdown
"
,
icon
:
'
<?xml version="1.0" standalone="no"?>
\n
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
\n
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
\n
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
\n
width="16.000000pt" height="16.000000pt" viewBox="0 0 16.000000 16.000000"
\n
preserveAspectRatio="xMidYMid meet">
\n\n
<g transform="translate(0.000000,16.000000) scale(0.100000,-0.100000)"
\n
fill="#000000" stroke="none">
\n
<path d="M25 135 c-50 -49 -15 -135 55 -135 41 0 80 39 80 80 0 41 -39 80 -80
\n
80 -19 0 -40 -9 -55 -25z m97 -12 c38 -34 11 -103 -40 -103 -54 0 -81 62 -45
\n
102 20 22 61 23 85 1z"/>
\n
<path d="M50 105 c-26 -32 13 -81 48 -59 9 6 18 19 20 28 8 38 -43 61 -68 31z
\n
m46 -16 c10 -17 -13 -36 -27 -22 -12 12 -4 33 11 33 5 0 12 -5 16 -11z"/>
\n
</g>
\n
</svg>
\n
'
,
tooltip
:
!
0
,
withText
:
!
0
}),
this
.
listenTo
(
n
,
"
execute
"
,(
e
=>
{
var
t
=
this
.
editor
.
sourceElement
.
id
;
jQuery
(
"
#
"
+
t
).
before
(
Drupal
.
theme
.
ajaxProgressIndicatorFullscreen
()),
this
.
editor
.
execute
(
e
.
source
.
command
,
e
.
source
.
id
)})),
n
}))}}
class
i
extends
e
.
Plugin
{
static
get
requires
(){
return
[
d
,
t
.
ContextualBalloon
]}}
const
c
=
{
augmentor
:
i
}})(),
r
=
r
.
default
})()));
\ No newline at end of file
!
function
(
e
,
t
){
"
object
"
==
typeof
exports
&&
"
object
"
==
typeof
module
?
module
.
exports
=
t
():
"
function
"
==
typeof
define
&&
define
.
amd
?
define
([],
t
):
"
object
"
==
typeof
exports
?
exports
.
CKEditor5
=
t
():(
e
.
CKEditor5
=
e
.
CKEditor5
||
{},
e
.
CKEditor5
.
augmentor
=
t
())}(
self
,(()
=>
(()
=>
{
var
e
=
{
"
ckeditor5/src/core.js
"
:(
e
,
t
,
o
)
=>
{
e
.
exports
=
o
(
"
dll-reference CKEditor5.dll
"
)(
"
./src/core.js
"
)},
"
ckeditor5/src/ui.js
"
:(
e
,
t
,
o
)
=>
{
e
.
exports
=
o
(
"
dll-reference CKEditor5.dll
"
)(
"
./src/ui.js
"
)},
"
ckeditor5/src/utils.js
"
:(
e
,
t
,
o
)
=>
{
e
.
exports
=
o
(
"
dll-reference CKEditor5.dll
"
)(
"
./src/utils.js
"
)},
"
dll-reference CKEditor5.dll
"
:
e
=>
{
"
use strict
"
;
e
.
exports
=
CKEditor5
.
dll
}},
t
=
{};
function
o
(
r
){
var
s
=
t
[
r
];
if
(
void
0
!==
s
)
return
s
.
exports
;
var
n
=
t
[
r
]
=
{
exports
:{}};
return
e
[
r
](
n
,
n
.
exports
,
o
),
n
.
exports
}
o
.
d
=
(
e
,
t
)
=>
{
for
(
var
r
in
t
)
o
.
o
(
t
,
r
)
&&!
o
.
o
(
e
,
r
)
&&
Object
.
defineProperty
(
e
,
r
,{
enumerable
:
!
0
,
get
:
t
[
r
]})},
o
.
o
=
(
e
,
t
)
=>
Object
.
prototype
.
hasOwnProperty
.
call
(
e
,
t
);
var
r
=
{};
return
(()
=>
{
"
use strict
"
;
o
.
d
(
r
,{
default
:()
=>
a
});
var
e
=
o
(
"
ckeditor5/src/core.js
"
),
t
=
o
(
"
ckeditor5/src/ui.js
"
);
var
s
=
o
(
"
ckeditor5/src/utils.js
"
);
class
n
extends
e
.
Command
{
constructor
(
e
,
t
){
super
(
e
),
this
.
_config
=
t
}
execute
(
e
=
{}){
const
t
=
this
.
editor
,
o
=
t
.
model
.
document
.
selection
,
r
=
o
.
getRanges
();
let
s
=
""
;
for
(
let
e
of
r
)
for
(
let
t
of
e
.
getItems
())
void
0
!==
t
.
data
&&
(
s
=
s
+
t
.
data
+
"
"
);
var
n
=
{
input
:
s
,
augmentor
:
e
,
type
:
"
ckeditor
"
};
t
.
model
.
change
((
e
=>
{
fetch
(
drupalSettings
.
path
.
baseUrl
+
"
augmentor/execute/augmentor
"
,{
method
:
"
POST
"
,
credentials
:
"
same-origin
"
,
body
:
JSON
.
stringify
(
n
)}).
then
((
e
=>
{
if
(
jQuery
(
"
.ajax-progress--fullscreen
"
).
remove
(),
e
.
ok
)
return
e
.
json
();
this
.
_showError
(
JSON
.
parse
(
result
.
responseJSON
))})).
then
((
e
=>
this
.
_updateCkeditor
(
e
,
o
))).
catch
((
e
=>
{
this
.
_showError
(
e
)}))}))}
_updateCkeditor
(
e
,
t
){
var
o
=
JSON
.
parse
(
e
);
o
=
o
.
default
.
toString
();
const
r
=
this
.
editor
,
s
=
r
.
data
.
processor
.
toView
(
o
),
n
=
r
.
data
.
toModel
(
s
);
r
.
model
.
insertContent
(
n
,
t
)}
_showError
(
e
){
const
t
=
new
Drupal
.
Message
;
t
.
clear
(),
t
.
add
(
e
,{
type
:
"
error
"
}),
jQuery
(
"
html, body
"
).
animate
({
scrollTop
:
0
},
"
slow
"
)}}
class
d
extends
e
.
Plugin
{
init
(){
const
e
=
this
.
editor
,
o
=
this
.
editor
.
config
.
get
(
"
augmentors
"
)[
0
].
augmentors
;
e
.
commands
.
add
(
"
executeCommand
"
,
new
n
(
e
,
o
)),
e
.
ui
.
componentFactory
.
add
(
"
augmentor
"
,(
e
=>
{
const
r
=
new
s
.
Collection
;
Object
.
keys
(
o
).
forEach
((
e
=>
{
r
.
add
({
type
:
"
button
"
,
model
:
new
t
.
Model
({
id
:
e
,
label
:
o
[
e
],
withText
:
!
0
,
command
:
"
executeCommand
"
})})}));
const
n
=
(
0
,
t
.
createDropdown
)(
e
,
t
.
DropdownButtonView
);
return
(
0
,
t
.
addListToDropdown
)(
n
,
r
),
n
.
buttonView
.
set
({
label
:
"
Augmentors
"
,
class
:
"
augmentor-dropdown
"
,
icon
:
'
<?xml version="1.0" standalone="no"?>
\n
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
\n
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
\n
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
\n
width="16.000000pt" height="16.000000pt" viewBox="0 0 16.000000 16.000000"
\n
preserveAspectRatio="xMidYMid meet">
\n\n
<g transform="translate(0.000000,16.000000) scale(0.100000,-0.100000)"
\n
fill="#000000" stroke="none">
\n
<path d="M25 135 c-50 -49 -15 -135 55 -135 41 0 80 39 80 80 0 41 -39 80 -80
\n
80 -19 0 -40 -9 -55 -25z m97 -12 c38 -34 11 -103 -40 -103 -54 0 -81 62 -45
\n
102 20 22 61 23 85 1z"/>
\n
<path d="M50 105 c-26 -32 13 -81 48 -59 9 6 18 19 20 28 8 38 -43 61 -68 31z
\n
m46 -16 c10 -17 -13 -36 -27 -22 -12 12 -4 33 11 33 5 0 12 -5 16 -11z"/>
\n
</g>
\n
</svg>
\n
'
,
tooltip
:
!
0
,
withText
:
!
0
}),
this
.
listenTo
(
n
,
"
execute
"
,(
e
=>
{
var
t
=
this
.
editor
.
sourceElement
.
id
;
jQuery
(
"
#
"
+
t
).
before
(
Drupal
.
theme
.
ajaxProgressIndicatorFullscreen
()),
this
.
editor
.
execute
(
e
.
source
.
command
,
e
.
source
.
id
)})),
n
}))}}
class
i
extends
e
.
Plugin
{
static
get
requires
(){
return
[
d
,
t
.
ContextualBalloon
]}}
const
a
=
{
augmentor
:
i
}})(),
r
=
r
.
default
})()));
\ No newline at end of file
This diff is collapsed.
Click to expand it.
modules/augmentor_ckeditor5/js/ckeditor5_plugins/augmentor/src/execute/executecommand.js
+
11
−
7
View file @
e6fe1d77
...
...
@@ -10,11 +10,15 @@ export default class ExecuteCommand extends Command {
const
editor
=
this
.
editor
;
const
selection
=
editor
.
model
.
document
.
selection
;
const
range
=
selection
.
get
First
Range
();
let
selectedText
=
null
;
const
range
s
=
selection
.
getRange
s
();
let
selectedText
=
''
;
for
(
const
item
of
range
.
getItems
())
{
selectedText
=
item
.
data
;
for
(
let
range
of
ranges
)
{
for
(
let
item
of
range
.
getItems
())
{
if
(
typeof
item
.
data
!=
'
undefined
'
)
{
selectedText
=
selectedText
+
item
.
data
+
'
'
;
}
}
}
var
options
=
{
...
...
@@ -37,20 +41,20 @@ export default class ExecuteCommand extends Command {
}
this
.
_showError
(
JSON
.
parse
(
result
.
responseJSON
));
})
.
then
((
result
)
=>
this
.
_updateCkeditor
(
result
,
range
))
.
then
((
result
)
=>
this
.
_updateCkeditor
(
result
,
selection
))
.
catch
((
error
)
=>
{
this
.
_showError
(
error
)
});
}
);
}
_updateCkeditor
(
result
,
range
)
{
_updateCkeditor
(
result
,
selection
)
{
var
output
=
JSON
.
parse
(
result
);
output
=
output
.
default
.
toString
();
const
editor
=
this
.
editor
;
const
viewFragment
=
editor
.
data
.
processor
.
toView
(
output
);
const
modelFragment
=
editor
.
data
.
toModel
(
viewFragment
);
editor
.
model
.
insertContent
(
modelFragment
,
range
);
editor
.
model
.
insertContent
(
modelFragment
,
selection
);
}
_showError
(
error
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment