Skip to content

모바일 환경에서도 에디터를 사용할 수 있는 기반 PR #1495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
misol wants to merge 4 commits into from
Closed

모바일 환경에서도 에디터를 사용할 수 있는 기반 PR #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecce7e5
Merge pull request #10 from xpressengine/develop
misol May 24, 2015
e445d78
모바일에서도 에디터를 쓸 수 있도록 합니다.
misol May 25, 2015
a3e307a
잘못 수정한 조건식을 의도에 맞게 수정.
misol May 25, 2015
f0ca885
댓글에서도 에디터를 쓸 수 있는 설정을 만들어둡니다.
misol Jun 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/comment/comment.controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ function insertComment($obj, $manual_inserted = FALSE)
// remove XE's own tags from the contents
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);

if(Mobile::isFromMobilePhone())
if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{
Expand Down Expand Up @@ -721,7 +721,7 @@ function updateComment($obj, $is_admin = FALSE)
// remove XE's wn tags from contents
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);

if(Mobile::isFromMobilePhone())
if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{
Expand Down
4 changes: 2 additions & 2 deletions modules/document/document.controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ function insertDocument($obj, $manual_inserted = false, $isRestore = false, $isL
if($obj->title == '') $obj->title = 'Untitled';
// Remove XE's own tags from the contents.
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
if(Mobile::isFromMobilePhone())
if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{
Expand Down Expand Up @@ -478,7 +478,7 @@ function updateDocument($source_obj, $obj, $manual_updated = FALSE)
if($obj->title == '') $obj->title = 'Untitled';
// Remove XE's own tags from the contents.
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
if(Mobile::isFromMobilePhone())
if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{
Expand Down