jrtechs
/
jrtechs-vis
mirror of https://github.com/jrtechs/vis.git
1
0
Fork 0
Code Issues 0 Releases 82 Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/develop' into develop

v3_develop
Alex de Mulder 11 years ago
parent
c5f4b2afcd 0899c1aad7
commit
8cdde276d0
8 changed files with 107 additions and 110 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -10
      lib/network/Network.js
  2. +90
    -78
      lib/network/css/network-manipulation.css
  3. +0
    -1
      lib/network/css/network-navigation.css
  4. +3
    -3
      lib/network/mixins/MixinLoader.js
  5. +8
    -11
      lib/network/mixins/NavigationMixin.js
  6. +2
    -2
      lib/timeline/component/ItemSet.js
  7. +3
    -3
      lib/timeline/component/css/item.css
  8. +1
    -2
      lib/timeline/component/css/itemset.css

+ 0
- 10
lib/network/Network.js View File

@ -1267,16 +1267,6 @@ Network.prototype.setSize = function(width, height) {
this.frame.canvas.width = this.frame.canvas.clientWidth; this.frame.canvas.width = this.frame.canvas.clientWidth;
this.frame.canvas.height = this.frame.canvas.clientHeight; this.frame.canvas.height = this.frame.canvas.clientHeight;
if (this.manipulationDiv !== undefined) {
this.manipulationDiv.style.width = this.frame.canvas.clientWidth + "px";
}
if (this.navigationDivs !== undefined) {
if (this.navigationDivs['wrapper'] !== undefined) {
this.navigationDivs['wrapper'].style.width = this.frame.canvas.clientWidth + "px";
this.navigationDivs['wrapper'].style.height = this.frame.canvas.clientHeight + "px";
}
}
this.emit('resize', {width:this.frame.canvas.width,height:this.frame.canvas.height}); this.emit('resize', {width:this.frame.canvas.width,height:this.frame.canvas.height});
}; };

+ 90
- 78
lib/network/css/network-manipulation.css View File

