From c17122c2534ddabfee2fce09f5e750d205007926 Mon Sep 17 00:00:00 2001 From: Jerry Padgett Date: Wed, 7 Mar 2018 14:42:23 -0500 Subject: [PATCH] Add language direction javascript global to top frames. issue #1456 (#1457) * Add language direction javascript global to top frames. * Fix include logic boo-boo. --- interface/main/main_screen.php | 1 + interface/main/tabs/main.php | 1 + library/dialog.js | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/interface/main/main_screen.php b/interface/main/main_screen.php index 7a8d003cc..366eeaaa7 100644 --- a/interface/main/main_screen.php +++ b/interface/main/main_screen.php @@ -158,6 +158,7 @@ if ($GLOBALS['new_tabs_layout']) { var tab_mode=false; var webroot_url = ''; +var jsLanguageDirection = ""; diff --git a/interface/main/tabs/main.php b/interface/main/tabs/main.php index 8627852d2..4f61a098b 100644 --- a/interface/main/tabs/main.php +++ b/interface/main/tabs/main.php @@ -105,6 +105,7 @@ function isEncounterLocked( encounterId ) { } var webroot_url=""; +var jsLanguageDirection = ""; diff --git a/library/dialog.js b/library/dialog.js index 43e219589..070154144 100644 --- a/library/dialog.js +++ b/library/dialog.js @@ -210,6 +210,7 @@ function dlgopen(url, winname, width, height, forceNewWindow, title, opts) { // webroot_url is a global defined in main_screen.php or main.php. let bscss = top.webroot_url + '/public/assets/bootstrap-3-3-4/dist/css/bootstrap.min.css'; + let bscssRtl = top.webroot_url + '/public/assets/bootstrap-rtl-3-3-4/dist/css/bootstrap-rtl.min.css'; let bsurl = top.webroot_url + '/public/assets/bootstrap-3-3-4/dist/js/bootstrap.min.js'; let jqui = top.webroot_url + '/public/assets/jquery-ui-1-12-1/jquery-ui.min.js'; @@ -221,6 +222,9 @@ function dlgopen(url, winname, width, height, forceNewWindow, title, opts) { } if (!inDom('bootstrap.min.css', 'link', false)) { includeScript(bscss, false, 'link'); + if (top.jsLanguageDirection === 'rtl') { + includeScript(bscssRtl, false, 'link'); + } } if (typeof jQuery.fn.modal === 'undefined') { if (!inDom('bootstrap.min.js', 'script', false)) -- 2.11.4.GIT