fixed test issues

davidandrewcope · Feb 23, 2009 · 7792809 · 7792809
1 parent 232a1e4
commit 7792809
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 55 deletions.
diff --git a/genetify/controls.js b/genetify/controls.js
@@ -245,28 +245,28 @@ genetify.controls = {
 
                 var extra = ' class="genetify_col_' + rows[0][j] + '"';
 
-                if (genetify.results[cols[j]]){
+                if (genetify.results[cols[j]] && rows[i+1]){
                     var geneName = cols[j];
 
                     extra = ' colspan="' + rows[i+1].length + '"';
                     extra += ' class="genetify_gene_row"';
 
                     // stats confidence
-                    var confidence = genetify.weight.sums[geneName].confidence;
-                    if (confidence){
-                        var stars = '';
-                        if (confidence > 0.9){
-                            stars += '*';
-                        }
-                        if (confidence > 0.95){
-                            stars += '*';
-                        }
-                        if (confidence > 0.99){
-                            stars += '*';
-                        }
-                        extra += ' title="The ' + geneName + ' variants are different at a confidence of ' + genetify.utils.round(confidence) + '"';
-                        cols[j] = cols[j] + ' ' + stars;
-                    }
+                    // var confidence = genetify.weight.sums[geneName].confidence;
+                    // if (confidence){
+                    //     var stars = '';
+                    //     if (confidence > 0.9){
+                    //         stars += '*';
+                    //     }
+                    //     if (confidence > 0.95){
+                    //         stars += '*';
+                    //     }
+                    //     if (confidence > 0.99){
+                    //         stars += '*';
+                    //     }
+                    //     extra += ' title="The ' + geneName + ' variants are different at a confidence of ' + genetify.utils.round(confidence) + '"';
+                    //     cols[j] = cols[j] + ' ' + stars;
+                    // }
 
                 }
                 else if (j === 0){
@@ -320,10 +320,3 @@ var genetify_controls_HTML = '\
         <a href="#" class="negative" onclick="genetify.cookie.disable(); return false;"><img src="' + genetify.config.REMOTE_BASE_URL + '/images/delete.png" alt="">Disable</a>\
     </div>\
 ';
-if (genetify.config.LOAD_CONTROLS){
-    genetify.controls._insertHTML('genetify_controls', genetify_controls_HTML);
-}
-
-if (genetify.config.SHOW_RESULTS){
-    genetify.controls.showResults();
-}
diff --git a/genetify/demo/index.php b/genetify/demo/index.php
@@ -7,13 +7,15 @@
 
     <script type="text/javascript">
         GENETIFY_CONFIG = {
+            SHOW_RESULTS: true,
             USE_COOKIE: false,
             USE_RESULTS_CACHE: false,
             REMOTE_BASE_URL: '..',
             //TODO: seperate by user of demo?
             NAMESPACE: window.location.pathname + window.location.search
         };
     </script>
+
     <?php
         include('test-sections/_head.html');
         if (empty($_GET['p'])) {
@@ -25,6 +27,7 @@
         /* override controls.css */
         #genetify_results {
             position: static;
+            display: none;
         }
         #genetify_results_table {
             width: 200px;
@@ -54,13 +57,7 @@
 
     <script type="text/javascript" charset="utf-8">
 
-        genetify.vary('all');
-
-        var results = document.getElementById('results');
-        if (results){
-            var out = genetify.printProbs();
-            results.innerHTML = out.replace(/\n/g, '<br/>');
-        }
+        genetify.vary('elements', 'additiveCSSRules');
 
     </script>
 

diff --git a/genetify/demo/test-sections/_head.html b/genetify/demo/test-sections/_head.html
@@ -7,7 +7,6 @@
     .genetify_disabled { display: none !important; }
     .genetify_enabled { display: block; }
 </style>
-
 <script type="text/javascript" charset="utf-8" src="../genetify.js"></script>
 
 <?php if (stristr($_SERVER['HTTP_USER_AGENT'], 'MSIE')): ?>

diff --git a/genetify/demo/test-sections/combinations.html b/genetify/demo/test-sections/combinations.html
@@ -24,10 +24,7 @@
 
             </style>
 
-            <div id="genetify_results"></div>
-            <script type="text/javascript">
-                genetify.controls.showResults();
-            </script>
+            <div id="genetify_results" style="display:block"></div>
 
         </div>
     </td>

diff --git a/genetify/demo/test-sections/goals.html b/genetify/demo/test-sections/goals.html
@@ -24,10 +24,7 @@
 
             <br/>
 
-            <div id="genetify_results"></div>
-            <script type="text/javascript">
-                genetify.controls.showResults();
-            </script>
+            <div id="genetify_results" style="display:block"></div>
 
             <div class="corner top left">&nbsp;</div>
             <div class="corner top right">&nbsp;</div>

diff --git a/genetify/demo/test-sections/javascript.html b/genetify/demo/test-sections/javascript.html
@@ -6,11 +6,11 @@
             <p><a href="#" onclick="foo(); location.reload(); return false;">Try it</a></p>
             <p><a href="?p=goals">Next page</a></p>
 
-            <div class="corner top left">&nbsp;</div>           
-            <div class="corner top right">&nbsp;</div>           
-            <div class="corner bottom right">&nbsp;</div>           
-            <div class="corner bottom left">&nbsp;</div>           
-        </div> 
+            <div class="corner top left">&nbsp;</div>
+            <div class="corner top right">&nbsp;</div>
+            <div class="corner bottom right">&nbsp;</div>
+            <div class="corner bottom left">&nbsp;</div>
+        </div>
     </td>
     <td>
         <div class="container">
@@ -32,10 +32,14 @@
 };
             </pre>
 
-            <div class="corner top left">&nbsp;</div>           
-            <div class="corner top right">&nbsp;</div>           
-            <div class="corner bottom right">&nbsp;</div>           
-            <div class="corner bottom left">&nbsp;</div>           
+            <script type="text/javascript">
+                genetify.vary('javascript');
+            </script>
+
+            <div class="corner top left">&nbsp;</div>
+            <div class="corner top right">&nbsp;</div>
+            <div class="corner bottom right">&nbsp;</div>
+            <div class="corner bottom left">&nbsp;</div>
         </div>
     </td>
 </tr>
diff --git a/genetify/demo/test-sections/user-goals.html b/genetify/demo/test-sections/user-goals.html
@@ -24,10 +24,7 @@
 
             <br/>
 
-            <div id="genetify_results"></div>
-            <script type="text/javascript">
-                genetify.controls.showResults();
-            </script>
+            <div id="genetify_results" style="display:block"></div>
 
             <div class="corner top left">&nbsp;</div>
             <div class="corner top right">&nbsp;</div>

diff --git a/genetify/genetify.js b/genetify/genetify.js
@@ -102,18 +102,29 @@ var genetify = {
             genetify._setReferrer();
         }
 
-        genetify.utils.request(genetify.config.REMOTE_BASE_URL + '/controls.js');
+        var filesLoad = function(override){
+            genetify.utils.request(genetify.config.REMOTE_BASE_URL + '/controls.js');
+            genetify.utils.insertStylesheet(genetify.config.REMOTE_BASE_URL + '/controls.css');
+        }
+
         if (genetify.config.LOAD_CONTROLS || genetify.config.SHOW_RESULTS){
+            filesLoad();
             genetify._addListener(window, 'onload', function(){
-                genetify.utils.insertStylesheet(genetify.config.REMOTE_BASE_URL + '/controls.css');
+                if (genetify.config.LOAD_CONTROLS){
+                    genetify.controls._insertHTML('genetify_controls', genetify_controls_HTML);
+                }
+                if (genetify.config.SHOW_RESULTS){
+                    genetify.controls.showResults();
+                }
             });
         }
 
         genetify._addListener(window, 'onkeydown', function(e){
             if (e.ctrlKey){
+                filesLoad();
                 var key = e.charCode || e.keyCode;
                 if (key == 71 ){ // g
-                    genetify.controls.load();
+                    genetify.controls._insertHTML('genetify_controls', genetify_controls_HTML);
                     genetify.controls.showResults();
                 }
             }
@@ -1328,6 +1339,7 @@ genetify.weight = {
 
 };
 
+
 //TODO: why is this needed?
 // firebug won't print later unless it is invoked here!
 console.log('Firebug', console.firebug || console.provider, 'is working');