From 7a6877e709cc3681eed96d87711c03f957e0f5dc Mon Sep 17 00:00:00 2001
From: electr0sheep <electr0sheep@electr0sheep.com>
Date: Thu, 22 Feb 2018 01:09:59 -0700
Subject: [PATCH] updated to reflect PR on OctoPrint

---
 octoprint_customControl/static/js/customControl.js       | 4 ++--
 octoprint_customControl/static/js/customControlDialog.js | 6 +++---
 .../templates/customControl_hookedsettings.jinja2        | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/octoprint_customControl/static/js/customControl.js b/octoprint_customControl/static/js/customControl.js
index aaa57b1..0dcf6d1 100644
--- a/octoprint_customControl/static/js/customControl.js
+++ b/octoprint_customControl/static/js/customControl.js
@@ -231,7 +231,7 @@
             }
 
             control.name = ko.observable(control.name || "");
-            control.style = ko.observable(control.style || "");
+            control.customClass = ko.observable(control.customClass || "");
 
             control.width = ko.observable(control.hasOwnProperty("width") ? control.width : "2");
             control.offset = ko.observable(control.hasOwnProperty("offset") ? control.offset : "");
@@ -321,7 +321,7 @@
               return;
           }
 
-          element.style("btn " + style);
+          element.customClass("btn " + style);
         }
         self.deleteElement = function (invokedOn, contextParent, selectedMenu) {
             var element = self.searchElement(self.controlsFromServer, contextParent.attr('id'));
diff --git a/octoprint_customControl/static/js/customControlDialog.js b/octoprint_customControl/static/js/customControlDialog.js
index d5ecd1d..e2e8b8f 100644
--- a/octoprint_customControl/static/js/customControlDialog.js
+++ b/octoprint_customControl/static/js/customControlDialog.js
@@ -59,7 +59,7 @@
         self.reset = function (data) {
             var element = {
                 name: undefined,
-                style: "",
+                cusotmClass: "",
                 collapsed: false,
                 commands: "",
                 confirm: "",
@@ -106,7 +106,7 @@
                     }
                     case "command": {
                         el.name = obj.name;
-                        el.style = "btn";
+                        el.customClass = "btn";
                         if (obj.commands.indexOf('\n') == -1)
                             el.command = obj.commands;
                         else
@@ -167,7 +167,7 @@
                     case "script":
                         {
                             el.name = obj.name;
-                            el.style = "btn";
+                            el.customClass = "btn";
                             el.script = obj.script;
 
                             if (self.useConfirm()) {
diff --git a/octoprint_customControl/templates/customControl_hookedsettings.jinja2 b/octoprint_customControl/templates/customControl_hookedsettings.jinja2
index 2f7727e..62600d2 100644
--- a/octoprint_customControl/templates/customControl_hookedsettings.jinja2
+++ b/octoprint_customControl/templates/customControl_hookedsettings.jinja2
@@ -86,10 +86,9 @@
 </script>
 <script type="text/html" id="settingsCustomControls_controlTemplate">
     <form class="form-inline custom_control" style="min-height:15px; border:1px dotted #000000" data-bind="contextMenu: { menuSelector: '#commandContextMenu', menuSelected: $root.controlContextMenu }, css: { 'sortable': $parent.layout() != 'horizontal_grid' }, attr: { 'id': id }">
-				<div data-bind="text: console.log($data)"></div>
         <!-- ko template: { name: 'settingsCustomControls_controlTemplate_input', data: $data, if: $data.hasOwnProperty('input') } --><!-- /ko -->
-				<!-- ko template: { name: 'settingsCustomControls_controlTemplate_command', data: $data, if: !$data.hasOwnProperty('style') && ($data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript')) } --><!-- /ko -->
-        <!-- ko template: { name: 'settingsCustomControls_controlTemplate_command_styled', data: $data, if: $data.hasOwnProperty('style') && ($data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript')) } --><!-- /ko -->
+				<!-- ko template: { name: 'settingsCustomControls_controlTemplate_command', data: $data, if: !$data.hasOwnProperty('customClass') && ($data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript')) } --><!-- /ko -->
+        <!-- ko template: { name: 'settingsCustomControls_controlTemplate_command_customClass', data: $data, if: $data.hasOwnProperty('customClass') && ($data.hasOwnProperty('command') || $data.hasOwnProperty('commands') || $data.hasOwnProperty('script') || $data.hasOwnProperty('javascript')) } --><!-- /ko -->
         <!-- ko template: { name: 'settingsCustomControls_controlTemplate_output', data: $data, if: $data.hasOwnProperty('value') } --><!-- /ko -->
     </form>
 </script>
@@ -110,7 +109,7 @@
 <script type="text/html" id="settingsCustomControls_controlTemplate_command">
     <button class="btn" data-bind="text: name" onclick="event.preventDefault()"></button>
 </script>
-<script type="text/html" id="settingsCustomControls_controlTemplate_command_styled">
-    <button data-bind="text: name, attr: { 'class': style }" onclick="event.preventDefault()"></button>
+<script type="text/html" id="settingsCustomControls_controlTemplate_command_customClass">
+    <button data-bind="text: name, attr: { 'class': customClass }" onclick="event.preventDefault()"></button>
 </script>
 <!-- End of templates for custom controls -->