@ -1,128 +1,140 @@
div.network-manipulationDiv { div.network-manipulationDiv {
border-width:0px;
border-bottom: 1px;
border-style:solid;
border-color: #d6d9d8;
background: #ffffff; /* Old browsers */
background: -moz-linear-gradient(top, #ffffff 0%, #fcfcfc 48%, #fafafa 50%, #fcfcfc 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(48%,#fcfcfc), color-stop(50%,#fafafa), color-stop(100%,#fcfcfc)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #ffffff 0%,#fcfcfc 48%,#fafafa 50%,#fcfcfc 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #ffffff 0%,#fcfcfc 48%,#fafafa 50%,#fcfcfc 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #ffffff 0%,#fcfcfc 48%,#fafafa 50%,#fcfcfc 100%); /* IE10+ */
background: linear-gradient(to bottom, #ffffff 0%,#fcfcfc 48%,#fafafa 50%,#fcfcfc 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#fcfcfc',GradientType=0 ); /* IE6-9 */
border-width: 0;
border-bottom: 1px;
border-style:solid;
border-color: #d6d9d8;
background: #ffffff; /* Old browsers */
background: -moz-linear-gradient(top, #ffffff 0%, #fcfcfc 48%, #fafafa 50%, #fcfcfc 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(48%,#fcfcfc), color-stop(50%,#fafafa), color-stop(100%,#fcfcfc)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #ffffff 0%,#fcfcfc 48%,#fafafa 50%,#fcfcfc 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #ffffff 0%,#fcfcfc 48%,#fafafa 50%,#fcfcfc 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #ffffff 0%,#fcfcfc 48%,#fafafa 50%,#fcfcfc 100%); /* IE10+ */
background: linear-gradient(to bottom, #ffffff 0%,#fcfcfc 48%,#fafafa 50%,#fcfcfc 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#fcfcfc',GradientType=0 ); /* IE6-9 */
width: 600px;
height:30px;
z-index:10;
position:absolute;
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 30px;
} }
div.network-manipulation-editMode { div.network-manipulation-editMode {
height:30px;
z-index:10;
position:absolute;
margin-top:20px;
position:absolute;
left: 0;
top: 0;
height: 30px;
margin-top:20px;
} }
div.network-manipulation-closeDiv { div.network-manipulation-closeDiv {
height:30px;
width:30px;
z-index:11;
position:absolute;
margin-top:3px;
margin-left:590px;
background-position: 0px 0px;
background-repeat:no-repeat;
background-image: url("img/network/cross.png");
cursor: pointer;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
position:absolute;
left: 0;
top: 0;
width: 30px;
height: 30px;
margin-top: 3px;
margin-left: 590px;
background-position: 0px 0px;
background-repeat: no-repeat;
background-image: url("img/network/cross.png");
cursor: pointer;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
} }
span.network-manipulationUI { span.network-manipulationUI {
font-family: verdana;
font-size: 12px;
-moz-border-radius: 15px;
border-radius: 15px;
display:inline-block;
background-position: 0px 0px;
background-repeat:no-repeat;
height:24px;
margin: -14px 0px 0px 10px;
vertical-align:middle;
cursor: pointer;
padding: 0px 8px 0px 8px;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
font-family: verdana;
font-size: 12px;
-moz-border-radius: 15px;
border-radius: 15px;
display:inline-block;
background-position: 0px 0px;
background-repeat:no-repeat;
height:24px;
margin: -14px 0px 0px 10px;
vertical-align:middle;
cursor: pointer;
padding: 0px 8px 0px 8px;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
} }
span.network-manipulationUI:hover { span.network-manipulationUI:hover {
box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.20);
box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.20);
} }
span.network-manipulationUI:active { span.network-manipulationUI:active {
box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.50);
box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.50);
} }
span.network-manipulationUI.back { span.network-manipulationUI.back {
background-image: url("img/network/backIcon.png");
background-image: url("img/network/backIcon.png");
} }
span.network-manipulationUI.none:hover { span.network-manipulationUI.none:hover {
box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.0);
cursor: default;
box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.0);
cursor: default;
} }
span.network-manipulationUI.none:active { span.network-manipulationUI.none:active {
box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.0);
box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.0);
} }
span.network-manipulationUI.none { span.network-manipulationUI.none {
padding: 0px 0px 0px 0px;
padding: 0px 0px 0px 0px;
} }
span.network-manipulationUI.notification{ span.network-manipulationUI.notification{
margin: 2px;
font-weight: bold;
margin: 2px;
font-weight: bold;
} }
span.network-manipulationUI.add { span.network-manipulationUI.add {
background-image: url("img/network/addNodeIcon.png");
background-image: url("img/network/addNodeIcon.png");
} }
span.network-manipulationUI.edit { span.network-manipulationUI.edit {
background-image: url("img/network/editIcon.png");
background-image: url("img/network/editIcon.png");
} }
span.network-manipulationUI.edit.editmode { span.network-manipulationUI.edit.editmode {
background-color: #fcfcfc;
border-style:solid;
border-width:1px;
border-color: #cccccc;
background-color: #fcfcfc;
border-style:solid;
border-width:1px;
border-color: #cccccc;
} }
span.network-manipulationUI.connect { span.network-manipulationUI.connect {
background-image: url("img/network/connectIcon.png");
background-image: url("img/network/connectIcon.png");
} }
span.network-manipulationUI.delete { span.network-manipulationUI.delete {
background-image: url("img/network/deleteIcon.png");
background-image: url("img/network/deleteIcon.png");
} }
/* top right bottom left */ /* top right bottom left */
span.network-manipulationLabel { span.network-manipulationLabel {
margin: 0px 0px 0px 23px;
line-height: 25px;
margin: 0px 0px 0px 23px;
line-height: 25px;
} }
div.network-seperatorLine { div.network-seperatorLine {
display:inline-block;
width:1px;
height:20px;
background-color: #bdbdbd;
margin: 5px 7px 0px 15px;
display:inline-block;
width:1px;
height:20px;
background-color: #bdbdbd;
margin: 5px 7px 0px 15px;
}
div.network-navigation_wrapper {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
} }

