diff --git a/test/common/main/lib/util/utils.js b/test/common/main/lib/util/utils.js index 2d275b85ed..f43316d6fe 100644 --- a/test/common/main/lib/util/utils.js +++ b/test/common/main/lib/util/utils.js @@ -43,34 +43,6 @@ if (newDocumentPage) newDocumentPage.focus(); } - } - , dialogPrint: function(url, api) { - $('#id-print-frame').remove(); - - if ( !!url ) { - var iframePrint = document.createElement("iframe"); - - iframePrint.id = "id-print-frame"; - iframePrint.style.display = 'none'; - iframePrint.style.visibility = "hidden"; - iframePrint.style.position = "fixed"; - iframePrint.style.right = "0"; - iframePrint.style.bottom = "0"; - document.body.appendChild(iframePrint); - - iframePrint.onload = function () { - try { - iframePrint.contentWindow.focus(); - iframePrint.contentWindow.print(); - iframePrint.contentWindow.blur(); - window.focus(); - } catch (e) { - api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF)); - } - }; - - iframePrint.src = url; - } }, htmlEncode: function(value) { return $('
').text(value).html(); diff --git a/test/common/main/lib/view/LoadMask.js b/test/common/main/lib/view/LoadMask.js deleted file mode 100644 index 87f15409b3..0000000000 --- a/test/common/main/lib/view/LoadMask.js +++ /dev/null @@ -1,101 +0,0 @@ -/* - * - * (c) Copyright Ascensio System SIA 2010-2021 - * - * 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 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * 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 - * - */ -/** - * LoadMask.js - * - * Displays loading mask over selected element(s) or component. Accepts both single and multiple selectors. - * - * Created by Julia Radzhabova 24.06.2021 - * Copyright (c) 2021 Ascensio System SIA. All rights reserved. - * - */ - -!window.common && (window.common = {}); -!common.view && (common.view = {}); - -common.view.LoadMask = function(owner) { - var tpl = ''; - var ownerEl = owner || $(document.body), - loaderEl, - maskedEl, - title = '', - timerId = 0, - rendered = false; - return { - - show: function(){ - if (!loaderEl || !maskedEl) { - loaderEl = $(tpl); - maskedEl = $('
'); - } - - $('.asc-loadmask-title', loaderEl).html(title); - - // show mask after 500 ms if it wont be hided - if (!rendered) { - rendered = true; - timerId = setTimeout(function () { - ownerEl.append(maskedEl); - ownerEl.append(loaderEl); - - loaderEl.css('min-width', $('.asc-loadmask-title', loaderEl).width() + 105); - },500); - } - }, - - hide: function() { - if (timerId) { - clearTimeout(timerId); - timerId = 0; - } - maskedEl && maskedEl.remove(); - loaderEl && loaderEl.remove(); - maskedEl = loaderEl = null; - rendered = false; - }, - - setTitle: function(text) { - title = text; - - if (ownerEl && loaderEl){ - var el = $('.asc-loadmask-title', loaderEl); - el.html(title); - loaderEl.css('min-width', el.width() + 105); - } - } - } -}; - diff --git a/test/common/main/resources/img/icon-menu-sprite.svg b/test/common/main/resources/img/icon-menu-sprite.svg deleted file mode 100644 index 97b51fd3eb..0000000000 --- a/test/common/main/resources/img/icon-menu-sprite.svg +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/common/main/resources/img/icon-social-sprite.svg b/test/common/main/resources/img/icon-social-sprite.svg deleted file mode 100644 index 500662ae79..0000000000 --- a/test/common/main/resources/img/icon-social-sprite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/test/common/main/resources/img/logo.svg b/test/common/main/resources/img/logo.svg deleted file mode 100644 index 0d3cb18e7e..0000000000 --- a/test/common/main/resources/img/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/test/common/main/resources/img/next-field.png b/test/common/main/resources/img/next-field.png deleted file mode 100644 index ee043c8782..0000000000 Binary files a/test/common/main/resources/img/next-field.png and /dev/null differ diff --git a/test/common/main/resources/img/previous-field.png b/test/common/main/resources/img/previous-field.png deleted file mode 100644 index 69218c6441..0000000000 Binary files a/test/common/main/resources/img/previous-field.png and /dev/null differ diff --git a/test/common/main/resources/less/common.less b/test/common/main/resources/less/common.less index 64f80cea23..a63781e394 100644 --- a/test/common/main/resources/less/common.less +++ b/test/common/main/resources/less/common.less @@ -236,12 +236,12 @@ // Logo // ------------------------- -.brand-logo { +/*.brand-logo { display: block; width: 100px; height: 24px; background: data-uri('../../../../unit-tests/common/main/resources/img/logo.svg') no-repeat; -} +}*/ // Control buttons // ------------------------- @@ -484,7 +484,7 @@ } } -.svg { +/*.svg { background: data-uri('../../../../unit-tests/common/main/resources/img/icon-social-sprite.svg'); width: 40px; @@ -498,11 +498,11 @@ &.big-twitter { .socnet-btn(1); } &.big-gplus { .socnet-btn(2); } &.big-email { .socnet-btn(3); } -} +}*/ @icon-width: 20px; @icon-height: 20px; -.svg-icon { +/*.svg-icon { background: data-uri('../../../../unit-tests/common/main/resources/img/icon-menu-sprite.svg') no-repeat; background-size: @icon-width*19 @icon-height*2; @@ -565,7 +565,7 @@ height: @icon-height; float: left; margin: -3px 4px 0 -24px; -} +}*/ .btn-icon { width: 22px; height: 22px; diff --git a/test/common/main/resources/less/loadmask.less b/test/common/main/resources/less/loadmask.less index 26d068654e..6803024ad1 100644 --- a/test/common/main/resources/less/loadmask.less +++ b/test/common/main/resources/less/loadmask.less @@ -41,13 +41,13 @@ vertical-align: middle; } - .asc-loadmask-image { + /* .asc-loadmask-image { background-image: ~"url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyOCAyOCI+PGNpcmNsZSBjeD0iMTQiIGN5PSIxNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjEuNSIgcj0iMTAuMjUiIHN0cm9rZS1kYXNoYXJyYXk9IjE2MCUsIDQwJSIgLz48L3N2Zz4=)"; height: 28px; width: 28px; float: left; margin-left: 8px; - } + }*/ .asc-loadmask-title { font-size: 13px; diff --git a/test/documenteditor/main/index.html b/test/documenteditor/main/index.html index 70f363d91e..b1ef1a729d 100644 --- a/test/documenteditor/main/index.html +++ b/test/documenteditor/main/index.html @@ -96,7 +96,6 @@ - diff --git a/test/documenteditor/main/js/ApplicationController.js b/test/documenteditor/main/js/ApplicationController.js index 6bf17e21fc..da590884f8 100644 --- a/test/documenteditor/main/js/ApplicationController.js +++ b/test/documenteditor/main/js/ApplicationController.js @@ -122,14 +122,16 @@ DE.ApplicationController = new(function(){ function onLongActionBegin(type, id) { if (type == Asc.c_oAscAsyncActionType['BlockInteraction']) { - if (!me.loadMask) + /*if (!me.loadMask) me.loadMask = new common.view.LoadMask(); - me.loadMask.show(); + me.loadMask.show();*/ + console.log('Action begin'); } } function onLongActionEnd(type, id){ - me.loadMask && me.loadMask.hide(); + //me.loadMask && me.loadMask.hide(); + console.log('Action end'); } function hidePreloader() { @@ -137,7 +139,7 @@ DE.ApplicationController = new(function(){ } function onDocumentContentReady() { - hidePreloader(); + //hidePreloader(); onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom) : -2); @@ -177,7 +179,8 @@ DE.ApplicationController = new(function(){ function onOpenDocument(progress) { var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - me.loadMask && me.loadMask.setTitle(me.textLoadingDocument + ': ' + common.utils.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + '%'); + //me.loadMask && me.loadMask.setTitle(me.textLoadingDocument + ': ' + common.utils.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + '%'); + //console.log('onOpenDocument'); } function onError(id, level, errData) { @@ -192,7 +195,7 @@ DE.ApplicationController = new(function(){ return; } - hidePreloader(); + //hidePreloader(); onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); var message; @@ -286,10 +289,11 @@ DE.ApplicationController = new(function(){ function onExternalMessage(error) { if (error) { - hidePreloader(); - $('#id-error-mask-title').text(me.criticalErrorTitle); + //hidePreloader(); + /*$('#id-error-mask-title').text(me.criticalErrorTitle); $('#id-error-mask-text').text(error.msg); - $('#id-error-mask').css('display', 'block'); + $('#id-error-mask').css('display', 'block');*/ + console.error(error.msg); } } @@ -363,7 +367,7 @@ DE.ApplicationController = new(function(){ if (api){ api.asc_registerCallback('asc_onError', onError); api.asc_registerCallback('asc_onDocumentContentReady', onDocumentContentReady); - api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); + //api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); // Initialize api gateway Common.Gateway.on('init', loadConfig); diff --git a/test/common/main/resources/less/asc-mixins.less b/test/documenteditor/main/resources/less/asc-mixins.less similarity index 100% rename from test/common/main/resources/less/asc-mixins.less rename to test/documenteditor/main/resources/less/asc-mixins.less diff --git a/test/common/main/resources/less/buttons.less b/test/documenteditor/main/resources/less/buttons.less similarity index 100% rename from test/common/main/resources/less/buttons.less rename to test/documenteditor/main/resources/less/buttons.less diff --git a/test/common/main/resources/less/colors-table-ie-fix.less b/test/documenteditor/main/resources/less/colors-table-ie-fix.less similarity index 100% rename from test/common/main/resources/less/colors-table-ie-fix.less rename to test/documenteditor/main/resources/less/colors-table-ie-fix.less diff --git a/test/common/main/resources/less/colors-table.less b/test/documenteditor/main/resources/less/colors-table.less similarity index 100% rename from test/common/main/resources/less/colors-table.less rename to test/documenteditor/main/resources/less/colors-table.less diff --git a/test/common/main/resources/less/variables.less b/test/documenteditor/main/resources/less/variables.less similarity index 100% rename from test/common/main/resources/less/variables.less rename to test/documenteditor/main/resources/less/variables.less diff --git a/test/presentationeditor/main/index.html b/test/presentationeditor/main/index.html index 94734d7d72..4ee99595f8 100644 --- a/test/presentationeditor/main/index.html +++ b/test/presentationeditor/main/index.html @@ -168,7 +168,6 @@ - diff --git a/test/presentationeditor/main/js/ApplicationController.js b/test/presentationeditor/main/js/ApplicationController.js index f181f58b41..b0194e02e4 100644 --- a/test/presentationeditor/main/js/ApplicationController.js +++ b/test/presentationeditor/main/js/ApplicationController.js @@ -114,7 +114,7 @@ PE.ApplicationController = new(function(){ } function onLongActionBegin(type, id) { - var text = ''; + /* var text = ''; switch (id) { case LoadingDocument: @@ -123,18 +123,20 @@ PE.ApplicationController = new(function(){ default: text = me.waitText; break; - } + }*/ if (type == Asc.c_oAscAsyncActionType['BlockInteraction']) { - if (!me.loadMask) + /*if (!me.loadMask) me.loadMask = new common.view.LoadMask(); me.loadMask.setTitle(text); - me.loadMask.show(); + me.loadMask.show();*/ + console.log('Action begin'); } } function onLongActionEnd(){ - me.loadMask && me.loadMask.hide(); + //me.loadMask && me.loadMask.hide(); + console.log('Action end'); } function hidePreloader() { @@ -144,7 +146,7 @@ PE.ApplicationController = new(function(){ function onDocumentContentReady() { api.ShowThumbnails(true); - hidePreloader(); + //hidePreloader(); onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); api.asc_registerCallback('asc_onHyperlinkClick', common.utils.openLink); @@ -176,7 +178,7 @@ PE.ApplicationController = new(function(){ function onOpenDocument(progress) { var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - me.loadMask && me.loadMask.setTitle(me.textLoadingDocument + ': ' + common.utils.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + '%'); + //me.loadMask && me.loadMask.setTitle(me.textLoadingDocument + ': ' + common.utils.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + '%'); } /* var isplaymode; @@ -217,7 +219,7 @@ PE.ApplicationController = new(function(){ return; } - hidePreloader(); + //hidePreloader(); onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); var message; @@ -304,7 +306,7 @@ PE.ApplicationController = new(function(){ function onExternalMessage(error) { if (error) { - hidePreloader(); + //hidePreloader(); /*$('#id-error-mask-title').text(me.criticalErrorTitle); $('#id-error-mask-text').text(error.msg); $('#id-error-mask').css('display', 'block');*/ @@ -381,7 +383,7 @@ PE.ApplicationController = new(function(){ api.asc_registerCallback('asc_onError', onError); api.asc_registerCallback('asc_onDocumentContentReady', onDocumentContentReady); - api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); + //api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); // Initialize api gateway Common.Gateway.on('init', loadConfig); diff --git a/test/spreadsheeteditor/main/index.html b/test/spreadsheeteditor/main/index.html index 2d0e93d7b8..dc77c9c734 100644 --- a/test/spreadsheeteditor/main/index.html +++ b/test/spreadsheeteditor/main/index.html @@ -155,7 +155,6 @@ - diff --git a/test/spreadsheeteditor/main/js/ApplicationController.js b/test/spreadsheeteditor/main/js/ApplicationController.js index ca4383c4cd..05b6c62137 100644 --- a/test/spreadsheeteditor/main/js/ApplicationController.js +++ b/test/spreadsheeteditor/main/js/ApplicationController.js @@ -51,7 +51,6 @@ SSE.ApplicationController = new(function(){ // ------------------------- if (typeof isBrowserSupported !== 'undefined' && !isBrowserSupported()){ - //Common.Gateway.reportError(undefined, this.unsupportedBrowserErrorText); console.error( this.unsupportedBrowserErrorText); return; } @@ -65,8 +64,8 @@ SSE.ApplicationController = new(function(){ function loadConfig(data) { config = $.extend(config, data.config); - config.canBackToFolder = (config.canBackToFolder!==false) && config.customization && config.customization.goback && - (config.customization.goback.url || config.customization.goback.requestClose && config.canRequestClose); + /*config.canBackToFolder = (config.canBackToFolder!==false) && config.customization && config.customization.goback && + (config.customization.goback.url || config.customization.goback.requestClose && config.canRequestClose);*/ } function loadDocument(data) { @@ -104,16 +103,8 @@ SSE.ApplicationController = new(function(){ docInfo.put_Lang(config.lang); docInfo.put_Mode(config.mode); - docInfo.asc_putIsEnabledMacroses(false); - docInfo.asc_putIsEnabledPlugins(false); - /*var enable = !config.customization || (config.customization.macros!==false); - docInfo.asc_putIsEnabledMacroses(!!enable); - enable = !config.customization || (config.customization.plugins!==false); - docInfo.asc_putIsEnabledPlugins(!!enable);*/ - if (api) { api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); - // api.asc_registerCallback('asc_onRunAutostartMacroses', onRunAutostartMacroses); api.asc_setDocInfo(docInfo); api.asc_getEditorPermissions(config.licenseUrl, config.customerId); api.asc_enableKeyEvents(false); @@ -157,18 +148,12 @@ SSE.ApplicationController = new(function(){ setActiveWorkSheet(api.asc_getActiveWorksheetIndex()); } - function hidePreloader() { - $('#loading-mask').fadeOut('slow'); - } - function onDocumentContentReady() { - hidePreloader(); onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); - api.asc_registerCallback('asc_onHyperlinkClick', common.utils.openLink); api.asc_registerCallback('asc_onStartAction', onLongActionBegin); - Common.Gateway.on('processmouse', onProcessMouse); - Common.Gateway.on('downloadas', onDownloadAs); + //Common.Gateway.on('processmouse', onProcessMouse); + //Common.Gateway.on('downloadas', onDownloadAs); Common.Gateway.on('requestclose', onRequestClose); @@ -189,36 +174,17 @@ SSE.ApplicationController = new(function(){ } function onEditorPermissions(params) { + api.asc_SetFastCollaborative(true); api.asc_setAutoSaveGap(1); onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); - - //api.asc_setViewMode(true); api.asc_LoadDocument(); } - - function onOpenDocument(progress) { - var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - me.loadMask && me.loadMask.setTitle(me.textLoadingDocument + ': ' + common.utils.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + '%'); - } function onLongActionBegin(type, id){ - var text = ''; - switch (id) - { - case LoadingDocument: - text = me.textLoadingDocument + ' '; - break; - default: - text = me.waitText; - break; - } if (type == Asc.c_oAscAsyncActionType['BlockInteraction']) { - if (!me.loadMask) - me.loadMask = new common.view.LoadMask(); - me.loadMask.setTitle(text); - me.loadMask.show(); + console.log('Action begin'); } } @@ -237,23 +203,16 @@ SSE.ApplicationController = new(function(){ break; } - me.loadMask && me.loadMask.hide(); + console.log('Action end'); } } function onError(id, level, errData) { if (id == Asc.c_oAscError.ID.LoadingScriptError) { - /*$('#id-critical-error-title').text(me.criticalErrorTitle); - $('#id-critical-error-message').text(me.scriptLoadError); - $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ - window.location.reload(); - }); - $('#id-critical-error-dialog').css('z-index', 20002).modal('show');*/ - console.error(me.scriptLoadError); + console.error(id,me.scriptLoadError); return; } - hidePreloader(); onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); var message; @@ -311,41 +270,18 @@ SSE.ApplicationController = new(function(){ } if (level == Asc.c_oAscError.Level.Critical) { - - // report only critical errors - //Common.Gateway.reportError(id, message); console.error(id,message); - - /* $('#id-critical-error-title').text(me.criticalErrorTitle); - $('#id-critical-error-message').html(message); - $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ - window.location.reload(); - });*/ } else { - // Common.Gateway.reportWarning(id, message); console.warn(id,message); - - /*$('#id-critical-error-title').text(me.notcriticalErrorTitle); - $('#id-critical-error-message').html(message); - $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ - $('#id-critical-error-dialog').modal('hide'); - });*/ } - - //$('#id-critical-error-dialog').modal('show'); - - //Common.Analytics.trackEvent('Internal Error', id.toString()); } function onExternalMessage(error) { if (error) { - hidePreloader(); $('#id-error-mask-title').text(me.criticalErrorTitle); $('#id-error-mask-text').text(error.msg); $('#id-error-mask').css('display', 'block'); - - //Common.Analytics.trackEvent('External Error'); } } @@ -364,26 +300,9 @@ SSE.ApplicationController = new(function(){ Common.Gateway.requestClose(); } - function onDownloadAs() { - if ( permissions.download === false) { - //Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, me.errorAccessDeny); - console.error(Asc.c_oAscError.ID.AccessDeny, me.errorAccessDeny); - return; - } - api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.XLSX, true)); - } - - - function onRunAutostartMacroses() { - if (!config.customization || (config.customization.macros!==false)) - if (api) api.asc_runAutostartMacroses(); - } - function onBeforeUnload () { common.localStorage.save(); } - // Helpers - // ------------------------- function onDocumentResize() { if (api) api.asc_Resize(); @@ -412,14 +331,12 @@ SSE.ApplicationController = new(function(){ if (api){ api.asc_registerCallback('asc_onEndAction', onLongActionEnd); api.asc_registerCallback('asc_onError', onError); - api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); api.asc_registerCallback('asc_onSheetsChanged', onSheetsChanged); api.asc_registerCallback('asc_onActiveSheetChanged', setActiveWorkSheet); - if(common.controller.CellEditor ) { - common.controller.CellEditor.create(); - common.controller.CellEditor.setApi(api) - common.controller.CellEditor.setMode(config); + if(SSE.CellEditorController ) { + SSE.CellEditorController.create(); + SSE.CellEditorController.setApi(api); } // Initialize api gateway Common.Gateway.on('init', loadConfig); @@ -428,6 +345,18 @@ SSE.ApplicationController = new(function(){ Common.Gateway.appReady(); } + api.asc_enableKeyEvents(true); + var ismodalshown = false; + $(document.body).on('blur', 'input, textarea', + function(e) { + if ( !ismodalshown ) { + if (!/area_id/.test(e.target.id) ) { + api.asc_enableKeyEvents(true); + } + } + } + ); + return me; } diff --git a/test/spreadsheeteditor/main/js/ApplicationView.js b/test/spreadsheeteditor/main/js/ApplicationView.js index 1f03ca6ac3..fed4273c76 100644 --- a/test/spreadsheeteditor/main/js/ApplicationView.js +++ b/test/spreadsheeteditor/main/js/ApplicationView.js @@ -41,24 +41,19 @@ SSE.ApplicationView = new(function(){ // Initialize view function createView(){ - $btnTools = $('#box-tools button'); + /*$btnTools = $('#box-tools button'); $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true'); $btnTools.parent().append( ''); + '');*/ } - function getTools(name) { - return $btnTools.parent().find(name); - } + return { - create: createView - , tools: { - get: getTools - }, + create: createView, txtDownload: 'Download', txtPrint: 'Print', diff --git a/test/spreadsheeteditor/main/js/CellEditorController.js b/test/spreadsheeteditor/main/js/CellEditorController.js index ad2b29953e..64d3d524b6 100644 --- a/test/spreadsheeteditor/main/js/CellEditorController.js +++ b/test/spreadsheeteditor/main/js/CellEditorController.js @@ -1,47 +1,11 @@ !window.common && (window.common = {}); !common.controller && (common.controller = {}); +if (SSE === undefined) { + var SSE = {}; +} +SSE.Keys={RETURN: 13}; -common.ui = _.extend(common.ui || {}, { - Keys : { - BACKSPACE: 8, - TAB: 9, - RETURN: 13, - SHIFT: 16, - CTRL: 17, - ALT: 18, - ESC: 27, - LEFT: 37, - UP: 38, - RIGHT: 39, - DOWN: 40, - DELETE: 46, - HOME: 36, - END: 35, - SPACE: 32, - PAGEUP: 33, - PAGEDOWN: 34, - INSERT: 45, - EQUALITY_FF:61, - NUM_PLUS: 107, - NUM_MINUS: 109, - F1: 112, - F2: 113, - F3: 114, - F4: 115, - F5: 116, - F6: 117, - F7: 118, - F8: 119, - F9: 120, - F10: 121, - F11: 122, - F12: 123, - MINUS_FF: 173, - EQUALITY: 187, - MINUS: 189 - }}); - -common.controller.CellEditor = new(function(){ +SSE.CellEditorController = new(function(){ var me, api, editor, @@ -49,7 +13,7 @@ common.controller.CellEditor = new(function(){ created=false; function onCellName(e){ - if (e.keyCode == common.ui.Keys.RETURN){ + if (e.keyCode == SSE.Keys.RETURN){ var name = editor.$cellname.val(); if (name && name.length) { api.asc_findCell(name); @@ -58,7 +22,7 @@ common.controller.CellEditor = new(function(){ } function onKeyupCellEditor(e) { - if(e.keyCode == common.ui.Keys.RETURN && !e.altKey){ + if(e.keyCode == SSE.Keys.RETURN && !e.altKey){ api.isCEditorFocused = 'clear'; } } @@ -70,11 +34,7 @@ common.controller.CellEditor = new(function(){ api.isCEditorFocused = true; } - function onLayoutResize(o, r) { - if (r == 'cell:edit') { - o && common.localStorage.setBool('sse-celleditor-expand', false); - } - } + function events() { editor.$el.find('#ce-cell-name').on( 'keyup', onCellName); @@ -83,17 +43,16 @@ common.controller.CellEditor = new(function(){ } function onLaunch(){ - common.view.CellEditor.create(); - editor = common.view.CellEditor; + SSE.CellEditorView.create(); + editor = SSE.CellEditorView; events(); editor.$el.parent().find('.after').css({zIndex: '4'}); // for spreadsheets - bug 23127 var val = common.localStorage.getItem('sse-celleditor-height'); - editor.keep_height = (val!==null && parseInt(val)>0) ? parseInt(val) : 19; + editor.keep_height = 19;//(val!==null && parseInt(val)>0) ? parseInt(val) : 19; if (common.localStorage.getBool('sse-celleditor-expand')) { editor.$el.height(editor.keep_height); - onLayoutResize(undefined, 'cell:edit'); } this.namedrange_locked = false; } @@ -126,10 +85,6 @@ common.controller.CellEditor = new(function(){ } } - function onLockDefNameManager(state) { - this.namedrange_locked = (state == Asc.c_oAscDefinedNameReason.LockDefNameManager); - } - function onApiDisconnect() { mode.isEdit = false; } @@ -141,20 +96,9 @@ common.controller.CellEditor = new(function(){ api.asc_registerCallback('asc_onSelectionNameChanged', onApiCellSelection); api.asc_registerCallback('asc_onEditCell', onApiEditCell); api.asc_registerCallback('asc_onCoAuthoringDisconnect', onApiDisconnect); - api.asc_registerCallback('asc_onLockDefNameManager', onLockDefNameManager); } - function onApiSelectionChanged(info) { - if (this.viewmode) return; // signed file - } - function setMode(modeF) { - mode = modeF; - - if ( mode.isEdit ) { - api.asc_registerCallback('asc_onSelectionChanged', onApiSelectionChanged); - } - } function setPreviewMode(mode) { if (this.viewmode === mode) return; @@ -165,7 +109,6 @@ common.controller.CellEditor = new(function(){ return { create: createController, setApi: setApi, - setMode: setMode, setPreviewMode: setPreviewMode } diff --git a/test/spreadsheeteditor/main/js/CellEditorView.js b/test/spreadsheeteditor/main/js/CellEditorView.js index 413eaf523f..9ee6e016e4 100644 --- a/test/spreadsheeteditor/main/js/CellEditorView.js +++ b/test/spreadsheeteditor/main/js/CellEditorView.js @@ -30,12 +30,11 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ +if (SSE === undefined) { + var SSE = {}; +} - -!window.common && (window.common = {}); -!common.view && (common.view = {}); - -common.view.CellEditor = new(function (){ +SSE.CellEditorView = new(function (){ var me; function createView() diff --git a/test/spreadsheeteditor/main/resources/less/celleditor.less b/test/spreadsheeteditor/main/resources/less/celleditor.less index 35da90ec29..077b81e602 100644 --- a/test/spreadsheeteditor/main/resources/less/celleditor.less +++ b/test/spreadsheeteditor/main/resources/less/celleditor.less @@ -1,9 +1,9 @@ // Common styles -@import "../../../../common/main/resources/less/colors-table-ie-fix.less"; -@import "../../../../common/main/resources/less/variables.less"; -@import "../../../../common/main/resources/less/colors-table.less"; -@import "../../../../common/main/resources/less/asc-mixins.less"; -@import "../../../../common/main/resources/less/buttons.less"; +@import "../../../../documenteditor/main/resources/less/colors-table-ie-fix.less"; +@import "../../../../documenteditor/main/resources/less/variables.less"; +@import "../../../../documenteditor/main/resources/less/colors-table.less"; +@import "../../../../documenteditor/main/resources/less/asc-mixins.less"; +@import "../../../../documenteditor/main/resources/less/buttons.less"; #cell-editing-box { border-bottom: solid @scaled-one-px-value-ie @border-toolbar-ie; border-bottom: solid @scaled-one-px-value @border-toolbar;