Browse Source

- Improved the positioning and CSS of the configurator and the color picker.

kamadaKawai
Alex de Mulder 9 years ago
parent
commit
2f2ec2f065
3 changed files with 7 additions and 6 deletions
  1. +1
    -0
      HISTORY.md
  2. +3
    -3
      dist/vis.js
  3. +3
    -3
      lib/shared/Configurator.js

+ 1
- 0
HISTORY.md View File

@ -12,6 +12,7 @@ http://visjs.org
- Fixed #1152, updating images now works. - Fixed #1152, updating images now works.
- Fixed cleaning up of nodes. - Fixed cleaning up of nodes.
- Improved the positioning and CSS of the configurator and the color picker.
## 2015-07-27, version 4.7.0 ## 2015-07-27, version 4.7.0

+ 3
- 3
dist/vis.js View File

@ -21567,7 +21567,7 @@ return /******/ (function(modules) { // webpackBootstrap
} }
this._push(); this._push();
this.colorPicker.insertTo(this.container);
this.colorPicker.insertTo(document.body);
} }
/** /**
@ -21821,7 +21821,7 @@ return /******/ (function(modules) { // webpackBootstrap
value: function _setupPopup(string, index) { value: function _setupPopup(string, index) {
var _this3 = this; var _this3 = this;
if (this.initialized === true && this.allowCreation === true && this.popupCounter < 4000) {
if (this.initialized === true && this.allowCreation === true && this.popupCounter < this.popupLimit) {
var div = document.createElement("div"); var div = document.createElement("div");
div.id = "vis-configuration-popup"; div.id = "vis-configuration-popup";
div.className = "vis-configuration-popup"; div.className = "vis-configuration-popup";
@ -21984,7 +21984,7 @@ return /******/ (function(modules) { // webpackBootstrap
var rect = div.getBoundingClientRect(); var rect = div.getBoundingClientRect();
var bodyRect = document.body.getBoundingClientRect(); var bodyRect = document.body.getBoundingClientRect();
var pickerX = rect.left + rect.width + 5; var pickerX = rect.left + rect.width + 5;
var pickerY = rect.top - bodyRect.top + rect.height * 0.5;
var pickerY = rect.top - bodyRect.top + rect.height + 2;
this.colorPicker.show(pickerX, pickerY); this.colorPicker.show(pickerX, pickerY);
this.colorPicker.setColor(value); this.colorPicker.setColor(value);
this.colorPicker.setCallback(function (color) { this.colorPicker.setCallback(function (color) {

+ 3
- 3
lib/shared/Configurator.js View File

@ -163,7 +163,7 @@ class Configurator {
} }
this._push(); this._push();
this.colorPicker.insertTo(this.container);
this.colorPicker.insertTo(document.body);
} }
@ -388,7 +388,7 @@ class Configurator {
* @private * @private
*/ */
_setupPopup(string, index) { _setupPopup(string, index) {
if (this.initialized === true && this.allowCreation === true && this.popupCounter < 4000) {
if (this.initialized === true && this.allowCreation === true && this.popupCounter < this.popupLimit) {
let div = document.createElement("div"); let div = document.createElement("div");
div.id = "vis-configuration-popup"; div.id = "vis-configuration-popup";
div.className = "vis-configuration-popup"; div.className = "vis-configuration-popup";
@ -533,7 +533,7 @@ class Configurator {
let rect = div.getBoundingClientRect(); let rect = div.getBoundingClientRect();
let bodyRect = document.body.getBoundingClientRect(); let bodyRect = document.body.getBoundingClientRect();
let pickerX = rect.left + rect.width + 5; let pickerX = rect.left + rect.width + 5;
let pickerY = rect.top - bodyRect.top + rect.height*0.5;
let pickerY = rect.top - bodyRect.top + rect.height +2;
this.colorPicker.show(pickerX,pickerY); this.colorPicker.show(pickerX,pickerY);
this.colorPicker.setColor(value); this.colorPicker.setColor(value);
this.colorPicker.setCallback((color) => { this.colorPicker.setCallback((color) => {

Loading…
Cancel
Save