Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* index: bug #47916, fix lang var conflict with xuanxuan extension.

Browse Source
This commit is contained in:
sunhao
2024-04-22 16:38:12 +08:00
parent c21fe4423c
commit 1dc857b2b7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/index/js/index.ui.js
+5 -5
View File
@@ -667,8 +667,8 @@ function initAppsMenu(items)
icon: 'icon-search',
methodName: 'index',
moduleName: 'search',
text: lang.search,
title: '<i class="icon icon-search"></i> ' + lang.search,
text: langData.search,
title: '<i class="icon icon-search"></i> ' + langData.search,
url: '/index.php?m=search&f=index',
vars: ''
};
@@ -766,11 +766,11 @@ $(document).on('click', '.open-in-app,.show-in-app', function(e)
if(!code) return;
const app = apps.openedMap[code];
const items = [{text: lang.open, disabled: app && getLastAppCode() === code, onClick: function(){showApp(code)}}];
const items = [{text: langData.open, disabled: app && getLastAppCode() === code, onClick: function(){showApp(code)}}];
if(app)
{
items.push({text: lang.reload, onClick: function(){reloadApp(code)}});
if(code !== 'my') items.push({text: lang.close, onClick: function(){closeApp(code)}});
items.push({text: langData.reload, onClick: function(){reloadApp(code)}});
if(code !== 'my') items.push({text: langData.close, onClick: function(){closeApp(code)}});
}
zui.ContextMenu.show({hideOthers: true, element: $btn[0], placement: $btn.closest('#appTabs').length ? 'top-start' : 'right-start', items: items, event: event, onClickItem: function(info){info.event.preventDefault();}});
module/index/ui/index.html.php
+1 -1
View File
@@ -28,7 +28,7 @@ jsVar('appsItems', $appsItems);
jsVar('defaultOpen', !empty($open) ? $open : '');
jsVar('manualText', $lang->manual);
jsVar('manualUrl', ((!empty($config->isINT)) ? $config->manualUrl['int'] : $config->manualUrl['home']) . '&theme=' . $_COOKIE['theme']);
jsVar('lang', array_merge(array('search' => $lang->index->search, 'searchAB' => $lang->searchAB), (array)$lang->index->dock));
jsVar('langData', array_merge(array('search' => $lang->index->search, 'searchAB' => $lang->searchAB), (array)$lang->index->dock));
jsVar('browserMessage', $browserMessage);
jsVar('pollTime', (!empty($config->message->browser->turnon) && isset($config->message->browser->pollTime)) ? $config->message->browser->pollTime : 600);
jsVar('turnon', empty($config->message->browser->turnon) ? 0 : 1);