From 752a42915e387bd0d818012ae0e9cee904307224 Mon Sep 17 00:00:00 2001
From: Philipp Engel <philipp@filzip.com>
Date: Mon, 24 Nov 2014 11:44:39 +0100
Subject: [PATCH] removed extra javascript file small change to the index file

---
 .../static/js/vectorgraphicsconversion.js     | 153 ------------------
 src/octoprint/templates/index.jinja2          |   2 +-
 2 files changed, 1 insertion(+), 154 deletions(-)
 delete mode 100644 src/octoprint/plugins/svgtogcode/static/js/vectorgraphicsconversion.js

diff --git a/src/octoprint/plugins/svgtogcode/static/js/vectorgraphicsconversion.js b/src/octoprint/plugins/svgtogcode/static/js/vectorgraphicsconversion.js
deleted file mode 100644
index 2184adda..00000000
--- a/src/octoprint/plugins/svgtogcode/static/js/vectorgraphicsconversion.js
+++ /dev/null
@@ -1,153 +0,0 @@
-$(function() {
-function VectorGraphicsConversionViewModel(loginStateViewModel) {
-    var self = this;
-
-    self.loginState = loginStateViewModel;
-
-    self.target = undefined;
-    self.file = undefined;
-    self.data = undefined;
-
-    self.defaultSlicer = undefined;
-    self.defaultProfile = undefined;
-
-    self.gcodeFilename = ko.observable();
-
-    self.title = ko.observable();
-    self.slicer = ko.observable();
-    self.slicers = ko.observableArray();
-    self.profile = ko.observable();
-    self.profiles = ko.observableArray();
-
-    self.show = function(target, file) {
-        self.target = target;
-        self.file = file;
-        self.title(_.sprintf(gettext("Convert %(filename)s"), {filename: self.file}));
-        self.gcodeFilename(self.file.substr(0, self.file.lastIndexOf(".")));
-        $("#slicing_configuration_dialog").modal("show");
-    };
-
-    self.slicer.subscribe(function(newValue) {
-        self.profilesForSlicer(newValue);
-    });
-
-    self.enableSliceButton = ko.computed(function() {
-        return self.gcodeFilename() != undefined
-            && self.gcodeFilename().trim() != ""
-            && self.slicer() != undefined
-            && self.profile() != undefined;
-    });
-
-    self.requestData = function() {
-        $.ajax({
-            url: API_BASEURL + "slicing",
-            type: "GET",
-            dataType: "json",
-            success: self.fromResponse
-        })
-    };
-
-    self.fromResponse = function(data) {
-        self.data = data;
-
-        var selectedSlicer = undefined;
-        self.slicers.removeAll();
-        _.each(_.values(data), function(slicer) {
-            var name = slicer.displayName;
-            if (name == undefined) {
-                name = slicer.key;
-            }
-
-            if (slicer.default) {
-                selectedSlicer = slicer.key;
-            }
-
-            self.slicers.push({
-                key: slicer.key,
-                name: name
-            });
-        });
-
-        if (selectedSlicer != undefined) {
-            self.slicer(selectedSlicer);
-        }
-
-        self.defaultSlicer = selectedSlicer;
-    };
-
-    self.profilesForSlicer = function(key) {
-        if (key == undefined) {
-            key = self.slicer();
-        }
-        if (key == undefined || !self.data.hasOwnProperty(key)) {
-            return;
-        }
-        var slicer = self.data[key];
-
-        var selectedProfile = undefined;
-        self.profiles.removeAll();
-        _.each(_.values(slicer.profiles), function(profile) {
-            var name = profile.displayName;
-            if (name == undefined) {
-                name = profile.key;
-            }
-
-            if (profile.default) {
-                selectedProfile = profile.key;
-            }
-
-            self.profiles.push({
-                key: profile.key,
-                name: name
-            })
-        });
-
-        if (selectedProfile != undefined) {
-            self.profile(selectedProfile);
-        }
-
-        self.defaultProfile = selectedProfile;
-    };
-
-    self.slice = function() {
-        var gcodeFilename = self._sanitize(self.gcodeFilename());
-        if (!_.endsWith(gcodeFilename.toLowerCase(), ".gco")
-            && !_.endsWith(gcodeFilename.toLowerCase(), ".gcode")
-            && !_.endsWith(gcodeFilename.toLowerCase(), ".g")) {
-            gcodeFilename = gcodeFilename + ".gco";
-        }
-
-        var data = {
-            command: "slice",
-            slicer: self.slicer(),
-            profile: self.profile(),
-            gcode: gcodeFilename
-        };
-
-        $.ajax({
-            url: API_BASEURL + "files/" + self.target + "/" + self.file,
-            type: "POST",
-            dataType: "json",
-            contentType: "application/json; charset=UTF-8",
-            data: JSON.stringify(data)
-        });
-
-        $("#slicing_configuration_dialog").modal("hide");
-
-        self.gcodeFilename(undefined);
-        self.slicer(self.defaultSlicer);
-        self.profile(self.defaultProfile);
-    };
-
-    self._sanitize = function(name) {
-        return name.replace(/[^a-zA-Z0-9\-_\.\(\) ]/g, "").replace(/ /g, "_");
-    };
-
-    self.onStartup = function() {
-        self.requestData();
-    };
-}
-
-    ADDITIONAL_VIEWMODELS.push([VectorGraphicsConversionViewModel, ["loginStateViewModel", "settingsViewModel", "slicingViewModel"], document.getElementById("dialog_vector_graphics_conversion")]);
-
-});
\ No newline at end of file
diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index 7a2cf6cd..6aefed58 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -247,7 +247,7 @@
                                         <div class="size">{{ _('Size') }}: <span data-bind="text: formatSize(size)"></span></div>
                                         <div class="btn-group action-buttons">
                                             <div class="btn btn-mini" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i></div>
-                                            <div class="btn btn-mini"  data-bind="click: function() { if ($root.enableSVGConversion($data)) { $root.convertSVG($data); } else { return; } }, css: {disabled: !$root.enableSVGConversion($data)}"><i class="icon-print" title="{{ _('Convert to Laserpath') }}"></i></div>
+                                            <div class="btn btn-mini"  data-bind="click: function() { $root.convertSVG2($data);  }, css: {disabled: !$root.enableSVGConversion($data)}"><i class="icon-print" title="{{ _('Convert to Laserpath') }}"></i></div>
                                         </div>
                                     </script>