Skip to content

Commit

Permalink
alpha build
Browse files Browse the repository at this point in the history
  • Loading branch information
@sporritt
sporritt committed Apr 9, 2014
1 parent 412d8cb commit 0a6b96a
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 19 deletions.
14 changes: 9 additions & 5 deletions css/jsplumb.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ body {
padding:0;
margin:0;
font-family:'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
background-color:#eaedef;
background-color: whitesmoke;

}

Expand Down Expand Up @@ -103,23 +103,27 @@ body {
#main {
margin-top: 106px;
font-size: 80%;
width:75%;
width: 80%;
margin-left:auto;
margin-right: auto;
height:600px;
height: 600px;
text-align: center;
position: relative;
max-width:852px;
/* max-width:852px; */
max-width: 1200px;
max-height: 1000px;
/* bottom: 0; */
}

.demo {
position: relative;
width:100%;
background-color:white;
height:563px;
/* height:563px; */
overflow:auto;
margin-top: 53px;
margin-bottom:25px;
height: 600px;
}

.explanation {
Expand Down
14 changes: 9 additions & 5 deletions dist/css/jsplumb.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ body {
padding:0;
margin:0;
font-family:'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
background-color:#eaedef;
background-color: whitesmoke;

}

Expand Down Expand Up @@ -103,23 +103,27 @@ body {
#main {
margin-top: 106px;
font-size: 80%;
width:75%;
/* width:75%; */
margin-left:auto;
margin-right: auto;
height:600px;
height: 800px;
text-align: center;
position: relative;
max-width:852px;
/* max-width:852px; */
max-width: 1100px;
max-height: 1000px;
/* bottom: 0; */
}

.demo {
position: relative;
width:100%;
background-color:white;
height:563px;
/* height:563px; */
overflow:auto;
margin-top: 53px;
margin-bottom:25px;
height: 600px;
}

.explanation {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/dom.jsPlumb-1.6.0-min.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dist/js/dom.jsPlumb-1.6.0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3150,7 +3150,8 @@
_currentInstance.select({source:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.sourceElementDraggingClass, true);
_currentInstance.select({target:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.targetElementDraggingClass, true);
_currentInstance.setConnectionBeingDragged(true);
});
if (dragOptions.canDrag) return dragOptions.canDrag();
}, false);

options[dragEvent] = _ju.wrap(options[dragEvent], function() {
// TODO: here we could actually use getDragObject, and then compute it ourselves,
Expand Down
2 changes: 1 addition & 1 deletion dist/js/jquery.jsPlumb-1.6.0-min.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dist/js/jquery.jsPlumb-1.6.0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2195,7 +2195,8 @@
_currentInstance.select({source:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.sourceElementDraggingClass, true);
_currentInstance.select({target:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.targetElementDraggingClass, true);
_currentInstance.setConnectionBeingDragged(true);
});
if (dragOptions.canDrag) return dragOptions.canDrag();
}, false);

options[dragEvent] = _ju.wrap(options[dragEvent], function() {
// TODO: here we could actually use getDragObject, and then compute it ourselves,
Expand Down
2 changes: 1 addition & 1 deletion dist/js/mootools.jsPlumb-1.6.0-min.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dist/js/mootools.jsPlumb-1.6.0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2195,7 +2195,8 @@
_currentInstance.select({source:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.sourceElementDraggingClass, true);
_currentInstance.select({target:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.targetElementDraggingClass, true);
_currentInstance.setConnectionBeingDragged(true);
});
if (dragOptions.canDrag) return dragOptions.canDrag();
}, false);

options[dragEvent] = _ju.wrap(options[dragEvent], function() {
// TODO: here we could actually use getDragObject, and then compute it ourselves,
Expand Down
2 changes: 1 addition & 1 deletion dist/js/yui.jsPlumb-1.6.0-min.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dist/js/yui.jsPlumb-1.6.0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2195,7 +2195,8 @@
_currentInstance.select({source:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.sourceElementDraggingClass, true);
_currentInstance.select({target:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.targetElementDraggingClass, true);
_currentInstance.setConnectionBeingDragged(true);
});
if (dragOptions.canDrag) return dragOptions.canDrag();
}, false);

options[dragEvent] = _ju.wrap(options[dragEvent], function() {
// TODO: here we could actually use getDragObject, and then compute it ourselves,
Expand Down
3 changes: 2 additions & 1 deletion src/jsPlumb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,8 @@
_currentInstance.select({source:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.sourceElementDraggingClass, true);
_currentInstance.select({target:element}).addClass(_currentInstance.elementDraggingClass + " " + _currentInstance.targetElementDraggingClass, true);
_currentInstance.setConnectionBeingDragged(true);
});
if (dragOptions.canDrag) return dragOptions.canDrag();
}, false);

options[dragEvent] = _ju.wrap(options[dragEvent], function() {
// TODO: here we could actually use getDragObject, and then compute it ourselves,
Expand Down

0 comments on commit 0a6b96a

Please sign in to comment.