Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused code. #109

Merged
merged 2 commits into from
Apr 26, 2017
Merged

Remove unused code. #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea56b6c
Remove unused code.
jpwhite4 Apr 25, 2017
cb1af80
Change indentation so that eslint is happy(ier).
jpwhite4 Apr 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 0 additions & 102 deletions html/controllers/session_pool.php
View file
Open in desktop

This file was deleted.

24 changes: 11 additions & 13 deletions html/gui/js/Viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,26 +421,24 @@ Ext.extend(CCR.xdmod.ui.Viewer, Ext.Viewport, {
var tabToken;

for (var i = 0; i < tabs.length; i++) {
var tab = tabs[i];
tab.mainTabToken = mainTabToken;
tab.id = tab.tab;
var tab = tabs[i];
tab.mainTabToken = mainTabToken;
tab.id = tab.tab;

var tabInstance = CCR.getInstance(tab.javascriptReference, tab.javascriptClass, tab);
if (!tabInstance) {
continue;
}
tabPanel.add(tabInstance);
if (tab.isDefault == true && !isCallCached) {
tabToken = tabToken || mainTabToken + CCR.xdmod.ui.tokenDelimiter + tab.tab;
}
var tabInstance = CCR.getInstance(tab.javascriptReference, tab.javascriptClass, tab);
if (!tabInstance) {
continue;
}
tabPanel.add(tabInstance);
if (tab.isDefault) {
tabToken = tabToken || mainTabToken + CCR.xdmod.ui.tokenDelimiter + tab.tab;
}
}

if (mainPanel.el) {
mainPanel.el.unmask();
}

consultCallCache();

//Conditionally present the profile if an e-mail address has not been set
xsedeProfilePrompt();

Expand Down
25 changes: 0 additions & 25 deletions html/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,6 @@ function isReferrer($referrer)

<script type="text/javascript">

var isCallCached = false;
var consultCallCache = function() {};
var xsedeProfilePrompt = function() {};

<?php if (!$userLoggedIn): ?>
Expand All @@ -511,18 +509,6 @@ function isReferrer($referrer)
});
<?php else: ?>
<?php
if (isset($_SESSION['cached_call']) && !empty($_SESSION['cached_call'])) {
?>

isCallCached = true;
consultCallCache = function() { CCR.xdmod.ui.Viewer.<?php print $_SESSION['cached_call']; ?> }

<?php

unset($_SESSION['cached_call']);

}

// ==============================================

$profile_editor_init_flag = '';
Expand Down Expand Up @@ -594,17 +580,6 @@ function isReferrer($referrer)
<iframe id="x-history-frame"></iframe>
</form>

<?php if (!$userLoggedIn): ?>
<!-- For caching calls (e.g. goToChart(...), made when an image thumbnail is clicked) -->
<form name="function_call_cacher" class="x-hidden" method="POST" action="index.php">
<input type="hidden" id="cached_call" name="cached_call" value="">
</form>
<?php endif; ?>

<div class="x-hidden">
<iframe name="pdf_target_frame"></iframe>
</div>

<div id="viewer"> </div>

<noscript>
Expand Down