Remove inline onclick handlers

Author: bbimber

GenotypeAssays/src/org/labkey/genotypeassays/AlignmentDisplayColumn.java

@@ -2,7 +2,7 @@ Ext4.define('mGAP.window.DownloadWindow', {
     extend: 'Ext.window.Window',
 
     statics: {
-        buttonHandler: function(releaseId, el){
+        buttonHandler: function(releaseId){
             Ext4.create('mGAP.window.DownloadWindow', {
                 releaseId: releaseId
             });

mGAP/resources/web/mGAP/DownloadWindow.js

@@ -10,11 +10,11 @@
 import org.labkey.api.query.DetailsURL;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.view.HttpView;
 import org.labkey.api.view.template.ClientDependency;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -45,13 +45,22 @@ private FieldKey getBoundKey(String colName)
                 return new FieldKey(getBoundColumn().getFieldKey().getParent(), colName);
             }
 
+            private boolean _clickHandlerRegistered = false;
+
             @Override
             public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
             {
                 Integer rowId = ctx.get(getBoundKey("rowid"), Integer.class);
                 if (rowId != null)
                 {
-                    out.write("<a class=\"labkey-text-link\" href=\"javascript:void(0);\" onclick=\"mGAP.window.DownloadWindow.buttonHandler(" + PageFlowUtil.jsString(rowId.toString()) + ", this);\">Download</a>");
+                    out.write("<a class=\"labkey-text-link vrdc-row\" data-rowid=" + PageFlowUtil.jsString(rowId.toString()) + ">Download</a>");
+
+                    if (!_clickHandlerRegistered)
+                    {
+                        HttpView.currentPageConfig().addHandlerForQuerySelector("a.vrdc-row", "click", "mGAP.window.DownloadWindow.buttonHandler(this.attributes.getNamedItem('data-rowid').value); return false;");
+
+                        _clickHandlerRegistered = true;
+                    }
                 }
 
                 String jbrowseId = ctx.get(getBoundKey("jbrowseId"), String.class);

mGAP/src/org/labkey/mgap/query/VariantReleaseDisplayColumnFactory.java

@@ -13,6 +13,7 @@
 import org.labkey.api.security.User;
 import org.labkey.api.security.UserManager;
 import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.view.HttpView;
 import org.labkey.api.view.template.ClientDependency;
 import org.labkey.mcc.MccManager;
 import org.labkey.mcc.security.MccFinalReviewPermission;
@@ -32,6 +33,8 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
     {
         return new AbstractMccDisplayColumn(colInfo)
         {
+            private boolean _hasRegisteredApprovedHandler = false;
+
             @Override
             public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
             {
@@ -94,7 +97,14 @@ else if (st == MccManager.RequestStatus.PendingDecision)
                         }
                         else if (st == MccManager.RequestStatus.Approved)
                         {
-                            out.write("<br><a class=\"labkey-text-link\" onclick=\"MCC.window.ChangeStatusWindow.buttonHandler(" + PageFlowUtil.jsString(ctx.getCurrentRegion().getName()) + "," + requestRowId + ", 'Fulfilled')\">Mark Fulfilled</a>");
+                            out.write("<br><a class=\"labkey-text-link rsadc-approved\" data-requestrowid=" + PageFlowUtil.jsString(String.valueOf(requestRowId)) + ">Mark Fulfilled</a>");
+
+                            if (!_hasRegisteredApprovedHandler)
+                            {
+                                HttpView.currentPageConfig().addHandlerForQuerySelector("a.rsadc-approved", "click", "MCC.window.ChangeStatusWindow.buttonHandler(" + PageFlowUtil.jsString(ctx.getCurrentRegion().getName()) + ", this.attributes.getNamedItem('data-requestrowid').value, 'Fulfilled'); return false;");
+
+                                _hasRegisteredApprovedHandler = true;
+                            }
                         }
                     }
                     catch (IllegalArgumentException e)
@@ -128,9 +138,4 @@ public void addQueryFieldKeys(Set<FieldKey> keys)
             }
         };
     }
-
-    private String getWithdrawnLine(RenderContext ctx, int requestRowId)
-    {
-        return "<br><a class=\"labkey-text-link\" onclick=\"MCC.window.ChangeStatusWindow.buttonHandler(" + PageFlowUtil.jsString(ctx.getCurrentRegion().getName()) + "," + requestRowId + ", 'Withdrawn')\">Withdraw Request</a>";
-    }
 }