From d3f8fa43085aa1858c1b6e3fbb741788e48cb691 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Fri, 11 Nov 2016 22:48:47 +0300 Subject: [PATCH] Small fixes --- dev/Styles/Layout.less | 11 ++++++++--- dev/View/User/Login.js | 2 ++ .../0.0.0/app/libraries/MailSo/Base/HtmlUtils.php | 15 ++------------- .../v/0.0.0/app/libraries/RainLoop/Actions.php | 2 +- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less index 10901b90a..c0254bc52 100644 --- a/dev/Styles/Layout.less +++ b/dev/Styles/Layout.less @@ -2,10 +2,15 @@ #rl-bg { z-index: -1; position: absolute; - left: -0; - right: -25px; + left: 0; + right: 0; top: 0; - bottom: -25px; + bottom: 0; + + &.animated { + right: -25px; + bottom: -25px; + } } #rl-content { diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index d10aa3b80..698932de1 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -490,6 +490,8 @@ class LoginUserView extends AbstractViewNext winHeightHalf = winHeight / 2, winWidthHalf = winWidth / 2; + $bg.addClass('animated'); + $('#rl-app').on('mousemove', _.throttle((e) => { $bg.css({ top: height * (e.pageY - winHeightHalf) * -1 - movementStrength, diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php index 6d7439874..4e1400b12 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php @@ -239,7 +239,7 @@ class HtmlUtils $oWrapHtml->setAttribute($sKey, $sValue); } - $oWrapDom = $oDom->createElement('div', 'xxx'); + $oWrapDom = $oDom->createElement('div', '___xxx___'); $oWrapDom->setAttribute('data-x-div-type', 'body'); foreach ($aBodylAttrs as $sKey => $sValue) { @@ -250,7 +250,7 @@ class HtmlUtils $sWrp = $oDom->saveHTML($oWrapHtml); - $sResult = \str_replace('xxx', $sResult, $sWrp); + $sResult = \str_replace('___xxx___', $sResult, $sWrp); } $sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult); @@ -280,17 +280,6 @@ class HtmlUtils $sBodyAttrs = $aMatch[1]; } -// $iPos = \stripos($sHtml, ''); -// if (0 < $iPos) -// { -// $sHtml = \substr($sHtml, $iPos); -// } -// else -// { -// $iPos = \stripos($sHtml, ']*)>/si', '', $sHtml); $sHtml = \preg_replace('/]*)>/si', '', $sHtml); $sHtml = \preg_replace('/<\/body>/i', '', $sHtml); diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 6a40a0a28..342c921f7 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -8470,7 +8470,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack /** * @param \Imagine\Image\AbstractImage $oImage */ - private function correctImageOrientation($oImage, $bDetectImageOrientation = true, $iThumbnailBoxSize = null) + public function correctImageOrientation($oImage, $bDetectImageOrientation = true, $iThumbnailBoxSize = null) { $iOrientation = 1; if ($bDetectImageOrientation && \MailSo\Base\Utils::FunctionExistsAndEnabled('exif_read_data') &&