[mobile] fix for android context menu was moved to common.utils
This commit is contained in:
parent
94831d1b85
commit
e6bb8d54ca
114
apps/common/mobile/utils/utils.js
Normal file
114
apps/common/mobile/utils/utils.js
Normal file
|
@ -0,0 +1,114 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* (c) Copyright Ascensio System Limited 2010-2016
|
||||||
|
*
|
||||||
|
* This program is a free software product. You can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||||
|
* version 3 as published by the Free Software Foundation. In accordance with
|
||||||
|
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||||
|
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||||
|
* of any third-party rights.
|
||||||
|
*
|
||||||
|
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||||
|
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||||
|
*
|
||||||
|
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
|
||||||
|
* EU, LV-1021.
|
||||||
|
*
|
||||||
|
* The interactive user interfaces in modified source and object code versions
|
||||||
|
* of the Program must display Appropriate Legal Notices, as required under
|
||||||
|
* Section 5 of the GNU AGPL version 3.
|
||||||
|
*
|
||||||
|
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||||
|
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||||
|
* grant you any rights under trademark law for use of our trademarks.
|
||||||
|
*
|
||||||
|
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||||
|
* well as technical writing content are licensed under the terms of the
|
||||||
|
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||||
|
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* utils.js
|
||||||
|
*
|
||||||
|
* Created by Maxim.Kadushkin on 1/30/2017
|
||||||
|
* Copyright (c) 2016 Ascensio System SIA. All rights reserved.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
define([
|
||||||
|
'jquery',
|
||||||
|
'underscore'
|
||||||
|
], function ($, _) {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
!Common && (Common = {});
|
||||||
|
!Common.Utils && (Common.Utils = {});
|
||||||
|
|
||||||
|
Common.Utils.androidMenuTop = function ($popover, $target) {
|
||||||
|
$popover.css({left: '', top: ''});
|
||||||
|
var modalWidth = $popover.width();
|
||||||
|
var modalHeight = $popover.height();
|
||||||
|
var modalAngleSize = 10;
|
||||||
|
var targetWidth = $target.outerWidth();
|
||||||
|
var targetHeight = $target.outerHeight();
|
||||||
|
var targetOffset = $target.offset();
|
||||||
|
var targetParentPage = $target.parents('.page');
|
||||||
|
if (targetParentPage.length > 0) {
|
||||||
|
targetOffset.top = targetOffset.top - targetParentPage[0].scrollTop;
|
||||||
|
}
|
||||||
|
|
||||||
|
var windowHeight = $(window).height();
|
||||||
|
var windowWidth = $(window).width();
|
||||||
|
|
||||||
|
var modalTop = 0;
|
||||||
|
var modalLeft = 0;
|
||||||
|
|
||||||
|
// Top Position
|
||||||
|
var modalPosition = 'top';// material ? 'bottom' : 'top';
|
||||||
|
{
|
||||||
|
if ((modalHeight + modalAngleSize) < targetOffset.top) {
|
||||||
|
// On top
|
||||||
|
modalTop = targetOffset.top - modalHeight - modalAngleSize;
|
||||||
|
}
|
||||||
|
else if ((modalHeight + modalAngleSize) < windowHeight - targetOffset.top - targetHeight) {
|
||||||
|
// On bottom
|
||||||
|
modalPosition = 'bottom';
|
||||||
|
modalTop = targetOffset.top + targetHeight + modalAngleSize;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// On middle
|
||||||
|
modalPosition = 'middle';
|
||||||
|
modalTop = targetHeight / 2 + targetOffset.top - modalHeight / 2;
|
||||||
|
|
||||||
|
if (modalTop <= 0) {
|
||||||
|
modalTop = 5;
|
||||||
|
}
|
||||||
|
else if (modalTop + modalHeight >= windowHeight) {
|
||||||
|
modalTop = windowHeight - modalHeight - 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Horizontal Position
|
||||||
|
if (modalPosition === 'top' || modalPosition === 'bottom') {
|
||||||
|
modalLeft = targetWidth / 2 + targetOffset.left - modalWidth / 2;
|
||||||
|
if (modalLeft < 5) modalLeft = 5;
|
||||||
|
if (modalLeft + modalWidth > windowWidth) modalLeft = windowWidth - modalWidth - 5;
|
||||||
|
}
|
||||||
|
else if (modalPosition === 'middle') {
|
||||||
|
modalLeft = targetOffset.left - modalWidth - modalAngleSize;
|
||||||
|
|
||||||
|
if (modalLeft < 5 || (modalLeft + modalWidth > windowWidth)) {
|
||||||
|
if (modalLeft < 5) modalLeft = targetOffset.left + targetWidth + modalAngleSize;
|
||||||
|
if (modalLeft + modalWidth > windowWidth) modalLeft = windowWidth - modalWidth - 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply Styles
|
||||||
|
$popover.css({top: modalTop + 'px', left: modalLeft + 'px'});
|
||||||
|
};
|
||||||
|
});
|
|
@ -43,7 +43,8 @@
|
||||||
define([
|
define([
|
||||||
'jquery',
|
'jquery',
|
||||||
'underscore',
|
'underscore',
|
||||||
'backbone'
|
'backbone',
|
||||||
|
'common/mobile/utils/utils'
|
||||||
], function ($, _, Backbone) {
|
], function ($, _, Backbone) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
@ -51,70 +52,6 @@ define([
|
||||||
// private
|
// private
|
||||||
var _anchorId = 'context-menu-target';
|
var _anchorId = 'context-menu-target';
|
||||||
|
|
||||||
function androidSizeMenu(popover, target) {
|
|
||||||
popover.css({left: '', top: ''});
|
|
||||||
var modalWidth = popover.width();
|
|
||||||
var modalHeight = popover.height();
|
|
||||||
var modalAngleSize = 10;
|
|
||||||
var targetWidth = target.outerWidth();
|
|
||||||
var targetHeight = target.outerHeight();
|
|
||||||
var targetOffset = target.offset();
|
|
||||||
var targetParentPage = target.parents('.page');
|
|
||||||
if (targetParentPage.length > 0) {
|
|
||||||
targetOffset.top = targetOffset.top - targetParentPage[0].scrollTop;
|
|
||||||
}
|
|
||||||
|
|
||||||
var windowHeight = $(window).height();
|
|
||||||
var windowWidth = $(window).width();
|
|
||||||
|
|
||||||
var modalTop = 0;
|
|
||||||
var modalLeft = 0;
|
|
||||||
|
|
||||||
// Top Position
|
|
||||||
var modalPosition = 'top';// material ? 'bottom' : 'top';
|
|
||||||
{
|
|
||||||
if ((modalHeight + modalAngleSize) < targetOffset.top) {
|
|
||||||
// On top
|
|
||||||
modalTop = targetOffset.top - modalHeight - modalAngleSize;
|
|
||||||
}
|
|
||||||
else if ((modalHeight + modalAngleSize) < windowHeight - targetOffset.top - targetHeight) {
|
|
||||||
// On bottom
|
|
||||||
modalPosition = 'bottom';
|
|
||||||
modalTop = targetOffset.top + targetHeight + modalAngleSize;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// On middle
|
|
||||||
modalPosition = 'middle';
|
|
||||||
modalTop = targetHeight / 2 + targetOffset.top - modalHeight / 2;
|
|
||||||
|
|
||||||
if (modalTop <= 0) {
|
|
||||||
modalTop = 5;
|
|
||||||
}
|
|
||||||
else if (modalTop + modalHeight >= windowHeight) {
|
|
||||||
modalTop = windowHeight - modalHeight - 5;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Horizontal Position
|
|
||||||
if (modalPosition === 'top' || modalPosition === 'bottom') {
|
|
||||||
modalLeft = targetWidth / 2 + targetOffset.left - modalWidth / 2;
|
|
||||||
if (modalLeft < 5) modalLeft = 5;
|
|
||||||
if (modalLeft + modalWidth > windowWidth) modalLeft = windowWidth - modalWidth - 5;
|
|
||||||
}
|
|
||||||
else if (modalPosition === 'middle') {
|
|
||||||
modalLeft = targetOffset.left - modalWidth - modalAngleSize;
|
|
||||||
|
|
||||||
if (modalLeft < 5 || (modalLeft + modalWidth > windowWidth)) {
|
|
||||||
if (modalLeft < 5) modalLeft = targetOffset.left + targetWidth + modalAngleSize;
|
|
||||||
if (modalLeft + modalWidth > windowWidth) modalLeft = windowWidth - modalWidth - 5;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply Styles
|
|
||||||
popover.css({top: modalTop + 'px', left: modalLeft + 'px'});
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
el: '#editor_sdk',
|
el: '#editor_sdk',
|
||||||
|
|
||||||
|
@ -167,7 +104,7 @@ define([
|
||||||
var popover = uiApp.popover(popoverHTML, $('#' + _anchorId));
|
var popover = uiApp.popover(popoverHTML, $('#' + _anchorId));
|
||||||
|
|
||||||
if (Common.SharedSettings.get('android')) {
|
if (Common.SharedSettings.get('android')) {
|
||||||
androidSizeMenu($(popover), $('#' + _anchorId));
|
Common.Utils.androidMenuTop($(popover), $('#' + _anchorId));
|
||||||
}
|
}
|
||||||
|
|
||||||
$('.modal-overlay').removeClass('modal-overlay-visible');
|
$('.modal-overlay').removeClass('modal-overlay-visible');
|
||||||
|
|
|
@ -43,7 +43,8 @@
|
||||||
define([
|
define([
|
||||||
'jquery',
|
'jquery',
|
||||||
'underscore',
|
'underscore',
|
||||||
'backbone'
|
'backbone',
|
||||||
|
'common/mobile/utils/utils'
|
||||||
], function ($, _, Backbone) {
|
], function ($, _, Backbone) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
@ -51,70 +52,6 @@ define([
|
||||||
// private
|
// private
|
||||||
var _anchorId = 'context-menu-target';
|
var _anchorId = 'context-menu-target';
|
||||||
|
|
||||||
function androidSizeMenu(popover, target) {
|
|
||||||
popover.css({left: '', top: ''});
|
|
||||||
var modalWidth = popover.width();
|
|
||||||
var modalHeight = popover.height();
|
|
||||||
var modalAngleSize = 10;
|
|
||||||
var targetWidth = target.outerWidth();
|
|
||||||
var targetHeight = target.outerHeight();
|
|
||||||
var targetOffset = target.offset();
|
|
||||||
var targetParentPage = target.parents('.page');
|
|
||||||
if (targetParentPage.length > 0) {
|
|
||||||
targetOffset.top = targetOffset.top - targetParentPage[0].scrollTop;
|
|
||||||
}
|
|
||||||
|
|
||||||
var windowHeight = $(window).height();
|
|
||||||
var windowWidth = $(window).width();
|
|
||||||
|
|
||||||
var modalTop = 0;
|
|
||||||
var modalLeft = 0;
|
|
||||||
|
|
||||||
// Top Position
|
|
||||||
var modalPosition = 'top';// material ? 'bottom' : 'top';
|
|
||||||
{
|
|
||||||
if ((modalHeight + modalAngleSize) < targetOffset.top) {
|
|
||||||
// On top
|
|
||||||
modalTop = targetOffset.top - modalHeight - modalAngleSize;
|
|
||||||
}
|
|
||||||
else if ((modalHeight + modalAngleSize) < windowHeight - targetOffset.top - targetHeight) {
|
|
||||||
// On bottom
|
|
||||||
modalPosition = 'bottom';
|
|
||||||
modalTop = targetOffset.top + targetHeight + modalAngleSize;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// On middle
|
|
||||||
modalPosition = 'middle';
|
|
||||||
modalTop = targetHeight / 2 + targetOffset.top - modalHeight / 2;
|
|
||||||
|
|
||||||
if (modalTop <= 0) {
|
|
||||||
modalTop = 5;
|
|
||||||
}
|
|
||||||
else if (modalTop + modalHeight >= windowHeight) {
|
|
||||||
modalTop = windowHeight - modalHeight - 5;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Horizontal Position
|
|
||||||
if (modalPosition === 'top' || modalPosition === 'bottom') {
|
|
||||||
modalLeft = targetWidth / 2 + targetOffset.left - modalWidth / 2;
|
|
||||||
if (modalLeft < 5) modalLeft = 5;
|
|
||||||
if (modalLeft + modalWidth > windowWidth) modalLeft = windowWidth - modalWidth - 5;
|
|
||||||
}
|
|
||||||
else if (modalPosition === 'middle') {
|
|
||||||
modalLeft = targetOffset.left - modalWidth - modalAngleSize;
|
|
||||||
|
|
||||||
if (modalLeft < 5 || (modalLeft + modalWidth > windowWidth)) {
|
|
||||||
if (modalLeft < 5) modalLeft = targetOffset.left + targetWidth + modalAngleSize;
|
|
||||||
if (modalLeft + modalWidth > windowWidth) modalLeft = windowWidth - modalWidth - 5;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply Styles
|
|
||||||
popover.css({top: modalTop + 'px', left: modalLeft + 'px'});
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
el: '#editor_sdk',
|
el: '#editor_sdk',
|
||||||
|
|
||||||
|
@ -167,7 +104,7 @@ define([
|
||||||
var popover = uiApp.popover(popoverHTML, $('#' + _anchorId));
|
var popover = uiApp.popover(popoverHTML, $('#' + _anchorId));
|
||||||
|
|
||||||
if (Common.SharedSettings.get('android')) {
|
if (Common.SharedSettings.get('android')) {
|
||||||
androidSizeMenu($(popover), $('#' + _anchorId));
|
Common.Utils.androidMenuTop($(popover), $('#' + _anchorId));
|
||||||
}
|
}
|
||||||
|
|
||||||
$('.modal-overlay').removeClass('modal-overlay-visible');
|
$('.modal-overlay').removeClass('modal-overlay-visible');
|
||||||
|
|
Loading…
Reference in a new issue