+ 0
- 1
lib/network/css/network-navigation.css View File

@ -1,7 +1,6 @@
div.network-navigation { div.network-navigation {
width:34px; width:34px;
height:34px; height:34px;
z-index:10;
-moz-border-radius: 17px; -moz-border-radius: 17px;
border-radius: 17px; border-radius: 17px;
position:absolute; position:absolute;

+ 3
- 3
lib/network/mixins/MixinLoader.js View File

@ -123,7 +123,7 @@ exports._loadManipulationSystem = function () {
else { else {
this.manipulationDiv.style.display = "none"; this.manipulationDiv.style.display = "none";
} }
this.containerElement.insertBefore(this.manipulationDiv, this.frame);
this.frame.appendChild(this.manipulationDiv);
} }
if (this.editModeDiv === undefined) { if (this.editModeDiv === undefined) {
@ -136,7 +136,7 @@ exports._loadManipulationSystem = function () {
else { else {
this.editModeDiv.style.display = "block"; this.editModeDiv.style.display = "block";
} }
this.containerElement.insertBefore(this.editModeDiv, this.frame);
this.frame.appendChild(this.editModeDiv);
} }
if (this.closeDiv === undefined) { if (this.closeDiv === undefined) {
@ -144,7 +144,7 @@ exports._loadManipulationSystem = function () {
this.closeDiv.className = 'network-manipulation-closeDiv'; this.closeDiv.className = 'network-manipulation-closeDiv';
this.closeDiv.id = 'network-manipulation-closeDiv'; this.closeDiv.id = 'network-manipulation-closeDiv';
this.closeDiv.style.display = this.manipulationDiv.style.display; this.closeDiv.style.display = this.manipulationDiv.style.display;
this.containerElement.insertBefore(this.closeDiv, this.frame);
this.frame.appendChild(this.closeDiv);
} }
// load the manipulation functions // load the manipulation functions

+ 8
- 11
lib/network/mixins/NavigationMixin.js View File

@ -4,8 +4,8 @@ var Hammer = require('../../module/hammer');
exports._cleanNavigation = function() { exports._cleanNavigation = function() {
// clean up previous navigation items // clean up previous navigation items
var wrapper = document.getElementById('network-navigation_wrapper'); var wrapper = document.getElementById('network-navigation_wrapper');
if (wrapper != null) {
this.containerElement.removeChild(wrapper);
if (wrapper && wrapper.parentNode) {
wrapper.parentNode.removeChild(wrapper);
} }
document.onmouseup = null; document.onmouseup = null;
}; };
@ -26,23 +26,20 @@ exports._loadNavigationElements = function() {
var navigationDivActions = ['_moveUp','_moveDown','_moveLeft','_moveRight','_zoomIn','_zoomOut','zoomExtent']; var navigationDivActions = ['_moveUp','_moveDown','_moveLeft','_moveRight','_zoomIn','_zoomOut','zoomExtent'];
this.navigationDivs['wrapper'] = document.createElement('div'); this.navigationDivs['wrapper'] = document.createElement('div');
this.navigationDivs['wrapper'].id = "network-navigation_wrapper";
this.navigationDivs['wrapper'].style.position = "absolute";
this.navigationDivs['wrapper'].style.width = this.frame.canvas.clientWidth + "px";
this.navigationDivs['wrapper'].style.height = this.frame.canvas.clientHeight + "px";
this.containerElement.insertBefore(this.navigationDivs['wrapper'],this.frame);
this.navigationDivs['wrapper'].id = 'network-navigation_wrapper';
this.frame.appendChild(this.navigationDivs['wrapper']);
var me = this; var me = this;
for (var i = 0; i < navigationDivs.length; i++) { for (var i = 0; i < navigationDivs.length; i++) {
this.navigationDivs[navigationDivs[i]] = document.createElement('div'); this.navigationDivs[navigationDivs[i]] = document.createElement('div');
this.navigationDivs[navigationDivs[i]].id = "network-navigation_" + navigationDivs[i];
this.navigationDivs[navigationDivs[i]].className = "network-navigation " + navigationDivs[i];
this.navigationDivs[navigationDivs[i]].id = 'network-navigation_' + navigationDivs[i];
this.navigationDivs[navigationDivs[i]].className = 'network-navigation ' + navigationDivs[i];
this.navigationDivs['wrapper'].appendChild(this.navigationDivs[navigationDivs[i]]); this.navigationDivs['wrapper'].appendChild(this.navigationDivs[navigationDivs[i]]);
var hammer = Hammer(this.navigationDivs[navigationDivs[i]], {prevent_default: true}); var hammer = Hammer(this.navigationDivs[navigationDivs[i]], {prevent_default: true});
hammer.on("touch", me[navigationDivActions[i]].bind(me));
hammer.on('touch', me[navigationDivActions[i]].bind(me));
} }
var hammer = Hammer(document, {prevent_default: false}); var hammer = Hammer(document, {prevent_default: false});
hammer.on("release", me._stopMovement.bind(me));
hammer.on('release', me._stopMovement.bind(me));
}; };
/** /**

+ 2
- 2
lib/timeline/component/ItemSet.js View File

@ -364,7 +364,7 @@ ItemSet.prototype.show = function() {
// show axis with dots // show axis with dots
if (!this.dom.axis.parentNode) { if (!this.dom.axis.parentNode) {
this.body.dom.backgroundVertical.appendChild(this.dom.axis);
this.body.dom.top.appendChild(this.dom.axis);
} }
// show labelset containing labels // show labelset containing labels
@ -524,7 +524,7 @@ ItemSet.prototype.redraw = function() {
this.dom.axis.style.top = asSize((orientation == 'top') ? this.dom.axis.style.top = asSize((orientation == 'top') ?
(this.body.domProps.top.height + this.body.domProps.border.top) : (this.body.domProps.top.height + this.body.domProps.border.top) :
(this.body.domProps.top.height + this.body.domProps.centerContainer.height)); (this.body.domProps.top.height + this.body.domProps.centerContainer.height));
this.dom.axis.style.left = this.body.domProps.border.left + 'px';
this.dom.axis.style.left = '0';
// check if this component is resized // check if this component is resized
resized = this._isResized() || resized; resized = this._isResized() || resized;

+ 3
- 3
lib/timeline/component/css/item.css View File

@ -12,7 +12,9 @@
.vis.timeline .item.selected { .vis.timeline .item.selected {
border-color: #FFC200; border-color: #FFC200;
background-color: #FFF785; background-color: #FFF785;
z-index: 999;
/* z-index must be higher than the z-index of custom time bar and current time bar */
z-index: 2;
} }
.vis.timeline .editable .item.selected { .vis.timeline .editable .item.selected {
@ -88,7 +90,6 @@
left: -4px; left: -4px;
cursor: w-resize; cursor: w-resize;
z-index: 10000;
} }
.vis.timeline .item.range .drag-right { .vis.timeline .item.range .drag-right {
@ -99,5 +100,4 @@
right: -4px; right: -4px;
cursor: e-resize; cursor: e-resize;
z-index: 10001; /* a little higher z-index than .drag-left */
} }

+ 1
- 2
lib/timeline/component/css/itemset.css View File

@ -18,8 +18,7 @@
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 0; height: 0;
left: 1px;
z-index: 1;
left: 0;
} }
.vis.timeline .foreground .group { .vis.timeline .foreground .group {

Write Preview
Loading…
Cancel
Save