From ef14a002785ddf7087e369b49be8c779d93ba17c Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Mon, 30 Nov 2015 13:26:37 +0100 Subject: [PATCH 1/6] no message --- bookmarklet.js | 16 +++++++--------- printPreview.html | 6 +++++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index 3477d46..8f1f4ef 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -91,7 +91,7 @@ var settings = global.settings; // restore UI state - jQuery("#font-scale-range").val(settings.scale); + jQuery("#fscaleRange").val(settings.scale); jQuery("#rowCount").val(settings.rowCount); jQuery("#columnCount").val(settings.colCount); @@ -152,18 +152,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; @@ -385,9 +386,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 +491,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..e023a43 100644 --- a/printPreview.html +++ b/printPreview.html @@ -18,7 +18,11 @@
x
Page Grid
-
Scale
+
+
+ + 0.0 Scale
+
Single Card Per Page
Hide Description
Hide Assignee
From 93ef4d4e3964d65460142497001b50ddc29933d7 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Mon, 30 Nov 2015 13:29:00 +0100 Subject: [PATCH 2/6] no message --- bookmarklet.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index 8f1f4ef..567f37d 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -355,11 +355,12 @@ var settings = global.settings; + var scaleValue = settings.scale * scaleRange; 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; From d63dd05877ddef8fea80f0dbc3db90207d5d3e8c Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Mon, 30 Nov 2015 13:31:06 +0100 Subject: [PATCH 3/6] no message --- bookmarklet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookmarklet.js b/bookmarklet.js index 567f37d..3426598 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -355,7 +355,7 @@ var settings = global.settings; - var scaleValue = settings.scale * scaleRange; + var scaleValue = settings.scale * 2.0; var scaleRoot; if(scaleValue < 0) { scaleRoot = 1.0 / (1.0 - scaleValue); From 6fdb2d993c80633da12c4f9ade3d14ca366e783c Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Mon, 30 Nov 2015 15:27:41 +0100 Subject: [PATCH 4/6] no message --- bookmarklet.js | 2 +- printPreview.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index 3426598..b74bc8a 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -91,7 +91,7 @@ var settings = global.settings; // restore UI state - jQuery("#fscaleRange").val(settings.scale); + jQuery("#scaleRange").val(settings.scale); jQuery("#rowCount").val(settings.rowCount); jQuery("#columnCount").val(settings.colCount); diff --git a/printPreview.html b/printPreview.html index e023a43..0bafa4c 100644 --- a/printPreview.html +++ b/printPreview.html @@ -19,9 +19,9 @@
Page Grid
-
+ - 0.0 Scale
+ Scale
Single Card Per Page
Hide Description
From b1d2a11b93d4f2e8e20b4a26d5898c386011cae5 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Mon, 30 Nov 2015 15:53:50 +0100 Subject: [PATCH 5/6] no message --- bookmarklet.js | 3 ++- printPreview.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index b74bc8a..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; @@ -92,6 +92,7 @@ // restore UI state jQuery("#scaleRange").val(settings.scale); + jQuery("#scaleRange").parent().find("output").val(settings.scale); jQuery("#rowCount").val(settings.rowCount); jQuery("#columnCount").val(settings.colCount); diff --git a/printPreview.html b/printPreview.html index 0bafa4c..1f6277a 100644 --- a/printPreview.html +++ b/printPreview.html @@ -19,7 +19,7 @@
Page Grid
-
+ Scale
From 20d4a0cb9f3e01243c2537b113c9c083d6385f8f Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Mon, 30 Nov 2015 15:58:25 +0100 Subject: [PATCH 6/6] no message --- printPreview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/printPreview.html b/printPreview.html index 1f6277a..d5c2aeb 100644 --- a/printPreview.html +++ b/printPreview.html @@ -19,7 +19,7 @@
Page Grid
-
+ Scale