From aad3502853e46a8da90fc751637a65bf1fcfeeb6 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 2 Aug 2009 02:13:01 +0200 Subject: [PATCH] re-indent drawLine(), only care about mouse-up if zoomstart is set, do some var->let conversion --- .../chrome/mandelbrot/content/mandelbrot.js | 109 +++++++++--------- 1 file changed, 53 insertions(+), 56 deletions(-) diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.js b/xulapp/chrome/mandelbrot/content/mandelbrot.js index 1ead31e..f698d45 100644 --- a/xulapp/chrome/mandelbrot/content/mandelbrot.js +++ b/xulapp/chrome/mandelbrot/content/mandelbrot.js @@ -120,27 +120,27 @@ function drawImage() { } function drawLine(line, dimensions, canvas, context, iterMax, algorithm) { - let Cr_min = dimensions[0]; - let Cr_max = dimensions[1]; - let Cr_scale = Cr_max - Cr_min; - - let Ci_min = dimensions[2]; - let Ci_max = dimensions[3]; - let Ci_scale = Ci_max - Ci_min; - - let pixels = []; - for (var img_y = line; img_y < canvas.height && img_y < line+8; img_y++) - for (let img_x = 0; img_x < canvas.width; img_x++) { - let C = new complex(Cr_min + (img_x / canvas.width) * Cr_scale, - Ci_min + (img_y / canvas.height) * Ci_scale); - pixels.push.apply(pixels, drawPoint(context, img_x, img_y, C, iterMax, algorithm)); - } - context.putImageData({width: canvas.width, height: pixels.length/4/canvas.width, data: pixels}, 0, line); + let Cr_min = dimensions[0]; + let Cr_max = dimensions[1]; + let Cr_scale = Cr_max - Cr_min; + + let Ci_min = dimensions[2]; + let Ci_max = dimensions[3]; + let Ci_scale = Ci_max - Ci_min; + + let pixels = []; + for (var img_y = line; img_y < canvas.height && img_y < line+8; img_y++) + for (let img_x = 0; img_x < canvas.width; img_x++) { + let C = new complex(Cr_min + (img_x / canvas.width) * Cr_scale, + Ci_min + (img_y / canvas.height) * Ci_scale); + pixels.push.apply(pixels, drawPoint(context, img_x, img_y, C, iterMax, algorithm)); + } + context.putImageData({width: canvas.width, height: pixels.length/4/canvas.width, data: pixels}, 0, line); - if (img_y < canvas.height) - setTimeout(drawLine, 0, img_y, dimensions, canvas, context, iterMax, algorithm); - else if (gStartTime) - EndCalc(); + if (img_y < canvas.height) + setTimeout(drawLine, 0, img_y, dimensions, canvas, context, iterMax, algorithm); + else if (gStartTime) + EndCalc(); } function EndCalc() { @@ -353,10 +353,10 @@ function mouseevent(etype, event) { y: event.clientY - canvas.offsetTop}; break; case 'up': - if (event.button == 0) { - var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] + if (event.button == 0 && zoomstart) { + let prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); - var ok = prompts.confirm(null, gMbrotBundle.getString("zoomConfirmTitle"), + let ok = prompts.confirm(null, gMbrotBundle.getString("zoomConfirmTitle"), gMbrotBundle.getString("zoomConfirmLabel") + ' --- ' + zoomstart.x + ',' + zoomstart.y + '-' + (event.clientX - canvas.offsetLeft) + ',' + @@ -370,18 +370,18 @@ function mouseevent(etype, event) { function saveImage() { const nsIFilePicker = Components.interfaces.nsIFilePicker; - var fp = null; + let fp = null; try { fp = Components.classes["@mozilla.org/filepicker;1"] .createInstance(nsIFilePicker); } catch (e) {} if (!fp) return; - var promptString = gMbrotBundle.getString("savePrompt"); + let promptString = gMbrotBundle.getString("savePrompt"); fp.init(window, promptString, nsIFilePicker.modeSave); fp.appendFilter(gMbrotBundle.getString("pngFilterName"), "*.png"); fp.defaultString = "mandelbrot.png"; - var fpResult = fp.show(); + let fpResult = fp.show(); if (fpResult != nsIFilePicker.returnCancel) { saveCanvas(document.getElementById("mbrotImage"), fp.file); } @@ -395,17 +395,17 @@ function updateBookmarkMenu(aParent) { aParent.lastChild.id != 'bookmarkSeparator') aParent.removeChild(aParent.lastChild); - var file = Components.classes["@mozilla.org/file/directory_service;1"] + let file = Components.classes["@mozilla.org/file/directory_service;1"] .getService(Components.interfaces.nsIProperties) .get("ProfD", Components.interfaces.nsIFile); file.append("mandelbookmarks.sqlite"); if (file.exists()) { - var connection = Components.classes["@mozilla.org/storage/service;1"] + let connection = Components.classes["@mozilla.org/storage/service;1"] .getService(Components.interfaces.mozIStorageService) .openDatabase(file); try { if (connection.tableExists("bookmarks")) { - var statement = connection.createStatement( + let statement = connection.createStatement( "SELECT name FROM bookmarks ORDER BY ROWID DESC"); while (statement.executeStep()) aParent.appendChild(document.createElement("menuitem")) @@ -419,7 +419,7 @@ function updateBookmarkMenu(aParent) { } } // Create the "Nothing Available" Menu item and disable it. - var na = aParent.appendChild(document.createElement("menuitem")); + let na = aParent.appendChild(document.createElement("menuitem")); na.setAttribute("label", gMbrotBundle.getString("noBookmarks")); na.setAttribute("disabled", "true"); } @@ -429,22 +429,22 @@ function callBookmark(evtarget) { function saveBookmark() { // retrieve wanted bookmark name with a prompt - var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] + let prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); - var input = {value: ""}; // empty default value - var ok = prompts.prompt(null, gMbrotBundle.getString("saveBookmarkTitle"), gMbrotBundle.getString("saveBookmarkLabel"), input, null, {}); + let input = {value: ""}; // empty default value + let ok = prompts.prompt(null, gMbrotBundle.getString("saveBookmarkTitle"), gMbrotBundle.getString("saveBookmarkLabel"), input, null, {}); // ok is true if OK is pressed, false if Cancel. input.value holds the value of the edit field if "OK" was pressed. if (!ok || !input.value) return - var bmName = input.value; + let bmName = input.value; // Open or create the bookmarks database. - var file = Components.classes["@mozilla.org/file/directory_service;1"] + let file = Components.classes["@mozilla.org/file/directory_service;1"] .getService(Components.interfaces.nsIProperties) .get("ProfD", Components.interfaces.nsIFile); file.append("mandelbookmarks.sqlite"); - var connection = Components.classes["@mozilla.org/storage/service;1"] + let connection = Components.classes["@mozilla.org/storage/service;1"] .getService(Components.interfaces.mozIStorageService) .openDatabase(file); connection.beginTransaction(); @@ -456,7 +456,7 @@ function saveBookmark() { // TEXT. The value is a text string, stored using the database encoding (UTF-8, UTF-16BE or UTF-16-LE). // Put value of the current image into the bookmarks table - var statement = connection.createStatement( + let statement = connection.createStatement( "INSERT INTO bookmarks (name,iteration_max,Cr_min,Cr_max,Ci_min,Ci_max) VALUES (?1,?2,?3,?4,?5,?6)"); statement.bindStringParameter(0, bmName); statement.bindStringParameter(1, gPref.getIntPref("mandelbrot.iteration_max")); @@ -471,19 +471,18 @@ function saveBookmark() { } function updateIterMenu() { + let currentIter = 0; try { - var currentIter = gPref.getIntPref("mandelbrot.iteration_max"); - } - catch(e) { - var currentIter = 0; + currentIter = gPref.getIntPref("mandelbrot.iteration_max"); } + catch(e) { } if (currentIter < 10) { currentIter = 500; setIter(currentIter); } - var popup = document.getElementById("menu_iterPopup"); - var item = popup.firstChild; + let popup = document.getElementById("menu_iterPopup"); + let item = popup.firstChild; while (item) { if (item.getAttribute("name") == "iter") { if (item.getAttribute("value") == currentIter) @@ -500,12 +499,11 @@ function setIter(aIter) { } function updatePaletteMenu() { + let currentPalette = ''; try { - var currentPalette = gPref.getCharPref("mandelbrot.color_palette"); - } - catch(e) { - var currentPalette = ''; + currentPalette = gPref.getCharPref("mandelbrot.color_palette"); } + catch(e) { } if (!currentPalette.length) { currentPalette = 'kairo'; setPalette(currentPalette); @@ -513,8 +511,8 @@ function updatePaletteMenu() { if (!gColorPalette || !gColorPalette.length) gColorPalette = getColorPalette(currentPalette); - var popup = document.getElementById("menu_palettePopup"); - var item = popup.firstChild; + let popup = document.getElementById("menu_palettePopup"); + let item = popup.firstChild; while (item) { if (item.getAttribute("name") == "palette") { if (item.getAttribute("value") == currentPalette) @@ -547,19 +545,18 @@ function toggleJITState(jitMenuItem) { } function updateAlgoMenu() { + let currentAlgo = ''; try { - var currentAlgo = gPref.getCharPref("mandelbrot.use_algorithm"); - } - catch(e) { - var currentAlgo = ''; + currentAlgo = gPref.getCharPref("mandelbrot.use_algorithm"); } + catch(e) { } if (!currentAlgo.length) { currentAlgo = 'numeric'; setAlgorithm(currentAlgo); } - var popup = document.getElementById("menu_algoPopup"); - var item = popup.firstChild; + let popup = document.getElementById("menu_algoPopup"); + let item = popup.firstChild; while (item) { if (item.getAttribute("name") == "algorithm") { if (item.getAttribute("value") == currentAlgo) @@ -576,7 +573,7 @@ function setAlgorithm(algoID) { } function addonsManager(aPane) { - var theEM = Components.classes["@mozilla.org/appshell/window-mediator;1"] + let theEM = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator) .getMostRecentWindow("Extension:Manager"); if (theEM) { -- 2.43.0