From a50379abc6fecc34f6e780ff9a9833833c1d9537 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Sat, 10 Aug 2019 17:02:16 +0300
Subject: [PATCH] [DE] Refactorint languages menu

---
 apps/common/main/lib/component/Menu.js              | 6 ++----
 apps/documenteditor/main/app/view/DocumentHolder.js | 2 +-
 apps/documenteditor/main/app/view/Statusbar.js      | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js
index 8082b5557..ad97bdf1b 100644
--- a/apps/common/main/lib/component/Menu.js
+++ b/apps/common/main/lib/component/Menu.js
@@ -603,7 +603,6 @@ define([
             '<ul class="dropdown-menu <%= options.cls %>" oo_editor_input="true" style="<%= options.style %>" role="menu">',
                 '<% _.each(items, function(item) { %>',
                     '<% if (!item.id) item.id = Common.UI.getId(); %>',
-                    '<% item.checkable = item.checkable || false;  %>',
                     '<% item.checked = item.checked || false;  %>',
                     '<li><%= itemTemplate(item) %></li>',
                 '<% }) %>',
@@ -620,7 +619,7 @@ define([
                                                                 '<a id="<%= id %>" <% if(typeof style !== "undefined") { %> style="<%= style %>" <% } %>',
                                                                     '<% if(typeof canFocused !== "undefined") { %> tabindex="-1" type="menuitem" <% } %>',
                                                                     '<% if(typeof stopPropagation !== "undefined") { %> data-stopPropagation="true" <% } %>',
-                                                                    'class="<% if (checked) { %> checked <% } %> <% if (checkable) { %> checkable <% } %>" >',
+                                                                    'class="<% if (checked) { %> checked <% } %>" >',
                                                                     '<% if (typeof iconCls !== "undefined") { %>',
                                                                         '<span class="menu-item-icon <%= iconCls %>"></span>',
                                                                     '<% } %>',
@@ -726,7 +725,6 @@ define([
             var template = _.template([
                                 '<% _.each(items, function(item) { %>',
                                     '<% if (!item.id) item.id = Common.UI.getId(); %>',
-                                    '<% item.checkable = item.checkable || false;  %>',
                                     '<% item.checked = item.checked || false;  %>',
                                     '<li><%= itemTemplate(item) %></li>',
                                 '<% }) %>'
@@ -768,7 +766,7 @@ define([
             if (item.disabled)
                 return false;
 
-            if (!item.checked)
+            if (item.checkable && !item.checked)
                 this.setChecked(index, !item.checked);
 
             this.isOver = false;
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 6a943b309..e88d68ca3 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -2709,7 +2709,7 @@ define([
             });
 
             var langTemplate = _.template([
-                '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value %>">',
+                '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value %>" class="<% if (checked) { %> checked <% } %>">',
                 '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
                 '<%= caption %>',
                 '</a>'
diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js
index e05d256ce..99270f0f4 100644
--- a/apps/documenteditor/main/app/view/Statusbar.js
+++ b/apps/documenteditor/main/app/view/Statusbar.js
@@ -233,7 +233,7 @@ define([
                     style: 'margin-top:-5px;',
                     restoreHeight: 300,
                     itemTemplate: _.template([
-                        '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %> <% if (checkable) { %> checkable <% } %>">',
+                        '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
                             '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
                             '<%= caption %>',
                         '</a>'