Merge branch 'develop' into stable

1 files changed, 55 insertions, 81 deletions

diff --git a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
index c4a35e96..0c654205 100644
--- a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
+++ b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
@@ -39,11 +39,17 @@ smapi.logParser = function (data, sectionUrl) {
             }
         },
         methods: {
-            toggleLevel: function(id) {
+            toggleLevel: function (id) {
+                if (!data.enableFilters)
+                    return;
+
                 this.showLevels[id] = !this.showLevels[id];
             },
 
             toggleMod: function (id) {
+                if (!data.enableFilters)
+                    return;
+
                 var curShown = this.showMods[id];
 
                 // first filter: only show this by default
@@ -64,6 +70,9 @@ smapi.logParser = function (data, sectionUrl) {
             },
 
             showAllMods: function () {
+                if (!data.enableFilters)
+                    return;
+
                 for (var key in this.showMods) {
                     if (this.showMods.hasOwnProperty(key)) {
                         this.showMods[key] = true;
@@ -73,6 +82,9 @@ smapi.logParser = function (data, sectionUrl) {
             },
 
             hideAllMods: function () {
+                if (!data.enableFilters)
+                    return;
+
                 for (var key in this.showMods) {
                     if (this.showMods.hasOwnProperty(key)) {
                         this.showMods[key] = false;
@@ -90,88 +102,50 @@ smapi.logParser = function (data, sectionUrl) {
     /**********
     ** Upload form
     *********/
-    var error = $("#error");
-    
-    $("#upload-button").on("click", function(e) {
-        e.preventDefault();
-
-        $("#input").val("");
-        $("#popup-upload").fadeIn();
-    });
-
-    var closeUploadPopUp = function() {
-        $("#popup-upload").fadeOut(400);
-    };
-
-    $("#popup-upload").on({
-        'dragover dragenter': function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-        },
-        'drop': function(e) {
-            $("#uploader").attr("data-text", "Reading...");
-            $("#uploader").show();
-            var dataTransfer = e.originalEvent.dataTransfer;
-            if (dataTransfer && dataTransfer.files.length) {
-                e.preventDefault();
-                e.stopPropagation();
-                var file = dataTransfer.files[0];
-                var reader = new FileReader();
-                reader.onload = $.proxy(function(file, $input, event) {
-                    $input.val(event.target.result);
-                    $("#uploader").fadeOut();
-                    $("#submit").click();
-                }, this, file, $("#input"));
-                reader.readAsText(file);
-            }
-        },
-        'click': function(e) {
-            if (e.target.id === "popup-upload")
-                closeUploadPopUp();
+    var input = $("#input");
+    if (input.length) {
+        // get elements
+        var systemOptions = $("input[name='os']");
+        var systemInstructions = $("div[data-os]");
+        var submit = $("#submit");
+
+        // instruction OS chooser
+        var chooseSystem = function() {
+            systemInstructions.hide();
+            systemInstructions.filter("[data-os='" + $("input[name='os']:checked").val() + "']").show();
         }
-    });
-
-    $("#submit").on("click", function() {
-        $("#popup-upload").fadeOut();
-        var paste = $("#input").val();
-        if (paste) {
-            //memory = "";
-            $("#uploader").attr("data-text", "Saving...");
-            $("#uploader").fadeIn();
-            $
-                .ajax({
-                    type: "POST",
-                    url: sectionUrl + "/save",
-                    data: JSON.stringify(paste),
-                    contentType: "application/json" // sent to API
-                })
-                .fail(function(xhr, textStatus) {
-                    $("#uploader").fadeOut();
-                    error.html('<h1>Parsing failed!</h1>Parsing of the log failed, details follow.<br />&nbsp;<p>Stage: Upload</p>Error: ' + textStatus + ': ' + xhr.responseText + "<hr /><pre>" + $("#input").val() + "</pre>");
-                })
-                .then(function(data) {
-                    $("#uploader").fadeOut();
-                    if (!data.success)
-                        error.html('<h1>Parsing failed!</h1>Parsing of the log failed, details follow.<br />&nbsp;<p>Stage: Upload</p>Error: ' + data.error + "<hr /><pre>" + $("#input").val() + "</pre>");
-                    else
-                        location.href = (sectionUrl.replace(/\/$/, "") + "/" + data.id);
-                });
-        } else {
-            alert("Unable to parse log, the input is empty!");
-            $("#uploader").fadeOut();
+        systemOptions.on("click", chooseSystem);
+        chooseSystem();
+
+        // disable submit if it's empty
+        var toggleSubmit = function()
+        {
+            var hasText = !!input.val().trim();
+            submit.prop("disabled", !hasText);
         }
-    });
+        input.on("input", toggleSubmit);
+        toggleSubmit();
 
-    $(document).on("keydown", function(e) {
-        if (e.which === 27) {
-            if ($("#popup-upload").css("display") !== "none" && $("#popup-upload").css("opacity") === 1) {
-                closeUploadPopUp();
+        // drag & drop file
+        input.on({
+            'dragover dragenter': function(e) {
+                e.preventDefault();
+                e.stopPropagation();
+            },
+            'drop': function(e) {
+                var dataTransfer = e.originalEvent.dataTransfer;
+                if (dataTransfer && dataTransfer.files.length) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    var file = dataTransfer.files[0];
+                    var reader = new FileReader();
+                    reader.onload = $.proxy(function(file, $input, event) {
+                        $input.val(event.target.result);
+                        toggleSubmit();
+                    }, this, file, $("#input"));
+                    reader.readAsText(file);
+                }
             }
-        }
-    });
-    $("#cancel").on("click", closeUploadPopUp);
-
-    if (data.showPopup)
-        $("#popup-upload").fadeIn();
-
+        });
+    }
 };