From 398f5203f4a64f6af83f93d99eebe0ab557ec7bb Mon Sep 17 00:00:00 2001 From: Yung Han Khoe Date: Sat, 30 May 2009 14:43:41 +0000 Subject: [PATCH] making all Matrix datatables templatable --- .../matrix-default-compare-template.wgpkg | Bin 0 -> 6339 bytes .../matrix-default-detailed-listing.wgpkg | Bin 0 -> 4741 bytes .../matrix-default-view-template.wgpkg | Bin 0 -> 5868 bytes .../matrix-search-template.wgpkg | Bin 0 -> 3651 bytes lib/WebGUI/Asset/MatrixListing.pm | 2 - lib/WebGUI/Asset/Wobject/Matrix.pm | 41 ++- www/extras/wobject/Matrix/matrix.js | 141 ---------- .../wobject/Matrix/matrixCompareList.js | 251 ------------------ www/extras/wobject/Matrix/matrixListing.js | 126 --------- www/extras/wobject/Matrix/matrixSearch.js | 94 ------- 10 files changed, 20 insertions(+), 635 deletions(-) create mode 100644 docs/upgrades/packages-7.7.9/matrix-default-compare-template.wgpkg create mode 100644 docs/upgrades/packages-7.7.9/matrix-default-detailed-listing.wgpkg create mode 100644 docs/upgrades/packages-7.7.9/matrix-default-view-template.wgpkg create mode 100644 docs/upgrades/packages-7.7.9/matrix-search-template.wgpkg delete mode 100644 www/extras/wobject/Matrix/matrix.js delete mode 100644 www/extras/wobject/Matrix/matrixCompareList.js delete mode 100644 www/extras/wobject/Matrix/matrixListing.js delete mode 100644 www/extras/wobject/Matrix/matrixSearch.js diff --git a/docs/upgrades/packages-7.7.9/matrix-default-compare-template.wgpkg b/docs/upgrades/packages-7.7.9/matrix-default-compare-template.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..699188fade566a938de35a4511bd7f70fc35f866 GIT binary patch literal 6339 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 F004}~gSh|z literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.7.9/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.7.9/matrix-default-detailed-listing.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..5b231d027c2559e78b09b1799d0e17d1db396fdc GIT binary patch literal 4741 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�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 VZw>sdf&T*y{1-D@CVl`m002C6@ooSB literal 0 HcmV?d00001 diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm index d4678869b..f55ed6224 100644 --- a/lib/WebGUI/Asset/MatrixListing.pm +++ b/lib/WebGUI/Asset/MatrixListing.pm @@ -710,8 +710,6 @@ sub view { {type =>'text/javascript'}); $self->session->style->setScript($self->session->url->extras('yui/build/button/button-min.js'), {type =>'text/javascript'}); - $self->session->style->setScript($self->session->url->extras('wobject/Matrix/matrixListing.js'), {type => - 'text/javascript'}); $self->session->style->setLink($self->session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type =>'text/css', rel=>'stylesheet'}); diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index cc385d777..d6bfb4832 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -635,8 +635,6 @@ sub view { 'text/javascript'}); $self->session->style->setScript($self->session->url->extras('yui/build/button/button-min.js'), {type => 'text/javascript'}); - $self->session->style->setScript($self->session->url->extras('wobject/Matrix/matrix.js'), {type => - 'text/javascript'}); my ($varStatistics,$varStatisticsEncoded); my $var = $self->get; @@ -646,7 +644,7 @@ sub view { $var->{exportAttributes_url} = $self->getUrl('func=exportAttributes'); $var->{listAttributes_url} = $self->getUrl('func=listAttributes'); $var->{search_url} = $self->getUrl('func=search'); - $var->{compareForm_url} = $self->getUrl(); + $var->{matrix_url} = $self->getUrl(); my $maxComparisons; if($self->session->user->isVisitor){ @@ -658,10 +656,7 @@ sub view { else{ $maxComparisons = $self->get('maxComparisonsPrivileged'); } - $var->{javascript} = ""; + $var->{maxComparisons} = $maxComparisons; if ($self->canEdit){ # Get all the MatrixListings that are still pending. @@ -880,8 +875,6 @@ sub www_compare { {type =>'text/javascript'}); $self->session->style->setScript($self->session->url->extras('yui/build/container/container-min.js'), {type =>'text/javascript'}); - $self->session->style->setScript($self->session->url->extras('wobject/Matrix/matrixCompareList.js'), {type => - 'text/javascript'}); $self->session->style->setLink($self->session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type =>'text/css', rel=>'stylesheet'}); $self->session->style->setScript($self->session->url->extras('hoverhelp.js'), {type => @@ -905,13 +898,12 @@ sub www_compare { $listingId_safe =~ s/-/_____/g; push(@responseFields, $listingId_safe, $listingId_safe."_compareColor"); } - - $var->{javascript} = ""; + + $var->{maxComparisons} = $maxComparisons; + $var->{matrixUrl} = $self->getUrl; + $var->{listingIds} = join(", ",map {'"'.$_.'"'} @listingIds); + $var->{responseFields} = '"attributeId", "name", "description","fieldType", "checked", ' + .join(", ",map{'"'.$_.'"'} @responseFields); return $self->processStyle($self->processTemplate($var,$self->get("compareTemplateId"))); } @@ -1170,7 +1162,8 @@ sub www_getCompareFormData { my @results; if($form->process("search")){ - while (my $result = $self->getListings) { + if ($searchParamList){ + foreach my $result (@{$self->getListings}) { my $matrixListing_attributes = $session->db->buildHashRefOfHashRefs(" select value, fieldType, attributeId from Matrix_attribute left join MatrixListing_attribute as listing using(attributeId) @@ -1192,8 +1185,16 @@ sub www_getCompareFormData { $result->{checked} = 'checked'; } } - $result->{assetId} =~ s/-/_____/g; - push @results, $result; + $result->{assetId} =~ s/-/_____/g; + push @results, $result; + } + } + else{ + foreach my $result (@{$self->getListings}) { + $result->{checked} = 'checked'; + $result->{assetId} =~ s/-/_____/g; + push @results, $result; + } } }else{ foreach my $result (@{$self->getListings}) { @@ -1382,8 +1383,6 @@ sub www_search { {type =>'text/javascript'}); $self->session->style->setScript($self->session->url->extras('yui/build/button/button-min.js'), {type =>'text/javascript'}); - $self->session->style->setScript($self->session->url->extras('wobject/Matrix/matrixSearch.js'), {type => - 'text/javascript'}); $self->session->style->setLink($self->session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {type =>'text/css', rel=>'stylesheet'}); diff --git a/www/extras/wobject/Matrix/matrix.js b/www/extras/wobject/Matrix/matrix.js deleted file mode 100644 index 6711e0358..000000000 --- a/www/extras/wobject/Matrix/matrix.js +++ /dev/null @@ -1,141 +0,0 @@ -YAHOO.util.Event.addListener(window, "load", function() { - YAHOO.example.XHR_JSON = new function() { - this.formatUrl = function(elCell, oRecord, oColumn, sData) { - elCell.innerHTML = "" + sData + ""; - }; - this.formatCheckBox = function(elCell, oRecord, oColumn, sData) { - var innerHTML = ""; - elCell.innerHTML = innerHTML; - }; - - var myColumnDefs = [ - {key:"assetId",label:"",sortable:false, formatter:this.formatCheckBox}, - {key:"title", label:"", sortable:true, formatter:this.formatUrl}, - {key:"views", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, - {key:"clicks", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, - {key:"compares", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, - {key:"lastUpdated", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}} - ]; - - var uri = "func=getCompareFormData"; - if(typeof(listingIds) != 'undefined'){ - uri = uri + ';__listingId_isIn=1'; - for (var i = 0; i < listingIds.length; i++) { - uri = uri+';listingId='+listingIds[i]; - } - } - - this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get("compareFormTable")); - this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; - this.myDataSource.responseSchema = { - fields: [{key: "checked"},"assetId","title",{key: "views", parser: "number"},{key: "clicks", parser: "number"},{key: "compares", parser: "number"},{key: "lastUpdated", parser: "number"},"url"] - }; - - this.myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs, - this.myDataSource); - - this.myDataTable.hideColumn(this.myDataTable.getColumn(2)); - this.myDataTable.hideColumn(this.myDataTable.getColumn(3)); - this.myDataTable.hideColumn(this.myDataTable.getColumn(4)); - this.myDataTable.hideColumn(this.myDataTable.getColumn(5)); - - if(document.getElementById("sortByViews")){ - var btnSortByViews = new YAHOO.widget.Button("sortByViews"); - btnSortByViews.on("click", function(e) { - this.myDataTable.sortColumn(this.myDataTable.getColumn(2)); - var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=views"); - },this,true); - } - - if(document.getElementById("sortByClicks")){ - var btnSortByClicks = new YAHOO.widget.Button("sortByClicks"); - btnSortByClicks.on("click", function(e) { - this.myDataTable.sortColumn(this.myDataTable.getColumn(3)); - var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=clicks"); - },this,true); - } - - if(document.getElementById("sortByCompares")){ - var btnSortByCompares = new YAHOO.widget.Button("sortByCompares"); - btnSortByCompares.on("click", function(e) { - this.myDataTable.sortColumn(this.myDataTable.getColumn(4)); - var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=compares"); - },this,true); - } - - if(document.getElementById("sortByUpdated")){ - var btnSortByUpdated = new YAHOO.widget.Button("sortByUpdated"); - btnSortByUpdated.on("click", function(e) { - this.myDataTable.sortColumn(this.myDataTable.getColumn(5)); - var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=lastUpdated"); - },this,true); - } - - if(document.getElementById("sortByName")){ - var btnSortByName = new YAHOO.widget.Button("sortByName"); - btnSortByName.on("click", function(e) { - this.myDataTable.sortColumn(this.myDataTable.getColumn(1)); - var request = YAHOO.util.Connect.asyncRequest('POST', matrixUrl + "?func=setSort;sort=lastUpdated"); - },this,true); - } - - - var myCallback = function() { - this.set("sortedBy", null); - this.onDataReturnAppendRows.apply(this,arguments); - }; - - var compareFormButton = function() { - var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input'); - var checked = 0; - var checkedCompareBoxes = new Object(); - for (var i = compareCheckBoxes.length; i--; ) { - if(compareCheckBoxes[i].checked){ - checked++; - checkedCompareBoxes[compareCheckBoxes[i].value] = true; - } - } - if (checked < 2){ - alert(tooFewMessage); - }else if (checked > maxComparisons){ - alert(tooManyMessage); - }else{ - window.document.forms['doCompare'].submit(); - } - var elements = window.compareDataTable.getRecordSet().getRecords(); - for(j=0; j"; - elCell.innerHTML = innerHTML; - } - }; - - this.formatColors = function(elCell, oRecord, oColumn, sData) { - if(!(oRecord.getData("fieldType") in {'category':'','lastUpdated':''})){ - var colorField = oColumn.key + "_compareColor"; - var color = oRecord.getData(colorField); - if(color){ - Dom.setStyle(elCell.parentNode, "background-color", color); - } - elCell.innerHTML = sData; - }else{ - elCell.innerHTML = sData; - } - }; - this.formatLabel = function(elCell, oRecord, oColumn, sData) { - if(oRecord.getData("fieldType") == 'category'){ - elCell.innerHTML = "" +sData + ""; - }else{ - elCell.innerHTML = sData; - if(oRecord.getData("description")){ - elCell.innerHTML = elCell.innerHTML + "
" + oRecord.getData("description") +"
"; - } - } - }; - - YAHOO.widget.DataTable.Formatter.formatColors = this.formatColors; - - var myColumnDefs = [ - {key:"stickied",formatter:this.formatStickied,label:""}, - {key:"name",formatter:this.formatLabel,label:""} - ]; - - this.myDataSource = new YAHOO.util.DataSource("?"); - this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; - this.myDataSource.connXhrMode = "queueRequests"; - this.myDataSource.responseSchema = { - resultsList: "ResultSet.Result", - fields: responseFields - }; - - var uri = "func=getCompareListData"; - for (var i = 0; i < listingIds.length; i++) { - uri = uri+';listingId='+listingIds[i]; - } - - var initAttributeHoverHelp = function() { - initHoverHelp('compareList'); - } - - var myDataTable = new YAHOO.widget.DataTable("compareList", myColumnDefs, - this.myDataSource, {initialRequest:uri}); - myDataTable.subscribe("initEvent", initAttributeHoverHelp); - - - window.removeListing = function(key) { - myDataTable.hideColumn(myDataTable.removeColumn(key)); - } - - this.myDataSource.doBeforeParseData = function (oRequest, oFullResponse) { - this.responseSchema.fields = oFullResponse.ResponseFields; - var existingColumns = myDataTable.getColumnSet().keys; - for (var i = 0; i < existingColumns.length; i++) { - if(i > 1){ - // after deleting a column the next column will - // allways be no. 2 (the third in the array) - myDataTable.removeColumn(existingColumns[2]); - } - } - if (oFullResponse.ColumnDefs) { - var len = oFullResponse.ColumnDefs.length; - - for (var i = 0; i < len; i++) { - var c = oFullResponse.ColumnDefs[i]; - oFullResponse.ColumnDefs[i].label = "" + oFullResponse.ColumnDefs[i].label + " " - myDataTable.insertColumn(c); - } - } - return oFullResponse; - } - - var myCallback = function() { - this.set("sortedBy", null); - this.onDataReturnAppendRows.apply(this,arguments); - initHoverHelp('compareList'); - }; - - var callback2 = { - success : myCallback, - failure : myCallback, - scope : myDataTable - }; - - if(document.getElementById("compare3")){ - var btnCompare3 = new YAHOO.widget.Button("compare3",{id:"compareButton3"}); - btnCompare3.on("click", function(e) { - var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input'); - var checked = 0; - var checkedCompareBoxes = new Object(); - for (var i = compareCheckBoxes.length; i--; ) { - if(compareCheckBoxes[i].checked){ - checked++; - checkedCompareBoxes[compareCheckBoxes[i].value] = true; - } - } - if (checked < 2){ - alert(tooFewMessage); - }else if (checked > maxComparisons){ - alert(tooManyMessage); - }else{ - //window.document.forms['doCompare'].submit(); - var uri = "func=getCompareListData"; - for (var i = compareCheckBoxes.length; i--; ) { - if(compareCheckBoxes[i].checked == true){ - uri = uri+';listingId='+compareCheckBoxes[i].value; - } - } - myDataTable.getRecordSet().reset(); - myDataTable.refreshView(); - myDataTable.showTableMessage('Loading...'); - this.myDataSource.sendRequest(uri,callback2); - } - - },this,true); - } - - if(document.getElementById("stickied")){ - var btnStickied = new YAHOO.widget.Button("stickied"); - btnStickied.on("click", function(e) { - var elements = myDataTable.getRecordSet().getRecords(); - if(hideStickies == 0){ - // hide non-selected attributes - for(i=0; i" + sData + ""; - }; - this.formatCheckBox = function(elCell, oRecord, oColumn, sData) { - var innerHTML = ""; - elCell.innerHTML = innerHTML; - }; - - var myColumnDefs = [ - {key:"assetId",label:"",sortable:false, formatter:this.formatCheckBox}, - {key:"title", label:"", sortable:true, formatter:this.formatUrl}, - {key:"views", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, - {key:"clicks", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, - {key:"compares", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, - {key:"lastUpdated", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}} - ]; - - var uri = "func=getCompareFormData"; - if(typeof(listingIds) != 'undefined'){ - uri = uri + ';__listingId_isIn=1'; - for (var i = 0; i < listingIds.length; i++) { - uri = uri+';listingId='+listingIds[i]; - } - } - - this.myDataSource = new YAHOO.util.DataSource(matrixUrl + "?"); - this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; - this.myDataSource.connXhrMode = "queueRequests"; - this.myDataSource.responseSchema = { - resultsList: "ResultSet.Result", - fields: ["title",{key: "views", parser: "number"},{key: "clicks", parser: "number"},{key: "compares", parser: "number"},{key: "checked"},{key: "lastUpdated", parser: "number"},"url","assetId"] - }; - - this.myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs, - this.myDataSource, {initialRequest:uri}); - - this.myDataTable.hideColumn(this.myDataTable.getColumn(2)); - this.myDataTable.hideColumn(this.myDataTable.getColumn(3)); - this.myDataTable.hideColumn(this.myDataTable.getColumn(4)); - this.myDataTable.hideColumn(this.myDataTable.getColumn(5)); - - var myCallback = function() { - this.set("sortedBy", null); - this.onDataReturnAppendRows.apply(this,arguments); - }; - - if(document.getElementById("search")){ - var btnSearch = new YAHOO.widget.Button("search"); - btnSearch.on("click", function(e) { - window.location.href = matrixUrl + '?func=search'; - },this,true); - } - - window.compareDataTable = this.myDataTable; - - }; -}); - - -function setStickied (checkbox) { - if(checkbox.checked == true){ - var request = YAHOO.util.Connect.asyncRequest('POST', "?func=setStickied;attributeId="+checkbox.name); - }else{ - var request = YAHOO.util.Connect.asyncRequest('POST', "?func=deleteStickied;attributeId="+checkbox.name); - } - -} - - - diff --git a/www/extras/wobject/Matrix/matrixListing.js b/www/extras/wobject/Matrix/matrixListing.js deleted file mode 100644 index 8d87a4b58..000000000 --- a/www/extras/wobject/Matrix/matrixListing.js +++ /dev/null @@ -1,126 +0,0 @@ -YAHOO.util.Event.addListener(window, "load", function() { - YAHOO.example.XHR_JSON = new function() { - var Dom = YAHOO.util.Dom; - var hideStickies = 0; - - this.formatStickied = function(elCell, oRecord, oColumn, sData) { - if(oRecord.getData("fieldType") != 'category'){ - var innerHTML = ""; - elCell.innerHTML = innerHTML; - } - }; - this.formatLabel = function(elCell, oRecord, oColumn, sData) { - if(oRecord.getData("fieldType") == 'category'){ - elCell.innerHTML = "" +sData + ""; - }else{ - elCell.innerHTML = sData + "
" + oRecord.getData("description") +"
"; - } - }; - this.formatColors = function(elCell, oRecord, oColumn, sData) { - if(oRecord.getData("fieldType") != 'category'){ - var color = oRecord.getData("compareColor"); - if(color){ - Dom.setStyle(elCell.parentNode, "background-color", color); - } - elCell.innerHTML = sData; - } - }; - var myColumnDefs = [ - {key:"stickied",formatter:this.formatStickied,label:""}, - {key:"label",formatter:this.formatLabel,label:""}, - {key:"value",label:"",formatter:this.formatColors} - ]; - - this.myDataSource = new YAHOO.util.DataSource("?"); - this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; - this.myDataSource.connXhrMode = "queueRequests"; - this.myDataSource.responseSchema = { - resultsList: "ResultSet.Result", - fields: ["label","value","attributeId","fieldType","checked","description","compareColor"] - }; - - var uri = "func=getAttributes"; - if(typeof(revision) != 'undefined'){ - uri = uri + ';revision=' + revision; - } - - var initAttributeHoverHelp = function() { - initHoverHelp('attributes'); - } - - var myDataTable = new YAHOO.widget.DataTable("attributes", myColumnDefs, - this.myDataSource, {initialRequest:uri}); - myDataTable.subscribe("initEvent", initAttributeHoverHelp); - - - this.myDataSource.doBeforeParseData = function (oRequest, oFullResponse) { - myDataTable.getRecordSet().reset(); - return oFullResponse; - } - - var myCallback = function() { - this.set("sortedBy", null); - this.onDataReturnAppendRows.apply(this,arguments); - }; - - var myCallback2 = function() { - this.set("sortedBy", null); - this.onDataReturnAppendRows.apply(this,arguments); - }; - - var callback2 = { - success : myCallback, - failure : myCallback, - scope : myDataTable - }; - - var btnStickied = new YAHOO.widget.Button("stickied"); - btnStickied.on("click", function(e) { - var elements = myDataTable.getRecordSet().getRecords(); - if(hideStickies == 0){ - // hide non-selected attributes - for(i=0; i" + sData + ""; - }; - this.formatCheckBox = function(elCell, oRecord, oColumn, sData) { - var innerHTML = ""; - elCell.innerHTML = innerHTML; - }; - - var myColumnDefs = [ - {key:"assetId",label:"",sortable:false, formatter:this.formatCheckBox}, - {key:"title", label:"Name", sortable:true, formatter:this.formatUrl} - ]; - - var uri = "func=getCompareFormData"; - if(typeof(listingIds) != 'undefined'){ - for (var i = 0; i < listingIds.length; i++) { - uri = uri+';listingId='+listingIds[i]; - } - } - - this.myDataSource = new YAHOO.util.DataSource("?"); - this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; - this.myDataSource.connXhrMode = "queueRequests"; - this.myDataSource.responseSchema = { - resultsList: "ResultSet.Result", - fields: ["title","checked","url","assetId"] - }; - - var myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs, - this.myDataSource, {initialRequest:uri}); - - var myDataSource = this.myDataSource; - - var myCallback = function() { - this.set("sortedBy", null); - this.onDataReturnAppendRows.apply(this,arguments); - }; - - var callback2 = { - success : myCallback, - failure : myCallback, - scope : myDataTable - }; - - var reloadCompareForm = function() { - var attributeSelects = YAHOO.util.Dom.getElementsByClassName('attributeSelect','select'); - var newUri = "func=getCompareFormData;search=1"; - for (var i = attributeSelects.length; i--; ) { - var selectedIndex = attributeSelects[i].selectedIndex; - if(attributeSelects[i].value != 'blank' && !(attributeSelects[i].value == '0' && attributeSelects[i][selectedIndex].text == 'No')){ - newUri = newUri + ';search_' + attributeSelects[i].id + '=' + attributeSelects[i].value; - } - } - myDataTable.getRecordSet().reset(); - myDataTable.refreshView(); - myDataTable.showTableMessage('Loading...'); - - myDataSource.sendRequest(newUri,callback2); - - } - var attributeSelects = YAHOO.util.Dom.getElementsByClassName('attributeSelect','select'); - for (var i = attributeSelects.length; i--; ) { - attributeSelects[i].onchange = reloadCompareForm; - } - - var btnCompare = new YAHOO.widget.Button("compare",{id:"compareButton"}); - btnCompare.on("click", function(e) { - var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input'); - var checked = 0; - for (var i = compareCheckBoxes.length; i--; ) { - if(compareCheckBoxes[i].checked){ - checked++; - } - } - if (checked < 2){ - alert(tooFewMessage); - }else if (checked > maxComparisons){ - alert(tooManyMessage); - }else{ - window.document.forms['doCompare'].submit(); - } - },this,true); - - }; -}); -