diff --git a/module/repo/config/dtable.php b/module/repo/config/dtable.php index 2b269f526d..1270ec4092 100644 --- a/module/repo/config/dtable.php +++ b/module/repo/config/dtable.php @@ -141,10 +141,11 @@ $config->repo->logDtable = new stdclass(); $config->repo->logDtable->fieldList['id']['hidden'] = true; -$config->repo->logDtable->fieldList['revision']['type'] = 'revision'; -$config->repo->logDtable->fieldList['revision']['width'] = '100'; -$config->repo->logDtable->fieldList['revision']['checkbox'] = true; +$config->repo->logDtable->fieldList['revision']['type'] = 'revision'; +$config->repo->logDtable->fieldList['revision']['width'] = '100'; +$config->repo->logDtable->fieldList['revision']['checkbox'] = true; $config->repo->logDtable->fieldList['revision']['nestedToggle'] = false; +$config->repo->logDtable->fieldList['revision']['data-app'] = $app->tab; $config->repo->logDtable->fieldList['commit']['type'] = 'number'; $config->repo->logDtable->fieldList['commit']['width'] = '50'; diff --git a/module/repo/js/browse.ui.js b/module/repo/js/browse.ui.js index c3f9126164..5ee97702f1 100644 --- a/module/repo/js/browse.ui.js +++ b/module/repo/js/browse.ui.js @@ -60,7 +60,7 @@ $('#repo-select').on('change', function() var index = $('#repo-select').prop('selectedIndex'); if(menus[index - 1].url != undefined) { - openUrl(menus[index - 1].url); + openUrl(menus[index - 1].url, {app: appTab}); } }) diff --git a/module/repo/js/log.ui.js b/module/repo/js/log.ui.js index 3b971e80b2..8e94bb2f9a 100644 --- a/module/repo/js/log.ui.js +++ b/module/repo/js/log.ui.js @@ -80,7 +80,7 @@ window.diffClick = function() var newDiffLink = diffLink.replace('{oldRevision}', revisionMap[checkedIds[1]]); newDiffLink = newDiffLink.replace('{newRevision}', revisionMap[checkedIds[0]]); - openUrl(newDiffLink); + openUrl(newDiffLink, {app: appTab}); } /** diff --git a/module/repo/js/monaco.ui.js b/module/repo/js/monaco.ui.js index f0e16ef809..c85252920c 100644 --- a/module/repo/js/monaco.ui.js +++ b/module/repo/js/monaco.ui.js @@ -57,7 +57,7 @@ window.afterPageUpdate = function() if(branchOrTag != $.cookie.get('repoBranch')) $.cookie.set('repoBranch', branchOrTag); - openUrl(currentLink); + openUrl(currentLink, {app: appTab}); }) $('.repoDropDownMenu').on('click', function() @@ -66,7 +66,7 @@ window.afterPageUpdate = function() var activeFilePath = $('#monacoTabs .nav-item .active').attr('href').substring(5).replace(/-/g, '='); if(url.indexOf('blame') >=0 && url.indexOf('download') == -1) { - openUrl(url.replace('{path}', activeFilePath)); + openUrl(url.replace('{path}', activeFilePath), {app: appTab}); } else { diff --git a/module/repo/ui/blame.html.php b/module/repo/ui/blame.html.php index afa3a96148..0a29f12239 100644 --- a/module/repo/ui/blame.html.php +++ b/module/repo/ui/blame.html.php @@ -18,6 +18,7 @@ $breadcrumbItems = array(); $breadcrumbItems[] = h::a ( set::href($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID")), + set('data-app', $app->tab), $repo->name, ); $breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px')); @@ -31,6 +32,7 @@ foreach($paths as $pathName) $breadcrumbItems[] = h::a ( set::href($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath))), + set('data-app', $app->tab), trim($pathName, '/'), ); $breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px')); @@ -65,7 +67,7 @@ $encodePath = $this->repo->encodePath($entry); $encodes = array(); foreach($lang->repo->encodingList as $key => $val) { - $encodes[] = array('text' => $val, 'url' => inlink('blame', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision=$revision&encoding=$key")); + $encodes[] = array('text' => $val, 'url' => inlink('blame', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision=$revision&encoding=$key"), 'data-app' => $app->tab); } $defaultEncode = $lang->repo->encodingList[$encoding]; diff --git a/module/repo/ui/log.html.php b/module/repo/ui/log.html.php index 3134293f51..a964f3b61f 100644 --- a/module/repo/ui/log.html.php +++ b/module/repo/ui/log.html.php @@ -21,6 +21,7 @@ dropmenu $diffLink = $this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($entry) . "&oldrevision={oldRevision}&newRevision={newRevision}"); jsVar('diffLink', $diffLink); +jsVar('appTab', $app->tab); /* Prepare breadcrumb navigation data. */ $base64BranchID = helper::safe64Encode(base64_encode($branchID)); diff --git a/module/repo/ui/monaco.html.php b/module/repo/ui/monaco.html.php index f16b81b518..fa3eaf8242 100644 --- a/module/repo/ui/monaco.html.php +++ b/module/repo/ui/monaco.html.php @@ -31,6 +31,7 @@ jsVar('branchID', $branchID); jsVar('branchMenus', $dropMenus); jsVar('file', $file); jsVar('tree', $tree); +jsVar('appTab', $app->tab); jsVar('openedFiles', array($entry)); jsVar('urlParams', "repoID=$repoID&objectID=$objectID&entry=%s&revision=$revision&showBug=$showBug&encoding=$encoding"); jsVar('currentLink', $this->createLink('repo', 'view', "repoID=$repoID&objectID=$objectID&entry=$file"));