Browse Source

fixed color bug and fontsize bug from merge

css_transitions
Alex de Mulder 10 years ago
parent
commit
f4e4d2dc8e
3 changed files with 4 additions and 2 deletions
  1. +2
    -1
      dist/vis.js
  2. +1
    -0
      src/graph/Graph.js
  3. +1
    -1
      src/graph/Popup.js

+ 2
- 1
dist/vis.js View File

@ -11262,7 +11262,7 @@ function Popup(container, x, y, text, style) {
styleAttr.visibility = "hidden"; styleAttr.visibility = "hidden";
styleAttr.border = "1px solid " + style.color.border; styleAttr.border = "1px solid " + style.color.border;
styleAttr.color = style.fontColor; styleAttr.color = style.fontColor;
styleAttr.fontSize = style.fontSize;
styleAttr.fontSize = style.fontSize + "px";
styleAttr.fontFamily = style.fontFace; styleAttr.fontFamily = style.fontFace;
styleAttr.padding = this.padding + "px"; styleAttr.padding = this.padding + "px";
styleAttr.backgroundColor = style.color.background; styleAttr.backgroundColor = style.color.background;
@ -16677,6 +16677,7 @@ Graph.prototype.setOptions = function (options) {
if (options.edges.color !== undefined) { if (options.edges.color !== undefined) {
if (util.isString(options.edges.color)) { if (util.isString(options.edges.color)) {
this.constants.edges.color = {};
this.constants.edges.color.color = options.edges.color; this.constants.edges.color.color = options.edges.color;
this.constants.edges.color.highlight = options.edges.color; this.constants.edges.color.highlight = options.edges.color;
} }

+ 1
- 0
src/graph/Graph.js View File

@ -629,6 +629,7 @@ Graph.prototype.setOptions = function (options) {
if (options.edges.color !== undefined) { if (options.edges.color !== undefined) {
if (util.isString(options.edges.color)) { if (util.isString(options.edges.color)) {
this.constants.edges.color = {};
this.constants.edges.color.color = options.edges.color; this.constants.edges.color.color = options.edges.color;
this.constants.edges.color.highlight = options.edges.color; this.constants.edges.color.highlight = options.edges.color;
} }

+ 1
- 1
src/graph/Popup.js View File

@ -55,7 +55,7 @@ function Popup(container, x, y, text, style) {
styleAttr.visibility = "hidden"; styleAttr.visibility = "hidden";
styleAttr.border = "1px solid " + style.color.border; styleAttr.border = "1px solid " + style.color.border;
styleAttr.color = style.fontColor; styleAttr.color = style.fontColor;
styleAttr.fontSize = style.fontSize;
styleAttr.fontSize = style.fontSize + "px";
styleAttr.fontFamily = style.fontFace; styleAttr.fontFamily = style.fontFace;
styleAttr.padding = this.padding + "px"; styleAttr.padding = this.padding + "px";
styleAttr.backgroundColor = style.color.background; styleAttr.backgroundColor = style.color.background;

Loading…
Cancel
Save