diff --git a/bookmarklet.js b/bookmarklet.js index 3477d46..245c6df 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -6,7 +6,7 @@ // YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard var global = {}; - global.version = "4.3.2"; + global.version = "4.3.3"; global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer"; global.isDev = document.currentScript == null; global.isProd = !global.isDev; @@ -91,7 +91,8 @@ var settings = global.settings; // restore UI state - jQuery("#font-scale-range").val(settings.scale); + jQuery("#scaleRange").val(settings.scale); + jQuery("#scaleRange").parent().find("output").val(settings.scale); jQuery("#rowCount").val(settings.rowCount); jQuery("#columnCount").val(settings.colCount); @@ -152,18 +153,19 @@ function saveSettings(){ var settings = global.settings; + writeCookie("card_printer_scale", settings.scale); + writeCookie("card_printer_row_count", settings.rowCount); + writeCookie("card_printer_column_count", settings.colCount); + writeCookie("card_printer_single_card_page", settings.singleCardPage); writeCookie("card_printer_hide_description", settings.hideDescription); writeCookie("card_printer_hide_assignee", settings.hideAssignee); writeCookie("card_printer_hide_due_date", settings.hideDueDate); - writeCookie("card_printer_font_scale", settings.scale); - writeCookie("card_printer_row_count", settings.rowCount); - writeCookie("card_printer_column_count", settings.colCount); } function loadSettings(){ var settings = global.settings = global.settings || {}; - settings.scale = parseFloat(readCookie("card_printer_font_scale")) || 1.0; + settings.scale = parseFloat(readCookie("card_printer_scale")) || 1.0; settings.rowCount = parseInt(readCookie("card_printer_row_count2")) || 2; settings.colCount = parseInt(readCookie("card_printer_column_count")) || 1; @@ -354,11 +356,12 @@ var settings = global.settings; + var scaleValue = settings.scale * 2.0; var scaleRoot; - if(settings.scale < 0) { - scaleRoot = 1.0 / (1.0 - (settings.scale * 2.0)); + if(scaleValue < 0) { + scaleRoot = 1.0 / (1.0 - scaleValue); } else { - scaleRoot = 1.0 * (1.0 + (settings.scale * 2.0)); + scaleRoot = 1.0 * (1.0 + scaleValue); } var rowCount = settings.rowCount; @@ -385,9 +388,6 @@ var scaleHeight = cardMaxHeight / cardMinHeight ; var scale = Math.min(scaleWidth, scaleHeight, 1); - console.log("scaleRoot: " + scaleRoot + " scale: " + scale); - console.log("scaleWidth: " + scaleWidth + " scaleHeight: " + scaleHeight); - // scale jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm"); @@ -493,7 +493,7 @@ // scale font - result.find("#font-scale-range").on("input", function() { + result.find("#scaleRange").on("input", function() { global.settings.scale = jQuery(this).val(); saveSettings(); redrawCards(); diff --git a/printPreview.html b/printPreview.html index b59d8f5..d5c2aeb 100644 --- a/printPreview.html +++ b/printPreview.html @@ -18,7 +18,11 @@
x
Page Grid
-
Scale
+
+
+ + Scale
+
Single Card Per Page
Hide Description
Hide Assignee