Added 'too few/many' messages to matrix compare box, rfe# 9965

docs/changelog/7.x.x.txt

@@ -3,6 +3,7 @@
  - rfe #9612: Carousel Wobject (was Widget Wobject) (SDH Consulting Group)
  - Survey summaries now added.  In the Survey edit, select quiz mode, and a summary will be shown to the user at the end of the survey.
  - fixed #10110: Matrix 2.0 - "Data Error" on Pending Product Listing Updates
+ - rfe #9965: matrix/pls reverse dropped event variables 
 
 7.7.2
  - fixed #10056: YUI javascripts included while adminOff (BNC)

lib/WebGUI/i18n/English/Asset_Matrix.pm

@@ -807,6 +807,17 @@ selectBox.</p>|
         message => q|Matrix Fieldtype|,
     },
 
+    'too many message' => {
+        lastUpdated => 0,
+        message => q|You tried to compare more than your maximum number of listings.|,
+        context => q|A message shown to the user when they have selected too many listings to compare.|,
+    },
+
+    'too few message' => {
+        lastUpdated => 0,
+        message => q|You tried to compare only one listing. If you want to view just one listing, click on its name.|,
+        context => q|A message shown to the user when they have selected only one listing to compare.|,
+    }
 };
 
 1;

www/extras/wobject/Matrix/matrix.js

@@ -8,7 +8,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
 		if(typeof(oRecord.getData("checked")) != 'undefined' && oRecord.getData("checked") == 'checked'){
 			innerHTML = innerHTML + " checked='checked'";
 		}
-		innerHTML = innerHTML + " onchange='javascript:compareFormButton()' class='compareCheckBox'>";
+		innerHTML = innerHTML + " class='compareCheckBox'>";
 		elCell.innerHTML = innerHTML;
 	};
 
@@ -82,7 +82,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
             this.onDataReturnAppendRows.apply(this,arguments);
         };
 	
-	window.compareFormButton = function() {
+	var compareFormButton = function() {
 		var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');
 		var checked = 0;
 		var checkedCompareBoxes = new Object();
@@ -92,12 +92,12 @@ YAHOO.util.Event.addListener(window, "load", function() {
 				checkedCompareBoxes[compareCheckBoxes[i].value] = true;
 			}
     		}
-		if (checked > 1 && checked < maxComparisons){
+		if (checked < 2){
-			btnCompare.set("disabled",false);
+			alert(tooFewMessage);
-			btnCompare2.set("disabled",false);
+		}else if (checked > maxComparisons){
+			alert(tooManyMessage);
 		}else{
-			btnCompare.set("disabled",true);
+			window.document.forms['doCompare'].submit();
-			btnCompare2.set("disabled",true);
 		}
 		var elements = window.compareDataTable.getRecordSet().getRecords();
 		for(j=0; j<elements.length; j++){
@@ -109,21 +109,17 @@ YAHOO.util.Event.addListener(window, "load", function() {
 			}
 		}
 	}
-	
+
 	if(document.getElementById("compare")){
-	var btnCompare = new YAHOO.widget.Button("compare",{disabled:true,id:"compareButton"});
+	    var btnCompare = new YAHOO.widget.Button("compare",{id:"compareButton"});
-        btnCompare.on("click", function(e) {
+	    btnCompare.on("click", compareFormButton);
-		window.document.forms['doCompare'].submit();
-        },this,true);
 	}
 
 	if(document.getElementById("compare2")){
-	var btnCompare2 = new YAHOO.widget.Button("compare2",{disabled:true,id:"compareButton2"});
+	    var btnCompare2 = new YAHOO.widget.Button("compare2",{id:"compareButton2"});
-        btnCompare2.on("click", function(e) {
+	    btnCompare2.on("click", compareFormButton);
-		window.document.forms['doCompare'].submit();
-        },this,true);
 	}
-
+	
 	if(document.getElementById("search")){
 	var btnSearch = new YAHOO.widget.Button("search");
         btnSearch.on("click", function(e) {

www/extras/wobject/Matrix/matrixCompareList.js

@@ -104,58 +104,40 @@ YAHOO.util.Event.addListener(window, "load", function() {
             scope : myDataTable
         };
 
-	var btnCompare = new YAHOO.widget.Button("compare",{disabled:true,id:"compareButton"});
+	if(document.getElementById("compare3")){
-        btnCompare.on("click", function(e) {
+	var btnCompare3 = new YAHOO.widget.Button("compare3",{id:"compareButton3"});
-		var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');
+        btnCompare3.on("click", function(e) {
-		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);
-
-	var btnCompare2 = new YAHOO.widget.Button("compare2",{disabled:true,id:"compareButton2"});
-        btnCompare2.on("click", function(e) {
-		var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');
-		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);
-
-	var btnSearch = new YAHOO.widget.Button("search");
-        btnSearch.on("click", function(e) {
-		window.location.href = matrixUrl + '?func=search';
-	},this,true);
-
-	window.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 > 1 && checked < maxComparisons){
+		if (checked < 2){
-			btnCompare.set("disabled",false);
+			alert(tooFewMessage);
-			btnCompare2.set("disabled",false);
+		}else if (checked > maxComparisons){
+			alert(tooManyMessage);
 		}else{
-			btnCompare.set("disabled",true);
+			//window.document.forms['doCompare'].submit();
-			btnCompare2.set("disabled",true);
+			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();
@@ -187,6 +169,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
 			hideStickies = 0;
 		}
 	},this,true);
+	}
     };
 });