From 42e11acb4431984f8e0f7fb97aefddc54d24c859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 1 Sep 2015 09:41:30 +0200 Subject: [PATCH] Fixed a merge error --- .../static/js/softwareupdate.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index 5f0e2f18..a018f688 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -146,25 +146,6 @@ $(function() { } } - var octoprint = data.information["octoprint"]; - if (octoprint && octoprint.hasOwnProperty("check")) { - var check = octoprint.check; - if (BRANCH != "master" && check["type"] == "github_release") { - self.octoprintUnreleased(true); - } else { - self.octoprintUnreleased(false); - } - - var checkoutFolder = (check["checkout_folder"] || "").trim(); - var updateFolder = (check["update_folder"] || "").trim(); - var checkType = check["type"] || ""; - if ((checkType == "github_release" || checkType == "git_commit") && checkoutFolder == "" && updateFolder == "") { - self.octoprintUnconfigured(true); - } else { - self.octoprintUnconfigured(false); - } - } - if (data.status == "updateAvailable" || data.status == "updatePossible") { var text = gettext("There are updates available for the following components:");