From f0a8243f7d4079ac406e0a2d8b0a061f1745dca1 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Mon, 5 Feb 2018 13:06:29 -0500
Subject: [PATCH] Client-format post-merge

---
 client/galaxy/scripts/mvc/collection/collection-model.js | 2 +-
 client/galaxy/scripts/mvc/history/hdca-li-edit.js        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/galaxy/scripts/mvc/collection/collection-model.js b/client/galaxy/scripts/mvc/collection/collection-model.js
index 1550000e94f..fdb00c1760d 100644
--- a/client/galaxy/scripts/mvc/collection/collection-model.js
+++ b/client/galaxy/scripts/mvc/collection/collection-model.js
@@ -288,7 +288,7 @@ var DatasetCollection = Backbone.Model.extend(BASE_MVC.LoggableMixin)
                 if (this.get("deleted")) {
                     return jQuery.when();
                 }
-                options = Utils.merge(options, {"method": "delete"});
+                options = Utils.merge(options, { method: "delete" });
                 return this.save({ deleted: true, recursive: recursive, purge: purge }, options);
             },
             /** save this collection, _Mark_ing it as undeleted */
diff --git a/client/galaxy/scripts/mvc/history/hdca-li-edit.js b/client/galaxy/scripts/mvc/history/hdca-li-edit.js
index 72283944338..5e75398b5d1 100644
--- a/client/galaxy/scripts/mvc/history/hdca-li-edit.js
+++ b/client/galaxy/scripts/mvc/history/hdca-li-edit.js
@@ -35,7 +35,7 @@ var HDCAListItemEdit = _super.extend(
         _renderDeleteButton: function() {
             return $(`
                 <div class="dropdown">
-                    <a class="delete-btn icon-btn" title="${_l('Delete')}" data-toggle="dropdown">
+                    <a class="delete-btn icon-btn" title="${_l("Delete")}" data-toggle="dropdown">
                         <span class="fa fa-times"></span>
                     </a>
                     <ul class="dropdown-menu pull-right" role="menu">
@@ -49,7 +49,7 @@ var HDCAListItemEdit = _super.extend(
                                 ${_l("Delete Datasets")}
                             </a>
                         </li>
-                        <li style="display: ${this.purgeAllowed ? 'inherit' : 'none'}">
+                        <li style="display: ${this.purgeAllowed ? "inherit" : "none"}">
                             <a href="" class="delete-collection-and-purge-datasets">
                                 ${_l("Permanently Delete Datasets")}
                             </a>
@@ -58,7 +58,6 @@ var HDCAListItemEdit = _super.extend(
                 </div>`);
         },
 
-
         // ......................................................................... misc
         events: _.extend(_.clone(_super.prototype.events), {
             "click .delete-collection": function(ev) {