Merge pull request #109 from jpwhite4/remove_unused

Remove unused code.
ubccr · Apr 26, 2017 · 530555d · 530555d
2 parents 4070a93 + cb1af80
commit 530555d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 140 deletions.
diff --git a/html/controllers/session_pool.php b/html/controllers/session_pool.php
diff --git a/html/gui/js/Viewer.js b/html/gui/js/Viewer.js
@@ -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();
 

diff --git a/html/index.php b/html/index.php
@@ -491,8 +491,6 @@ function isReferrer($referrer)
 
       <script type="text/javascript">
 
-         var isCallCached = false;
-         var consultCallCache = function() {};
          var xsedeProfilePrompt = function() {};
 
          <?php if (!$userLoggedIn): ?>
@@ -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 = '';
@@ -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>