From 4086723a70043d43466e9192ada2ce6e56845b5a Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Fri, 10 Apr 2009 20:04:18 +0000
Subject: [PATCH] fixed #10142: Matrix 2.0 - Search screen compare button not
 functional

---
 docs/changelog/7.x.x.txt                      |   1 +
 .../matrix-search-template.wgpkg              | Bin 0 -> 1435 bytes
 www/extras/wobject/Matrix/matrixSearch.js     |  19 +++++++++---------
 3 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 docs/upgrades/packages-7.7.4/matrix-search-template.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c301a3a41..e27ef7fcc 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,7 @@
 7.7.4
  - Default Survey Question bundles now store full answer information in json. Everything configured in an answer will be saved in a default configuration.
  - Survey [[question variable]] now returns the shown answer text for multiple choice questions, and the recorded value for non-multiple choice questions.
+ - fixed #10142: Matrix 2.0 - Search screen compare button not functional
 
 7.7.3
  - fixed #10094: double explanation in thread help
diff --git a/docs/upgrades/packages-7.7.4/matrix-search-template.wgpkg b/docs/upgrades/packages-7.7.4/matrix-search-template.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..1b717641209aee2ef56c0147eb1365568f33553e
GIT binary patch
literal 1435
zcmV;M1!VdkiwFP!00000|Ls><bK5o$_H%v(qZc_dp(#q1RV#|8X=BHlkuzy**PZ$r
zh=e4>B)|fo6s42@-o=8Ku8Eu2eW|Gt5A0(1+Y`Xf*5hA|Mx)biZ*9TTH_ukbUQTf}
zwtU~;>vWo}*52Nh<2U@h#+C!DkAI~~6A92}bU04g_v-`W;6fwu`Tdgq)0v3cFYir!
zZM1hjDZw8I35eX=-Q5`fP7`9j82{F83(^3*`S{mk#ee7Vp+AI%zn?)7)|3{KjA_m3
zI+xckaVU`@p;9xd%qX%M&OlP4Y52?BjMiE;WHy9|D1G=j5fZ3xa1KwSs31d?X_Q|}
z(qY8Zgofo@PG=X4hhm088zn)_xkwaS6(?q#%5z0!KU@YvKWj;jDGATW7$??x5#x8x
zMAFggtJ=+>p{wnA%DiF9qR<Nj*MxyQk0?d8DhGA~rCz+csyUKIFjeV!L;*R~Fr?=R
zg)t54JYa(n@8C*a@wLh(VoK$NM#*<cRDooPc9aa(;-8a=5FXy$m~p6F#9RgViA;%=
za#cI%dG^)9{f6*R#2)+~UND_fu06azyznxl#oI$EDMR@qe)hIwq9yz6(Z5m>xq*n(
zzm1zo#?>sup#IEaQ;1F~qwO1S8_LVg)Y*s4LdX)6uO6l~&cpBLu6xNwPXF*aOOPK>
z<TAQRSMT{H<slngyY4|*@K}LaO<SxwP9nP|;k{k*f^}H?md{m`$YA1X3KLAPDOwLx
z$1DsfUv4f;eUL&6Qzy%$u@q_24-Z48k>oc^afJfY0DD>aV6oM)8I-kFM+Z)cbhHpB
zgwIc?QqX3d*G~PW&oz~tXeKy`w(G#*#K7XjmZ$!*{>F5p+Y`)_`ioa}3|A)Yh|azt
zY(!_@lC{_fLN;|+2pz`yb3jMX=4@K%o*@R%;uX+`sn&u+$IFOUx~CGt?c_kj36a#a
z8OxWasQrTRWy`Y}PR1UQA&pk8??JORYEAb7We1L9lGSV=dmey;Z+jJ^Rm7P^Olii)
z8SZ>S&m`Ebacc(TNXQs1GaOcUA#?~_nHOebH;5qR%Epg446FI0$13jp$i|Zm{)}Pq
zIb%99PFr@4O=@SOQ;g{ax>b`;VbwKO2YIv>t&W69oB)btEad#wd=<h9#;Q=Ap{)2U
zn>;X4gV<E@<RZ+|&VaT;G_*YkC0(!1@{%F6wtz-aLc$P221(ZjKbsK<eqcu$FftS}
zq!P&HBae*PYOFOn2h{U0=4`ZLZ3z`!b1$%RtrROMEI?rdO;r@>h9d_Hl?6FfEH4YZ
zA+>!5nnmVhupzvc;*e;vAZujud*gH<tT!lg+S(*3-FD9id)kC}E&fao1Sbzy{><|n
zwb>9N8uOjg7BjGS&wABndj2mvJ>wH9nLd}%kreR<XlvXq2bCQvY%OWFbFSe6wdO2U
zO2ia>Phz{^T+rdW^M1FBjlSDGTUohq)BNj%@bRV{_lbZdl)+xwEJl8_wGY2eySiGL
zl0~XrNSwEHMAAq*r?^~}(6S}(cSh|lyi<~xG7F)Jm{n6!)E!IS3k?vUi$HQBz2cpi
z@)TR!eGnLHQ@dj)2^>GB)guCK3{Ke>3!&L={ZyiW1qV(7sA7XlyWQinlfkNknHq@T
zE_d$2frY8eQ_D70gMzgE{m%Y=yVI=LE$Ngg@W<Qy(6cTyu>T;zU7kFCX^)zSS)ZGA
z$a<qf;*dM01y)1qEr*iwK+Y5WAs1Z%rpY+lT@8)~!li!<-=4oC$NqpMpFa9`zm*`E
zI-M)n>nxj(rsW>19snUr@c6ebPw>>Z;19pm>g={4VM~o>-@tVaFJ$6N&_55@MLN~3
pKV44R7qgl<ntpxu^&w8aPcoi7@Z^Cf5B$G9@DIwpAawv30066!#ozz{

literal 0
HcmV?d00001

diff --git a/www/extras/wobject/Matrix/matrixSearch.js b/www/extras/wobject/Matrix/matrixSearch.js
index e4d36c871..0e83ae86c 100644
--- a/www/extras/wobject/Matrix/matrixSearch.js
+++ b/www/extras/wobject/Matrix/matrixSearch.js
@@ -10,7 +10,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;
 	};
 
@@ -72,12 +72,8 @@ YAHOO.util.Event.addListener(window, "load", function() {
 		attributeSelects[i].onchange = reloadCompareForm;
     	}
 	
-	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) {
-		window.document.forms['doCompare'].submit();
-        },this,true);
-
-	window.compareFormButton = function() {
 		var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');
 		var checked = 0;
 		for (var i = compareCheckBoxes.length; i--; ) {
@@ -85,12 +81,15 @@ YAHOO.util.Event.addListener(window, "load", function() {
 				checked++;
 			}
     		}
-		if (checked > 1 && checked < maxComparisons){
-			btnCompare.set("disabled",false);
+		if (checked < 2){
+			alert(tooFewMessage);
+		}else if (checked > maxComparisons){
+			alert(tooManyMessage);
 		}else{
-			btnCompare.set("disabled",true);
+			window.document.forms['doCompare'].submit();
 		}
-	}
+        },this,true);
+
     };
 });