Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move time-specific options into the time plugin.

  • Loading branch information...
commit 4e8d8535e0d20c224869e457bd22c78ba7d1d585 1 parent a1b4afc
David Schnur dnschnur authored
Showing with 9 additions and 8 deletions.
  1. +1 −7 jquery.flot.js
  2. +8 −1 jquery.flot.time.js
8 jquery.flot.js
View
@@ -453,7 +453,6 @@ Licensed under the MIT license.
show: null, // null = auto-detect, true = always, false = never
position: "bottom", // or "top"
mode: null, // null or "time"
- timezone: null, // "browser" for local to the client or timezone for timezone-js
font: null, // null (derived from CSS in placeholder) or object like { size: 11, style: "italic", weight: "bold", family: "sans-serif", variant: "small-caps" }
color: null, // base color, labels, ticks
tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)"
@@ -469,14 +468,9 @@ Licensed under the MIT license.
reserveSpace: null, // whether to reserve space even if axis isn't shown
tickLength: null, // size in pixels of ticks, or "full" for whole line
alignTicksWithAxis: null, // axis number or null for no sync
-
- // mode specific options
tickDecimals: null, // no. of decimals, null means auto
tickSize: null, // number or [number, "unit"]
- minTickSize: null, // number or [number, "unit"]
- monthNames: null, // list of names of months
- timeformat: null, // format string to use
- twelveHourClock: false // 12 or 24 time in time mode
+ minTickSize: null // number or [number, "unit"]
},
yaxis: {
autoscaleMargin: 0.02,
9 jquery.flot.time.js
View
@@ -10,7 +10,14 @@ API.txt for details.
(function($) {
- var options = {};
+ var options = {
+ xaxis: {
+ timezone: null, // "browser" for local to the client or timezone for timezone-js
+ timeformat: null, // format string to use
+ twelveHourClock: false, // 12 or 24 time in time mode
+ monthNames: null // list of names of months
+ }
+ };
// round to nearby lower multiple of base
Please sign in to comment.
Something went wrong with that request. Please try again.