From: Robert Konigsberg Date: Mon, 31 Dec 2012 17:10:03 +0000 (-0500) Subject: The "to hash" textbox now accepts changes in the palette. X-Git-Tag: v1.0.0~131^2~4 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=3a8c1a190774a9633eca452be49448f006b2cc53;p=dygraphs.git The "to hash" textbox now accepts changes in the palette. --- diff --git a/experimental/palette/multi-palette.js b/experimental/palette/multi-palette.js index 2307030..ee01a4c 100644 --- a/experimental/palette/multi-palette.js +++ b/experimental/palette/multi-palette.js @@ -130,49 +130,62 @@ MultiPalette.prototype.activate = function(key) { MultiPalette.prototype.showHash = function() { var hash = this.read(); var textarea = new TextArea(); - textarea.cancel.style.display = "none"; - - /* - * JSON.stringify isn't built to be nice to functions. The following fixes - * this. - * - * First, val.toString only does part of the work, turning it into - * "function () {\n alert(\"p-click!\");\n}", - * - * {start,end}Marker make the surrounding quotes easy to find, and then - * remove them. It also converts the instances of \n and \" so the - * result looks like: - * function () { - * alert("p-click!"); - * }", - */ - var startMarker = "<~%!<"; - var endMarker = ">!%~>"; - var replacer = function(key, val) { - if (typeof val === 'function') { - return startMarker + val.toString() + endMarker; - } - return val; - } - var text = JSON.stringify(hash, replacer, 2); - while(true) { - var start = text.indexOf(startMarker); - var end = text.indexOf(endMarker); - if (start == -1) { - break; - } - var substring = text.substring(start + startMarker.length, end); - while(substring.indexOf("\\n") >= 0) { - substring = substring.replace("\\n", "\n"); + + var hashToString = function(hash) { + /* + * JSON.stringify isn't built to be nice to functions. The following fixes + * this. + * + * First, val.toString only does part of the work, turning it into + * "function () {\n alert(\"p-click!\");\n}", + * + * {start,end}Marker make the surrounding quotes easy to find, and then + * remove them. It also converts the instances of \n and \" so the + * result looks like: + * function () { + * alert("p-click!"); + * }", + */ + var startMarker = "<~%!<"; + var endMarker = ">!%~>"; + var replacer = function(key, val) { + if (typeof val === 'function') { + return startMarker + val.toString() + endMarker; + } + return val; } - while(substring.indexOf("\\\"") >= 0) { - substring = substring.replace("\\\"", "\""); + var text = JSON.stringify(hash, replacer, 2); + while(true) { + var start = text.indexOf(startMarker); + var end = text.indexOf(endMarker); + if (start == -1) { + break; + } + var substring = text.substring(start + startMarker.length, end); + while(substring.indexOf("\\n") >= 0) { + substring = substring.replace("\\n", "\n"); + } + while(substring.indexOf("\\\"") >= 0) { + substring = substring.replace("\\\"", "\""); + } + text = text.substring(0, start - 1) + + substring + + text.substring(end + endMarker.length + 1); } - text = text.substring(0, start - 1) - + substring - + text.substring(end + endMarker.length + 1); + return text; } + + var text = hashToString(hash); + var self = this; textarea.show("options", text); + textarea.okCallback = function(value) { + if (value != text) { + var newHash; + eval("newHash = " + value + ";"); + self.write(newHash); + self.onchange(); + } + }; } /** diff --git a/experimental/palette/palette.js b/experimental/palette/palette.js index d98ab15..514463f 100644 --- a/experimental/palette/palette.js +++ b/experimental/palette/palette.js @@ -215,6 +215,9 @@ Palette.prototype.read = function() { * Write to input elements. */ Palette.prototype.write = function(hash) { + if (!hash) { + return; + } var results = {}; for (var opt in this.model) { if (this.model.hasOwnProperty(opt)) {