diff --git a/Inquirer.js b/Inquirer.js index ffd8c73..cd81fb3 100644 --- a/Inquirer.js +++ b/Inquirer.js @@ -24,7 +24,7 @@ var icon = "data:image/gif;base64,R0lGODlhIAAgAKECADIyMjMzM////////yH5BAEKAAIALAAAAAAgACAAAAJulI8Zke2PFoC0LlZzW7qf633XGGHeiJqcaKWgsQov5JLvTNeYq+kM36vBUJNgaujDiVDIpLK58ylIiiU0NjWVZscHgAuUUXPOpfbhjD1bwmFIrHsvv+3Qrd4Byzda7N7h9zclmEOIFmgolgj4VgAAOw==", // bugico = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAAWlBMVEUkJSMuMC01NzQ+Pz1HSEZPUU5YWldfYV5pa2h6e3iOkI2YmpeipKGpq6ifwFWqxma4urezzHa50YHJy8jC1pLL3aLS4K3a3NnZ5rvo6+fn8NXv8+L19/D9//y9fxQqAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB+EBBAwFN28edE4AAABVaVRYdENvbW1lbnQAAAAAAENvcHlyaWdodCBJTkNPUlMgR21iSCAod3d3Lmljb25leHBlcmllbmNlLmNvbSkgLSBVbmxpY2Vuc2VkIHByZXZpZXcgaW1hZ2VYrophAAAC6UlEQVRYw+2X2barIAxA0U5qK2jFAor//5uXSUUS2q5z1n07vNhC2JCYSbL8cpA/wAeAGswQPwc0xI3qO4BWcPVs95/gvNYQIAhpgGBtATcw3RLSpgBtRYdU8oLeQNhZlQCUnazDny7YrfM2uK8Hh+fDTopUBavuOfwuH+4xlB5QdP5vEU69xdfaAMOONT8fQg012UY1CNGuV1HxraK3UGw6XEhm+BveYw0igNWh3OyJD6fD1WqF+EG7glUeYJdFEWsQe6I1WTG8BdjVMn6JB8DNvXTjY12R2X9HnDMCqNPqSxmCebl6UWatFHgwmdtdl4XzoGcyrHav3rp3IXLRqEq9SEqf5qQq3X8xao+UjstyEvlwNgZglNLePMX9FJ1e203cLDEn9CYfvKgdTLqgaWsDKa6NM4xkbol/SCheyiBek4+8zh04yz4sUP0WMNN9sHHywrNk0bR8C+jpYbDcXBZAEWGWTM5vAHMiSzGAzAH8i4aAdM46GgSI7lrAw5zJKdSrvLRJSmtc9tWprNUXm6z3akH29N0sE5CdELsYI7hse90BPvt1OABOjiFlXFeA338WNpCgxSGAL9qnzUo7gK+ANp+Cl0BfC0J9bmXTEEioHi4fc+S2GUAgNAZQ7zWJI7cN8QkAPrvfDGDYaxrHZMcMwFW4u7VBV3fBKaBs/wZgNrZJLEB1WUavTDBN3wFeWcD8HUDmwxkDPCkWYWg4KyjMQEKyhtVoYVGnFhoBA0hTdwQEmLJUwYTA0BzRuDKVAEzRNS2M/AwYF20KX6HTjBQcugc5jYELtD74j4C1b5kBAGaIQ0dHou7ihnhjCuBrAiqOABHqPwiIWSNePEQ6kEgDhYTUNCNRoEmaVF3jsvXEcSmU0zG97D10GQOcBu3eJjAMwOZjt9ylAIEF9ktiMWg9IbTmZLvT/dirhI08ZLTx2BaYNqxKHAl+2EgbWtyatJcafAyJbz555rHvOePTb77atP77cv3/gH8Wkk7NciByTQAAAABJRU5ErkJggg==", // - VERSION = "0.7"; // + VERSION = "0.7c"; // // Locals var inq = this, inqapp; @@ -89,7 +89,10 @@ getApp().showError(obj); return false; } - a.appendChild(document.createTextNode(obj)); + if (obj instanceof Error) + a.appendChild(document.createTextNode(obj)); + else + a.appendChild(document.createTextNode(obj.message)); a.style.merge({ color: "black", textDecoration: "none" @@ -99,6 +102,9 @@ // Methods function getApp() { + var + win_err_width = 400, + win_err_height = 150; if (!inqapp) inqapp = merger.app("inquirer", { title: "Inquirer", @@ -146,8 +152,8 @@ ], windows: [merger.ui.window("Wmain", { title: "Error", - width: 400, - height: 250, + width: win_err_width, + height: win_err_height, visible: false, content: [merger.ui.picture("Iico", { src: bugico, @@ -159,15 +165,15 @@ merger.ui.label("Lerror", { top: 0, left: 37, - width: 400 - 37, + width: win_err_width - 37, height: 32, text: "", }), merger.ui.label("Tinfo", { top: 37, left: -5, - width: 400, - height: 250 - 37 - 25 - 10, + width: win_err_width, + height: win_err_height - 37 - 25 - 10, multiple: true, style: { whiteSpace: "pre", @@ -179,8 +185,8 @@ }, }), merger.ui.button("Bok", { - top: 250 - 20, - left: 400 - 35, + top: win_err_height - 20, + left: win_err_width - 35, width: 35, height: 20, text: "Ok", @@ -319,7 +325,6 @@ break; case 'e': d.appendChild(errorLink(object)); - //d.innerText = object; head.appendChild(document.createTextNode("!")); head.style.color = "#F88"; d.style.background = "#FEE"; @@ -367,7 +372,7 @@ if (err instanceof Error) { this.windows.Wmain.setError(err.message, err.stack); } else { - this.windows.Wmain.setError(err.message, JSON.stringify(err, null, 2)); + this.windows.Wmain.setError(err.message, "File: " + err.source + "\r\n\r\nAt: " + err.at); } this.windows.Wmain.show(); }, diff --git a/WebInquirer.html b/WebInquirer.html index 7842f29..27c7221 100644 --- a/WebInquirer.html +++ b/WebInquirer.html @@ -1,5 +1,4 @@ - inquirer Tester