Merge pull request #104 from kberg/master

[dygraphs.git] / experimental / palette / palette.js

diff --git a/experimental/palette/palette.js b/experimental/palette/palette.js
index 1830315..d7c7cab 100644 (file)
--- a/experimental/palette/palette.js
+++ b/experimental/palette/palette.js
@@ -31,26 +31,27 @@ function Palette() {
   this.filterBar = null;
 }
 
-Palette.createChild = function(type, parentElement) {
+Palette.createChild = function(type, parentElement, className) {
   var element = document.createElement(type);
   parentElement.appendChild(element);
+  if (className) {
+    element.className = className;
+  }
   return element;
 };
 
 Palette.prototype.create = function(document, parentElement) {
   var palette = this;
 
-  var table = Palette.createChild("div", parentElement);
-  table.className = "palette";
+  var table = Palette.createChild("div", parentElement, "palette");
   table.width="300px";
 
   this.tooltip = new Tooltip();
 
-  var row = Palette.createChild("div", table);
+  var row = Palette.createChild("div", table, "header");
   row.style.visibility = "visible";
-  row.className = "header";
 
-  Palette.createChild("span", row).innerText = "Filter:";
+  Palette.createChild("span", row).textContent = "Filter:";
   this.filterBar = Palette.createChild("input", Palette.createChild("span", row));
   this.filterBar.type = "search";
   this.filterBar.onkeyup = function() {
@@ -58,14 +59,14 @@ Palette.prototype.create = function(document, parentElement) {
   };
   this.filterBar.onclick = this.filterBar.onkeyup;
   var go = Palette.createChild("button", Palette.createChild("span", row));
-  go.innerText = "Redraw"
+  go.textContent = "Redraw"
   go.onclick = function() {
     palette.onchange();
   };
 
   // CURRENTLY HIDDEN.
   var tmp = Palette.createChild("button", Palette.createChild("span", row));
-  tmp.innerText = "Copy"
+  tmp.textContent = "Copy"
   tmp.onclick = function() {
     var textarea = new TextArea();
     textarea.show("header", "Now is the time for all good men\nto come to the aid of their country");
@@ -85,12 +86,10 @@ Palette.prototype.create = function(document, parentElement) {
         } (row, opt, type, Dygraph.OPTIONS_REFERENCE[opt].description);
         row.onmouseout = function() { palette.tooltip.hide(); };
 
-        var div = Palette.createChild("span", row);
-        div.innerText = opt;
-        div.className = "name";
+        var div = Palette.createChild("span", row, "name");
+        div.textContent = opt;
 
-        var value = Palette.createChild("span", row);
-        value.className = "option";
+        var value = Palette.createChild("span", row, "option");
 
         if (isFunction) {
            var input = Palette.createChild("button", value);
@@ -102,18 +101,22 @@ Palette.prototype.create = function(document, parentElement) {
                  inputValue = opts[opt].type + "{\n\n}";
                }
               var textarea = new TextArea();
-              textarea.show("Function for " + opt, inputValue);
+              textarea.show(opt, inputValue);
               textarea.okCallback = function(value) {
                  if (value != inputValue) {
                    entry.functionString = value;
-                   entry.input.innerText = value ? "defined" : "not defined";
+                   entry.input.textContent = value ? "defined" : "not defined";
                    palette.onchange();
                  }
                }
              }
            }(opt, this);
         } else {
-          var input = Palette.createChild("input", value);
+          var input = Palette.createChild("input", value, "textInput");
+          if (type == "boolean") {
+            input.size = "5";
+            input.maxlength = "5";
+          }
           input.onkeypress = function(event) {
             var keycode = event.which;
             if (keycode == 13 || keycode == 8) {
@@ -217,7 +220,7 @@ Palette.prototype.write = function(hash) {
           input.value = value.join(", ");
         }
       } else if (type.indexOf("function(") == 0) {
-        input.innerText = value ? "defined" : "not defined";
+        input.textContent = value ? "defined" : "not defined";
         this.model[opt].functionString = value ? value.toString() : null;
       } else {
         if (value) {