X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=experimental%2Fpalette%2Fpalette.js;h=d98ab15fd18ecb2179f0bbd02b9adc61562e69a1;hb=775146792861ea30657f1f2b683ef8011bd5f4d7;hp=d7c7cab42120a5e77bd413d16d49d0f49079c68d;hpb=e26b71566419e1c051f3fbd1f4f8f64b063a04c9;p=dygraphs.git

diff --git a/experimental/palette/palette.js b/experimental/palette/palette.js
index d7c7cab..d98ab15 100644
--- a/experimental/palette/palette.js
+++ b/experimental/palette/palette.js
@@ -25,113 +25,109 @@
  */
 "use strict";
 
-function Palette() {
+/**
+ * scope is either "global", "series", "x", "y" or "y2".
+ */
+function Palette(scope) {
+  // Contains pair of "input" (the input object) and "row" (the parent row)
+  // Also contains functionString.
   this.model = {};
+  // This is meant to be overridden by a palette host.
   this.onchange = function() {};
-  this.filterBar = null;
+  this.scope = scope;
+  this.root = null;
 }
 
-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) {
+Palette.prototype.create = function(parentElement) {
   var palette = this;
 
-  var table = Palette.createChild("div", parentElement, "palette");
-  table.width="300px";
+  var table = $("<div>")
+      .addClass("palette")
+      .width(300)
+      .appendTo(parentElement);
 
+  this.root = table;
   this.tooltip = new Tooltip();
 
-  var row = Palette.createChild("div", table, "header");
-  row.style.visibility = "visible";
-
-  Palette.createChild("span", row).textContent = "Filter:";
-  this.filterBar = Palette.createChild("input", Palette.createChild("span", row));
-  this.filterBar.type = "search";
-  this.filterBar.onkeyup = function() {
-    palette.filter(palette.filterBar.value)
-  };
-  this.filterBar.onclick = this.filterBar.onkeyup;
-  var go = Palette.createChild("button", Palette.createChild("span", row));
-  go.textContent = "Redraw"
-  go.onclick = function() {
-    palette.onchange();
-  };
-
-  // CURRENTLY HIDDEN.
-  var tmp = Palette.createChild("button", Palette.createChild("span", row));
-  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");
-  };
-  tmp.style.display = "none";
-
-  for (var opt in opts) {
+  // One row per option.
+  $.each(opts, function(opt, optEntry) {
     try {
-      if (opts.hasOwnProperty(opt)) {
-        var type = opts[opt].type;
-        var isFunction = type.indexOf("function(") == 0;
-        var row = Palette.createChild("div", table);
-        row.onmouseover = function(source, title, type, body, e) {
-          return function(e) {
-            palette.tooltip.show(source, e, title, type, body);
-          };
-        } (row, opt, type, Dygraph.OPTIONS_REFERENCE[opt].description);
-        row.onmouseout = function() { palette.tooltip.hide(); };
-
-        var div = Palette.createChild("span", row, "name");
-        div.textContent = opt;
-
-        var value = Palette.createChild("span", row, "option");
-
-        if (isFunction) {
-           var input = Palette.createChild("button", value);
-           input.onclick = function(opt, palette) {
-             return function(event) {
-               var entry = palette.model[opt];
-               var inputValue = entry.functionString;
-               if (inputValue == null || inputValue.length == 0) {
-                 inputValue = opts[opt].type + "{\n\n}";
-               }
-	       var textarea = new TextArea();
-	       textarea.show(opt, inputValue);
-	       textarea.okCallback = function(value) {
-                 if (value != inputValue) {
-                   entry.functionString = value;
-                   entry.input.textContent = value ? "defined" : "not defined";
-                   palette.onchange();
+      var scope = optEntry.scope || [ "global" ]; // Scope can be empty, infer "global" only.
+      var valid = scope[0] == "*" || $.inArray(palette.scope, scope) >= 0;
+      if (!valid) {
+        return;
+      }
+
+      var type = optEntry.type;
+      var isFunction = type.indexOf("function(") == 0;
+
+      var input;
+      if (isFunction) {
+        input = $("<button>")
+            .click(function(opt, palette) {
+               return function(event) {
+                 var entry = palette.model[opt];
+                 var inputValue = entry.functionString;
+                 var type = opts[opt].type;
+                 if (inputValue == null || inputValue.length == 0) {
+                   inputValue = type + "{\n\n}";
                  }
-               }
-             }
-           }(opt, this);
-        } else {
-          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) {
+                 var textarea = new TextArea();
+                 textarea.show(opt, inputValue);
+                 textarea.okCallback = function(value) {
+                   if (value != inputValue) {
+                     entry.functionString = value;
+                     entry.input.textContent = value ? "defined" : "not defined";
+                     palette.onchange();
+                   }
+                 };
+               };
+             } (opt, palette) // Instantiating this inner function.
+           );
+      } else if (type == "boolean") {
+        input = $("<button>")
+            .click(function(event) {
+              var btn = event.target;
+              if (btn.value == "none") {
+                Palette.populateBooleanButton(btn, "true");
+              } else if (btn.value == "true") {
+                Palette.populateBooleanButton(btn, "false");
+              } else {
+                Palette.populateBooleanButton(btn, "none");
+              }
               palette.onchange();
-            }
-          }
-
-          input.type="text";
-        }
-        this.model[opt] = { input: input, row: row };
+            });
+      } else {
+        input = $("<input>", { type: "text" })
+            .addClass("textInput")
+            .keypress(function(event) {
+              var keycode = event.which;
+              if (keycode == 13 || keycode == 8) {
+                palette.onchange();
+              }
+            });
       }
+
+      var row = $("<div>")
+          .append($("<span>").addClass("name").text(opt))
+          .append($("<span>").addClass("option")
+              .append(input));
+
+      row.mouseover(function(source, title, type, body) {
+          return function() {
+            palette.tooltip.show(source, title, type, body);
+          };
+        } (row, opt, type, Dygraph.OPTIONS_REFERENCE[opt].description))
+        .mouseout(function() { palette.tooltip.hide(); })
+
+      row.appendTo(table);
+
+      palette.model[opt] = { input: input, row: row };
     } catch(err) {
       throw "For option " + opt + ":" + err;
     }
-  }
+  });
+
   this.filter("");
 }
 
