Changeset 29444 for main/trunk/model-sites-dev

Timestamp:

2014-11-17T16:16:35+13:00 (9 years ago)

Author:

sjs49

Message:

Refactored code a little to remove some unecessary function parameters relating to drawing objects on left and right side of comparison page

File:

• main/trunk/model-sites-dev/von-sparql/js/von-sparql-comparison-setup.js (modified) (6 diffs)

main/trunk/model-sites-dev/von-sparql/js/von-sparql-comparison-setup.js

@@ -62 +62 @@
 
     //Draw buttons, etc for each side of page
-    drawSide("left",leftCollection);
-    apply_functions("left",leftCollection);
-    drawSide("right",rightCollection);
-    apply_functions("right",rightCollection);
+    drawSide("left");
+    apply_functions("left");
+    drawSide("right");
+    apply_functions("right");
     
     //apply css to generated objects
@@ -100 +100 @@
 
 //Redraw a side, given the collection name
-function drawSide(side, collectionName){
+function drawSide(side){
+    var collectionName = $("#sel_" + side + "Collection").val();
     $('#span_' + side + 'Name').html(collectionName);
     drawOverview(collectionName, ("div_" + side + "Overview"));
@@ -186 +187 @@
 
 //Apply functions to various elements
-function apply_functions(side, collection){
+function apply_functions(side){
 
     //Create jquery UI comboboxes
     $('#div_' + side + 'RefineControls select').combobox({
         select: function(event, ui) {
+        var collectionValue = $("#sel_" + side + "Collection").val();
             var id = event.target.id;
             if(id == "sel_" + side + "Predicate")
-                updateValueSelector(this.value,"sel_"+ side + "PredicateValue", collection);
+                updateValueSelector(this.value,"sel_"+ side + "PredicateValue", collectionValue);
         }
     });
@@ -199 +201 @@
     $('#btn_' + side + 'ShowChart').on('click',function(){
         hardLimit=2000;
-        drawFilteredDataset(side, collection);
+        var collectionValue = $("#sel_" + side + "Collection").val();
+        drawFilteredDataset(side, collectionValue);
     });
 
     $('#btn_' + side + 'ShowQuery').on('click',function(){
+        var collectionValue = $("#sel_" + side + "Collection").val();
         hardLimit=2000;
-        alert(generateQuery(side,collection));  
+        alert(generateQuery(side,collectionValue)); 
     });
 
@@ -215 +219 @@
 
     //When a <tr> in overview table is selected, select in predicate dropdown
-$(document).on("click", "#div_" + side + "Overview.overview tr", function(){
+    $(document).on("click", "#div_" + side + "Overview.overview tr", function(){
+        var collectionValue = $("#sel_" + side + "Collection").val();
         var clickedText = tidyPredicate($(this).children(":first").text());
         $('#sel_' + side + 'Predicate option[text="' + clickedText + '"]').attr('selected','selected');
@@ -223 +228 @@
         
         $('#sel_' + side + 'Predicate').siblings('.custom-combobox').find('.custom-combobox-input').val(clickedText);
-        updateValueSelector($('#sel_' + side + 'Predicate option:selected').val(),"sel_"+ side + "PredicateValue", collection);
+        updateValueSelector($('#sel_' + side + 'Predicate option:selected').val(),"sel_"+ side + "PredicateValue", collectionValue);
 
         if($('#cb_quickSearch').is(':checked')) {   
             hardLimit=500;
-            drawFilteredDataset(side, collection);
+            drawFilteredDataset(side, collectionValue);
         }