diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index bda8b81d28..1be556e72e 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -265,18 +265,18 @@ label { } } - &.devider { + &.divider { .dropdown-menu .divider; margin-top: 10px; margin-bottom: 14px; } - &.devider-small { + &.divider-small { margin-top: 7px; margin-bottom: 11px; } - &.devider-last { + &.divider-last { margin-top: auto; margin-bottom: -4px; } diff --git a/apps/documenteditor/main/app/template/FileMenu.template b/apps/documenteditor/main/app/template/FileMenu.template index a52eb60ae4..55b0e59b4d 100644 --- a/apps/documenteditor/main/app/template/FileMenu.template +++ b/apps/documenteditor/main/app/template/FileMenu.template @@ -1,9 +1,9 @@
diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js index 3fc8f086e9..62a8288b9a 100644 --- a/apps/documenteditor/main/app/view/FileMenu.js +++ b/apps/documenteditor/main/app/view/FileMenu.js @@ -409,8 +409,8 @@ define([ var isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-close'); this.miClose[isVisible?'show':'hide'](); - this.miClose.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miClose.$el.find('+.devider')); + this.miClose.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miClose.$el.find('+.divider')); this.miDownload[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); var isBCSupport = Common.Controllers.Desktop.isActive() ? Common.Controllers.Desktop.call("isBlockchainSupport") : false; @@ -426,13 +426,13 @@ define([ this.miProtect[(this.mode.isSignatureSupport || this.mode.isPasswordSupport) ?'show':'hide'](); separatorVisible = (this.mode.canDownload || this.mode.canDownloadOrigin || this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') || this.mode.canPrint || (this.mode.isSignatureSupport || this.mode.isPasswordSupport) || canEdit || this.mode.canRename && !this.mode.isDesktopApp) && !this.mode.isDisconnected; - this.miProtect.$el.find('+.devider')[separatorVisible?'show':'hide'](); - separatorVisible && (lastSeparator = this.miProtect.$el.find('+.devider')); + this.miProtect.$el.find('+.divider')[separatorVisible?'show':'hide'](); + separatorVisible && (lastSeparator = this.miProtect.$el.find('+.divider')); this.miRecent[this.mode.canOpenRecent?'show':'hide'](); this.miNew[this.mode.canCreateNew?'show':'hide'](); if (!this.mode.canOpenRecent && !this.mode.canCreateNew) { - this.miRecent.$el.find('+.devider').hide(); + this.miRecent.$el.find('+.divider').hide(); } isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-info'); @@ -446,18 +446,18 @@ define([ isVisible = this.mode.canUseHistory&&!this.mode.isDisconnected; separatorVisible = separatorVisible || isVisible; this.miHistory[isVisible?'show':'hide'](); - this.miHistory.$el.find('+.devider')[separatorVisible?'show':'hide'](); - separatorVisible && (lastSeparator = this.miHistory.$el.find('+.devider')); + this.miHistory.$el.find('+.divider')[separatorVisible?'show':'hide'](); + separatorVisible && (lastSeparator = this.miHistory.$el.find('+.divider')); isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-settings'); this.miSettings[isVisible?'show':'hide'](); - this.miSettings.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miSettings.$el.find('+.devider')); + this.miSettings.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miSettings.$el.find('+.divider')); isVisible = this.mode.canHelp; this.miHelp[isVisible ?'show':'hide'](); - this.miHelp.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miHelp.$el.find('+.devider')); + this.miHelp.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miHelp.$el.find('+.divider')); isVisible = this.mode.canBack; this.miBack[isVisible ?'show':'hide'](); @@ -526,7 +526,7 @@ define([ } if (this.$el.find('#fm-btn-exit').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ @@ -541,7 +541,7 @@ define([ })); } } else if (this.mode.canCloseEditor && this.$el.find('#fm-btn-close').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ diff --git a/apps/pdfeditor/main/app/template/FileMenu.template b/apps/pdfeditor/main/app/template/FileMenu.template index 2c9db50a27..b0dcf8058f 100644 --- a/apps/pdfeditor/main/app/template/FileMenu.template +++ b/apps/pdfeditor/main/app/template/FileMenu.template @@ -1,9 +1,9 @@ diff --git a/apps/pdfeditor/main/app/view/FileMenu.js b/apps/pdfeditor/main/app/view/FileMenu.js index dad0f4b71e..5c02378357 100644 --- a/apps/pdfeditor/main/app/view/FileMenu.js +++ b/apps/pdfeditor/main/app/view/FileMenu.js @@ -394,8 +394,8 @@ define([ var isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-close'); this.miClose[isVisible?'show':'hide'](); - this.miClose.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miClose.$el.find('+.devider')); + this.miClose.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miClose.$el.find('+.divider')); this.miDownload[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); var isBCSupport = Common.Controllers.Desktop.isActive() ? Common.Controllers.Desktop.call("isBlockchainSupport") : false; @@ -409,13 +409,13 @@ define([ this.miProtect[(this.mode.isSignatureSupport || this.mode.isPasswordSupport) ?'show':'hide'](); separatorVisible = (this.mode.canDownload || this.mode.canDownloadOrigin || this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') || this.mode.canPrint || (this.mode.isSignatureSupport || this.mode.isPasswordSupport) || !this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights || this.mode.canRename && !this.mode.isDesktopApp) && !this.mode.isDisconnected; - this.miProtect.$el.find('+.devider')[separatorVisible?'show':'hide'](); - separatorVisible && (lastSeparator = this.miProtect.$el.find('+.devider')); + this.miProtect.$el.find('+.divider')[separatorVisible?'show':'hide'](); + separatorVisible && (lastSeparator = this.miProtect.$el.find('+.divider')); this.miRecent[this.mode.canOpenRecent?'show':'hide'](); this.miNew[this.mode.canCreateNew?'show':'hide'](); if (!this.mode.canOpenRecent && !this.mode.canCreateNew) { - this.miRecent.$el.find('+.devider').hide(); + this.miRecent.$el.find('+.divider').hide(); } isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-info'); @@ -429,13 +429,13 @@ define([ isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-settings'); this.miSettings[isVisible?'show':'hide'](); - this.miSettings.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miSettings.$el.find('+.devider')); + this.miSettings.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miSettings.$el.find('+.divider')); isVisible = this.mode.canHelp; this.miHelp[isVisible ?'show':'hide'](); - this.miHelp.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miHelp.$el.find('+.devider')); + this.miHelp.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miHelp.$el.find('+.divider')); isVisible = this.mode.canBack; this.miBack[isVisible ?'show':'hide'](); @@ -504,7 +504,7 @@ define([ } if (this.$el.find('#fm-btn-exit').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ @@ -519,7 +519,7 @@ define([ })); } } else if (this.mode.canCloseEditor && this.$el.find('#fm-btn-close').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ diff --git a/apps/presentationeditor/main/app/template/FileMenu.template b/apps/presentationeditor/main/app/template/FileMenu.template index a52eb60ae4..55b0e59b4d 100644 --- a/apps/presentationeditor/main/app/template/FileMenu.template +++ b/apps/presentationeditor/main/app/template/FileMenu.template @@ -1,9 +1,9 @@ diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js index 723a0748e7..309f9fa721 100644 --- a/apps/presentationeditor/main/app/view/FileMenu.js +++ b/apps/presentationeditor/main/app/view/FileMenu.js @@ -406,8 +406,8 @@ define([ var isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-close'); this.miClose[isVisible?'show':'hide'](); - this.miClose.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miClose.$el.find('+.devider')); + this.miClose.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miClose.$el.find('+.divider')); this.miDownload[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); var isBCSupport = Common.Controllers.Desktop.isActive() ? Common.Controllers.Desktop.call("isBlockchainSupport") : false; @@ -421,13 +421,13 @@ define([ this.miProtect[(this.mode.isSignatureSupport || this.mode.isPasswordSupport) ?'show':'hide'](); separatorVisible = (this.mode.canDownload || this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') || this.mode.canPrint || (this.mode.isSignatureSupport || this.mode.isPasswordSupport) || !this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights || this.mode.canRename && !this.mode.isDesktopApp) && !this.mode.isDisconnected; - this.miProtect.$el.find('+.devider')[separatorVisible?'show':'hide'](); - separatorVisible && (lastSeparator = this.miProtect.$el.find('+.devider')); + this.miProtect.$el.find('+.divider')[separatorVisible?'show':'hide'](); + separatorVisible && (lastSeparator = this.miProtect.$el.find('+.divider')); this.miRecent[this.mode.canOpenRecent?'show':'hide'](); this.miNew[this.mode.canCreateNew?'show':'hide'](); if (!this.mode.canOpenRecent && !this.mode.canCreateNew) { - this.miRecent.$el.find('+.devider').hide(); + this.miRecent.$el.find('+.divider').hide(); } isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-info'); @@ -441,18 +441,18 @@ define([ isVisible = this.mode.canUseHistory&&!this.mode.isDisconnected; separatorVisible = separatorVisible || isVisible; this.miHistory[isVisible?'show':'hide'](); - this.miHistory.$el.find('+.devider')[separatorVisible?'show':'hide'](); - separatorVisible && (lastSeparator = this.miHistory.$el.find('+.devider')); + this.miHistory.$el.find('+.divider')[separatorVisible?'show':'hide'](); + separatorVisible && (lastSeparator = this.miHistory.$el.find('+.divider')); isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-settings'); this.miSettings[isVisible?'show':'hide'](); - this.miSettings.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miSettings.$el.find('+.devider')); + this.miSettings.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miSettings.$el.find('+.divider')); isVisible = this.mode.canHelp; this.miHelp[isVisible ?'show':'hide'](); - this.miHelp.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miHelp.$el.find('+.devider')); + this.miHelp.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miHelp.$el.find('+.divider')); isVisible = this.mode.canBack; this.miBack[isVisible ?'show':'hide'](); @@ -521,7 +521,7 @@ define([ } if (this.$el.find('#fm-btn-exit').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ @@ -536,7 +536,7 @@ define([ })); } } else if (this.mode.canCloseEditor && this.$el.find('#fm-btn-close').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ diff --git a/apps/spreadsheeteditor/main/app/template/FileMenu.template b/apps/spreadsheeteditor/main/app/template/FileMenu.template index 74738688a0..ade8a9c66c 100644 --- a/apps/spreadsheeteditor/main/app/template/FileMenu.template +++ b/apps/spreadsheeteditor/main/app/template/FileMenu.template @@ -1,9 +1,9 @@ diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index ea787ab9f3..6e01cd3df5 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -388,8 +388,8 @@ define([ var isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-close'); this.miClose[isVisible?'show':'hide'](); - this.miClose.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miClose.$el.find('+.devider')); + this.miClose.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miClose.$el.find('+.divider')); this.miDownload[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); var isBCSupport = window["AscDesktopEditor"] ? window["AscDesktopEditor"]["isBlockchainSupport"]() : false; @@ -403,13 +403,13 @@ define([ this.miProtect[(this.mode.isSignatureSupport || this.mode.isPasswordSupport) ?'show':'hide'](); separatorVisible = (this.mode.canDownload || this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') || this.mode.canPrint || (this.mode.isSignatureSupport || this.mode.isPasswordSupport) || !this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights || this.mode.canRename && !this.mode.isDesktopApp) && !this.mode.isDisconnected; - this.miProtect.$el.find('+.devider')[separatorVisible?'show':'hide'](); - separatorVisible && (lastSeparator = this.miProtect.$el.find('+.devider')); + this.miProtect.$el.find('+.divider')[separatorVisible?'show':'hide'](); + separatorVisible && (lastSeparator = this.miProtect.$el.find('+.divider')); this.miRecent[this.mode.canOpenRecent?'show':'hide'](); this.miNew[this.mode.canCreateNew?'show':'hide'](); if (!this.mode.canOpenRecent && !this.mode.canCreateNew) { - this.miRecent.$el.find('+.devider').hide(); + this.miRecent.$el.find('+.divider').hide(); } isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-info'); @@ -423,18 +423,18 @@ define([ isVisible = this.mode.canUseHistory&&!this.mode.isDisconnected; separatorVisible = separatorVisible || isVisible; this.miHistory[isVisible?'show':'hide'](); - this.miHistory.$el.find('+.devider')[separatorVisible?'show':'hide'](); - separatorVisible && (lastSeparator = this.miHistory.$el.find('+.devider')); + this.miHistory.$el.find('+.divider')[separatorVisible?'show':'hide'](); + separatorVisible && (lastSeparator = this.miHistory.$el.find('+.divider')); isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-settings'); this.miSettings[isVisible?'show':'hide'](); - this.miSettings.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miSettings.$el.find('+.devider')); + this.miSettings.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miSettings.$el.find('+.divider')); isVisible = this.mode.canHelp; this.miHelp[isVisible ?'show':'hide'](); - this.miHelp.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miHelp.$el.find('+.devider')); + this.miHelp.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miHelp.$el.find('+.divider')); isVisible = this.mode.canBack; this.miBack[isVisible ?'show':'hide'](); @@ -508,7 +508,7 @@ define([ } if (this.$el.find('#fm-btn-exit').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ @@ -523,7 +523,7 @@ define([ })); } } else if (this.mode.canCloseEditor && this.$el.find('#fm-btn-close').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ diff --git a/apps/visioeditor/main/app/template/FileMenu.template b/apps/visioeditor/main/app/template/FileMenu.template index 42aacd17e8..a0c5eea06f 100644 --- a/apps/visioeditor/main/app/template/FileMenu.template +++ b/apps/visioeditor/main/app/template/FileMenu.template @@ -1,20 +1,20 @@ diff --git a/apps/visioeditor/main/app/view/FileMenu.js b/apps/visioeditor/main/app/view/FileMenu.js index 3468e57f14..f6ab3e26fd 100644 --- a/apps/visioeditor/main/app/view/FileMenu.js +++ b/apps/visioeditor/main/app/view/FileMenu.js @@ -328,8 +328,8 @@ define([ var isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-close'); this.miClose[isVisible?'show':'hide'](); - this.miClose.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miClose.$el.find('+.devider')); + this.miClose.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miClose.$el.find('+.divider')); this.miDownload[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); var isBCSupport = Common.Controllers.Desktop.isActive() ? Common.Controllers.Desktop.call("isBlockchainSupport") : false; @@ -338,12 +338,12 @@ define([ this.miPrint[this.mode.canPrint && !this.mode.canPreviewPrint ?'show':'hide'](); this.miRename[(this.mode.canRename && !this.mode.isDesktopApp) ?'show':'hide'](); separatorVisible = (this.mode.canDownload || this.mode.canPrint || this.mode.canRename && !this.mode.isDesktopApp) && !this.mode.isDisconnected; - separatorVisible && (lastSeparator = this.miRename.$el.find('+.devider')); + separatorVisible && (lastSeparator = this.miRename.$el.find('+.divider')); this.miRecent[this.mode.canOpenRecent?'show':'hide'](); this.miNew[this.mode.canCreateNew?'show':'hide'](); if (!this.mode.canOpenRecent && !this.mode.canCreateNew) { - this.miRecent.$el.find('+.devider').hide(); + this.miRecent.$el.find('+.divider').hide(); } isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-info'); @@ -354,17 +354,17 @@ define([ (this.mode.sharingSettingsUrl&&this.mode.sharingSettingsUrl.length || this.mode.canRequestSharingSettings)); separatorVisible = separatorVisible || isVisible; this.miAccess[isVisible?'show':'hide'](); - separatorVisible && (lastSeparator = this.miAccess.$el.find('+.devider')); + separatorVisible && (lastSeparator = this.miAccess.$el.find('+.divider')); isVisible = Common.UI.LayoutManager.isElementVisible('toolbar-file-settings'); this.miSettings[isVisible?'show':'hide'](); - this.miSettings.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miSettings.$el.find('+.devider')); + this.miSettings.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miSettings.$el.find('+.divider')); isVisible = this.mode.canHelp; this.miHelp[isVisible ?'show':'hide'](); - this.miHelp.$el.find('+.devider')[isVisible?'show':'hide'](); - isVisible && (lastSeparator = this.miHelp.$el.find('+.devider')); + this.miHelp.$el.find('+.divider')[isVisible?'show':'hide'](); + isVisible && (lastSeparator = this.miHelp.$el.find('+.divider')); isVisible = this.mode.canBack; this.miBack[isVisible ?'show':'hide'](); @@ -421,7 +421,7 @@ define([ } if (this.$el.find('#fm-btn-exit').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({ @@ -436,7 +436,7 @@ define([ })); } } else if (this.mode.canCloseEditor && this.$el.find('#fm-btn-close').length<1) { - $('' + + $('' + '').insertAfter($('#fm-btn-back', this.$el)); this.items.push( new Common.UI.MenuItem({