@@ -147,21 +143,28 @@ Palette.parseBooleanArray = function(value) {
   if (value == null || value.length == 0) {
     return null;
   }
-  return value.split(',').map(function(x) { return x.trim() == "true"; });
+  return value.split(',').map(function(x) {
+    return x.trim() == "true";
+  });
 }
 
 Palette.parseFloatArray = function(value) {
   if (value == null || value.length == 0) {
     return null;
   }
-  return value.split(',').map(function(x) { return parseFloat(x); });
+  return value.split(',').map(function(x) {
+    return parseFloat(x);
+  });
 }
 
 Palette.parseIntArray = function(value) {
   if (value == null || value.length == 0) {
     return null;
   }
-  return value.split(',').map(function(x) { return parseInt(x); });
+
+  return value.split(',').map(function(x) {
+    return parseInt(x);
+  });
 }
 
 Palette.prototype.read = function() {
@@ -170,11 +173,17 @@ Palette.prototype.read = function() {
     if (this.model.hasOwnProperty(opt)) {
       var type = opts[opt].type;
       var isFunction = type.indexOf("function(") == 0;
-      var input = this.model[opt].input;
+      var input = this.model[opt].input[0]; // jquery dereference.
       var value = isFunction ? this.model[opt].functionString : input.value;
       if (value && value.length != 0) {
         if (type == "boolean") {
-          results[opt] = value == "true";
+          if (value == "false") {
+            results[opt] = false;
+          }
+          if (value == "true") {
+            results[opt] = true;
+          }
+          // Ignore value == "none"
         } else if (type == "int") {
           results[opt] = parseInt(value);
         } else if (type == "float") {
@@ -185,6 +194,8 @@ Palette.prototype.read = function() {
           results[opt] = Palette.parseFloatArray(value);
         } else if (type == "array<boolean>") {
           results[opt] = Palette.parseBooleanArray(value);
+        } else if (type == "array<int>") {
+          results[opt] = Palette.parseIntArray(value);
         } else if (type == "array<Date>") {
           results[opt] = Palette.parseIntArray(value);
         } else if (isFunction) {
@@ -206,12 +217,14 @@ Palette.prototype.read = function() {
 Palette.prototype.write = function(hash) {
   var results = {};
   for (var opt in this.model) {
-    //  && hash.hasOwnProperty(opt)
     if (this.model.hasOwnProperty(opt)) {
-      var input = this.model[opt].input;
+      var input = this.model[opt].input[0]; // jquery dereference
       var type = opts[opt].type;
       var value = hash[opt];
-      if (type == "array<string>") {
+      if (type == "boolean") {
+        var text = value == true ? "true" : (value == false ? "false" : "none");
+        Palette.populateBooleanButton(input, text);
+      } else if (type == "array<string>") {
         if (value) {
           input.value = value.join("; ");
         }
@@ -223,7 +236,7 @@ Palette.prototype.write = function(hash) {
         input.textContent = value ? "defined" : "not defined";
         this.model[opt].functionString = value ? value.toString() : null;
       } else {
-        if (value) {
+        if (value != undefined) {
           input.value = value;
         }
       }
@@ -231,6 +244,11 @@ Palette.prototype.write = function(hash) {
   }
 }
 
+Palette.populateBooleanButton = function(button, value) {
+  button.innerHTML = value;
+  button.value = value;
+}
+
 Palette.prototype.filter = function(pattern) {
   pattern = pattern.toLowerCase();
   var even = true;
@@ -238,9 +256,9 @@ Palette.prototype.filter = function(pattern) {
     if (this.model.hasOwnProperty(opt)) {
       var row = this.model[opt].row;
       var matches = opt.toLowerCase().indexOf(pattern) >= 0;
-      row.style.display = matches ? "block" : "none";
+      row.toggle(matches);
       if (matches) {
-        row.className = even ? "even" : "odd";
+        row.attr("class", even ? "even" : "odd");
         even = !even;
       }
     }