Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PHP
vryPanoEdit
Commits
680c7a07
Commit
680c7a07
authored
4 years ago
by
李文起
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix/v1.3.3.3' into 'master'
富文本更改 See merge request
!140
parents
360f3747
fa481b5e
master
hotfix/v1.3.3.25
hotfix/v1.3.3.26
hotfix/v1.3.3.27
hotfix/v1.3.3.28
hotfix/v1.3.3.29
hotfix/v1.3.3.30
hotfix/v1.3.3.31
v2
v1.3.3.31
v1.3.3.30
v1.3.3.29
v1.3.3.28
v1.3.3.27
v1.3.3.26
v1.3.3.25
v1.3.3.24
v1.3.3.23
v1.3.3.22
v1.3.3.21
v1.3.3.20
v1.3.3.19
v1.3.3.18
v1.3.3.17
v1.3.3.16
v1.3.3.15
v1.3.3.14
v1.3.3.13
v1.3.3.12
v1.3.3.11
v1.3.3.10
v1.3.3.9
v1.3.3.8
v1.3.3.7
v1.3.3.6
v1.3.3.5
v1.3.3.4
v1.3.3.3
hnddy/v1.0.0.3
hnddy/v1.0.0.2
hnddy-v1.0.1
hnddy-v1.0.0.4
hnddy-v1.0.0.1
hnddy-v1.0.0
1 merge request
!140
富文本更改
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Model/RichText.php
+2
-2
src/Model/RichText.php
src/Services/Hotspot/HotspotAction/RichTextHotspot.php
+2
-2
src/Services/Hotspot/HotspotAction/RichTextHotspot.php
with
4 additions
and
4 deletions
+4
-4
src/Model/RichText.php
View file @
680c7a07
...
...
@@ -15,9 +15,9 @@ class RichText extends Model
/**
* 处理表情
*/
public
function
setContentAttribute
(
$value
){
/*
public function setContentAttribute($value){
return $this->attributes['content'] = Emoji::encode($value);
}
}
*/
public
function
getContentAttribute
(){
return
Emoji
::
decode
(
$this
->
attributes
[
'content'
]);
...
...
This diff is collapsed.
Click to expand it.
src/Services/Hotspot/HotspotAction/RichTextHotspot.php
View file @
680c7a07
...
...
@@ -16,7 +16,7 @@ class RichTextHotspot extends HotspotAction
if
(
!
empty
(
$this
->
data
[
'actionData'
][
'htmlContent'
]))
{
$htmlContent
=
$this
->
data
[
'actionData'
][
'htmlContent'
];
$htmlContent
=
Emoji
::
encode
(
$this
->
data
[
'actionData'
][
'htmlContent'
]
)
;
unset
(
$this
->
data
[
'actionData'
][
'htmlContent'
]);
}
else
{
...
...
@@ -26,7 +26,7 @@ class RichTextHotspot extends HotspotAction
$richTextInterface
=
resolve
(
'Yjtec\PanoEdit\Repositories\Contracts\RichTextInterface'
);
if
(
!
empty
(
$this
->
data
[
'actionData'
][
'richTextId'
]))
{
$richTextInterface
->
update
([
'id'
=>
$this
->
data
[
'actionData'
][
'richTextId'
]],[
'uuid'
=>
$this
->
data
[
'actionData'
][
'id'
],
'content'
=>
$htmlContent
]);
$richTextInterface
->
update
([
'id'
=>
$this
->
data
[
'actionData'
][
'richTextId'
]],[
'uuid'
=>
$this
->
data
[
'actionData'
][
'
uu
id'
],
'content'
=>
$htmlContent
]);
}
else
{
$richText
=
$richTextInterface
->
index
([
'uuid'
=>
$this
->
data
[
'actionData'
][
'uuid'
]]);
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help