Merge pull request 'Fix Bug 72161' (#188) from fix/bugfix into releas…

…e/v8.3.0
ONLYOFFICE · Dec 18, 2024 · 514aea6 · 514aea6
2 parents 812c33c + 83eb403
commit 514aea6
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 13 deletions.
diff --git a/apps/common/embed/lib/util/htmlutils.js b/apps/common/embed/lib/util/htmlutils.js
@@ -39,5 +39,4 @@ if ( isLangRtl(lang) ) {
 }
 document.body.setAttribute('applang', lang);
 
-window.isRtl = window.getComputedStyle(document.body).direction === 'rtl';
-window.dropdownClass = window.isRtl ? 'pull-left' : 'pull-right';
+window.isrtl = window.getComputedStyle(document.body).direction === 'rtl';
diff --git a/apps/common/embed/resources/less/common.less b/apps/common/embed/resources/less/common.less
@@ -768,6 +768,14 @@
     .divider {
         margin: 4px 0;
     }
+
+    &.pull-right {
+        .rtl & {
+            float: left;
+            left: 0;
+            right: auto;
+        }
+    }
 }
 
 .dropdown {

diff --git a/apps/common/locale.js b/apps/common/locale.js
@@ -167,6 +167,7 @@ Common.Locale = new(function() {
             document.body.classList.remove('rtl');
             document.body.classList.remove('rtl-font');
             document.body.setAttribute('applang', currentLang);
+            window.isrtl = false;
         }
     };
 

diff --git a/apps/documenteditor/embed/js/ApplicationView.js b/apps/documenteditor/embed/js/ApplicationView.js
@@ -44,7 +44,7 @@ DE.ApplicationView = new(function(){
 
         $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
         $btnTools.parent().append(
-            '<ul class="dropdown-menu ' + window.dropdownClass + '">' +
+            '<ul class="dropdown-menu pull-right">' +
                 '<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>' + this.txtDownload + '</a></li>' +
                 '<li><a id="idt-download-docx"><span class="mi-icon svg-icon download"></span>' + this.txtDownloadDocx + '</a></li>' +
                 '<li><a id="idt-download-pdf"><span class="mi-icon"></span>' + this.txtDownloadPdf + '</a></li>' +

diff --git a/apps/documenteditor/embed/js/SearchBar.js b/apps/documenteditor/embed/js/SearchBar.js
@@ -96,13 +96,13 @@
         var create = function () {
             $searchBar = common.view.SearchBar.create();
             if (appConfig.toolbarDocked === 'bottom') {
-                if (window.isRtl) {
+                if (window.isrtl) {
                     $searchBar.css({'left': '45px', 'bottom': '31px'});
                 } else {
                     $searchBar.css({'right': '45px', 'bottom': '31px'});
                 }
             } else {
-                if (window.isRtl) {
+                if (window.isrtl) {
                     $searchBar.css({'left': '45px', 'top': '31px'});
                 } else {
                     $searchBar.css({'right': '45px', 'top': '31px'});

diff --git a/apps/presentationeditor/embed/js/ApplicationView.js b/apps/presentationeditor/embed/js/ApplicationView.js
@@ -43,7 +43,7 @@ PE.ApplicationView = new(function(){
 
         $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
         $btnTools.parent().append(
-            '<ul class="dropdown-menu ' + window.dropdownClass + '">' +
+            '<ul class="dropdown-menu pull-right">' +
             '<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>' + this.txtDownload + '</a></li>' +
             '<li><a id="idt-print"><span class="mi-icon svg-icon print"></span>' + this.txtPrint + '</a></li>' +
             '<li class="divider"></li>' +

diff --git a/apps/spreadsheeteditor/embed/js/ApplicationView.js b/apps/spreadsheeteditor/embed/js/ApplicationView.js
@@ -44,7 +44,7 @@ SSE.ApplicationView = new(function(){
 
         $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
         $btnTools.parent().append(
-            '<ul class="dropdown-menu ' + window.dropdownClass + '">' +
+            '<ul class="dropdown-menu pull-right">' +
                 '<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>' + this.txtDownload + '</a></li>' +
                 '<li><a id="idt-print"><span class="mi-icon svg-icon print"></span>' + this.txtPrint + '</a></li>' +
                 '<li class="divider"></li>' +

diff --git a/apps/spreadsheeteditor/embed/js/SearchBar.js b/apps/spreadsheeteditor/embed/js/SearchBar.js
@@ -97,13 +97,13 @@
         var create = function () {
             $searchBar = common.view.SearchBar.create();
             if (appConfig.toolbarDocked === 'bottom') {
-                if (window.isRtl) {
+                if (window.isrtl) {
                     $searchBar.css({'left': '45px', 'bottom': '31px'});
                 } else {
                     $searchBar.css({'right': '45px', 'bottom': '31px'});
                 }
             } else {
-                if (window.isRtl) {
+                if (window.isrtl) {
                     $searchBar.css({'left': '45px', 'top': '31px'});
                 } else {
                     $searchBar.css({'right': '45px', 'top': '31px'});

diff --git a/apps/visioeditor/embed/js/ApplicationController.js b/apps/visioeditor/embed/js/ApplicationController.js
@@ -169,8 +169,8 @@ VE.ApplicationController = new(function(){
 
     function updateRtl() {
         var $container = $('#pages-container');
-        $container.toggleClass('rtl-sheet', window.isRtl);
-        $container.attr({dir: window.isRtl ? 'rtl' : 'ltr'});
+        $container.toggleClass('rtl-sheet', window.isrtl);
+        $container.attr({dir: window.isrtl ? 'rtl' : 'ltr'});
     }
 
     function setActivePage(index) {
@@ -220,7 +220,7 @@ VE.ApplicationController = new(function(){
         var $prevButton = $('#pages-list-button-prev');
         var $nextButton = $('#pages-list-button-next');
         var $box = $('#id-pages');
-        var rtlPage = window.isRtl;
+        var rtlPage = window.isrtl;
 
         var handleScrollButtonsState = function() {
             if ($container[0].scrollWidth > $container[0].clientWidth) {

diff --git a/apps/visioeditor/embed/js/ApplicationView.js b/apps/visioeditor/embed/js/ApplicationView.js
@@ -43,7 +43,7 @@ VE.ApplicationView = new(function(){
 
         $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
         $btnTools.parent().append(
-            '<ul class="dropdown-menu ' + window.dropdownClass + '">' +
+            '<ul class="dropdown-menu pull-right">' +
             '<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>' + this.txtDownload + '</a></li>' +
             '<li><a id="idt-print"><span class="mi-icon svg-icon print"></span>' + this.txtPrint + '</a></li>' +
             '<li class="divider"></li>' +