Skip to content

Commit

Permalink
1.5.4 rc2
Browse files Browse the repository at this point in the history
  • Loading branch information
@sporritt
sporritt committed Nov 18, 2013
1 parent 7ed3691 commit bf95abd
Show file tree
Hide file tree
Showing 120 changed files with 766 additions and 736 deletions.
13 changes: 11 additions & 2 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ module.exports = function(grunt) {
},
{
search:"<a href=\"http://localhost:4567\">",
replace:"<a href=\"../doc/\">",
replace:"<a href=\"../../doc/\">",
flags:"gm"
}
]
Expand Down Expand Up @@ -234,6 +234,15 @@ module.exports = function(grunt) {
dest:"TEMPOUT/"
}
]
},
logo:{
files:[
{
expand:false,
src:"./logo-bw.png",
dest:"dist/logo-bw.png"
}
]
}
},
"regex-replace": makeReplacements(),
Expand Down Expand Up @@ -352,7 +361,7 @@ module.exports = function(grunt) {
*/


grunt.registerTask('build', [/*'qunit', */'prepare', 'concat', 'uglify', 'copy:temp', 'copy:demos', 'copy:tests', 'copy:doc', 'regex-replace', 'markdown', 'docIndex', 'jsdoc', 'info', 'clean', 'writeIndex' ]);
grunt.registerTask('build', [/*'qunit', */'prepare', 'concat', 'uglify', 'copy:temp', 'copy:demos', 'copy:tests', 'copy:doc', 'copy:logo', 'regex-replace', 'markdown', 'docIndex', 'jsdoc', 'info', 'clean', 'writeIndex' ]);
grunt.registerTask('default', ['help']);
grunt.registerTask('build-all', ['qunit', 'build']);

Expand Down
7 changes: 5 additions & 2 deletions demo/all/jquery.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<body data-demo-id="home" data-library="jquery">
<div id="headerWrapper">
<div id="header">
<div class="logo">jsPlumb</div>
<div class="logo"><img src="../../logo-bw.png"></div>
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../apidocs">API</a>
<a href="../../apidocs/">API</a>
<a href="../../tests/all-tests.html">TESTS</a>
<a href="mailto:hello@jsplumbtoolkit.com">CONTACT</a>
<a href="http://github.com/sporritt/jsplumb/">GITHUB</a>
Expand Down Expand Up @@ -187,6 +187,9 @@ <h4>ANIMATION</h4>
<script src="../../lib/jquery-ui-1.9.2-min.js"></script>
<script src="../../lib/jquery.ui.touch-punch.min.js"></script>
<!-- /DEP -->

<!-- for demo dropdown. not a jsplumb dependency -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>

<!-- JS -->
<!-- support lib for bezier stuff -->
Expand Down
3 changes: 1 addition & 2 deletions demo/all/mootools.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>jsPlumb 1.5.4 demo - jQuery</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link rel="stylesheet" href="../demo-all.css">

<link rel="stylesheet" href="../flowchart/demo.css">
<link rel="stylesheet" href="../perimeterAnchors/demo.css">
<link rel="stylesheet" href="../draggableConnectors/demo.css">
Expand All @@ -20,7 +19,7 @@
<div id="header">
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../apidocs">API</a>
<a href="../../apidocs/">API</a>
<a href="../../tests/all-tests.html">TESTS</a>
<a href="mailto:hello@jsplumbtoolkit.com">CONTACT</a>
<a href="http://github.com/sporritt/jsplumb/">GITHUB</a>
Expand Down
3 changes: 1 addition & 2 deletions demo/all/yui.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>jsPlumb 1.5.4 demo - YUI3</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link rel="stylesheet" href="../demo-all.css">

<link rel="stylesheet" href="../flowchart/demo.css">
<link rel="stylesheet" href="../perimeterAnchors/demo.css">
<link rel="stylesheet" href="../draggableConnectors/demo.css">
Expand All @@ -20,7 +19,7 @@
<div id="header">
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../apidocs">API</a>
<a href="../../apidocs/">API</a>
<a href="../../tests/all-tests.html">TESTS</a>
<a href="mailto:hello@jsplumbtoolkit.com">CONTACT</a>
<a href="http://github.com/sporritt/jsplumb/">GITHUB</a>
Expand Down
8 changes: 5 additions & 3 deletions demo/animation/jquery.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<body data-demo-id="animation" data-library="jquery">
<div id="headerWrapper">
<div id="header">
<div class="logo">jsPlumb</div>
<div class="logo"><img src="../../logo-bw.png"></div>
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../../apidocs">API</a>
Expand Down Expand Up @@ -56,9 +56,11 @@ <h4>ANIMATION</h4>
<!-- DEP -->
<script src="../../lib/jquery-1.9.0.js"></script>
<script src="../../lib/jquery-ui-1.9.2-min.js"></script>
<script src="../../lib/jquery.ui.touch-punch.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script src="../../lib/jquery.ui.touch-punch.min.js"></script>
<!-- /DEP -->

<!-- for demo dropdown. not a jsplumb dependency -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>

<!-- JS -->
<!-- support lib for bezier stuff -->
Expand Down
5 changes: 2 additions & 3 deletions demo/animation/mootools.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
<title>jsPlumb 1.5.4 demo - MooTools</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
<link rel="stylesheet" href="../demo-all.css">
<link rel="stylesheet" href="../demo-all.css">
<link rel="stylesheet" href="demo.css">
</head>
<body data-demo-id="animation" data-library="mootools">
<div id="headerWrapper">
<div id="header">
<div class="logo">jsPlumb</div>
<div class="logo"><img src="../../logo-bw.png"></div>
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../../apidocs">API</a>
Expand Down
5 changes: 2 additions & 3 deletions demo/animation/yui.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
<title>jsPlumb 1.5.4 demo - YUI3</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
<link rel="stylesheet" href="../demo-all.css">
<link rel="stylesheet" href="../demo-all.css">
<link rel="stylesheet" href="demo.css">
</head>
<body data-demo-id="animation" data-library="yui">
<div id="headerWrapper">
<div id="header">
<div class="logo">jsPlumb</div>
<div class="logo"><img src="../../logo-bw.png"></div>
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../../apidocs">API</a>
Expand Down
8 changes: 5 additions & 3 deletions demo/chart/jquery.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<body data-demo-id="chart" data-library="jquery">
<div id="headerWrapper">
<div id="header">
<div class="logo">jsPlumb</div>
<div class="logo"><img src="../../logo-bw.png"></div>
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../../apidocs">API</a>
Expand Down Expand Up @@ -57,9 +57,11 @@ <h4>CHART</h4>
<!-- DEP -->
<script src="../../lib/jquery-1.9.0.js"></script>
<script src="../../lib/jquery-ui-1.9.2-min.js"></script>
<script src="../../lib/jquery.ui.touch-punch.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script src="../../lib/jquery.ui.touch-punch.min.js"></script>
<!-- /DEP -->

<!-- for demo dropdown. not a jsplumb dependency -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>

<!-- JS -->
<!-- support lib for bezier stuff -->
Expand Down
5 changes: 2 additions & 3 deletions demo/chart/mootools.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
<title>jsPlumb 1.5.4 demo - MooTools</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
<link rel="stylesheet" href="../demo-all.css">
<link rel="stylesheet" href="../demo-all.css">
<link rel="stylesheet" href="demo.css">
</head>
<body data-demo-id="chart" data-library="mootools">
<div id="headerWrapper">
<div id="header">
<div class="logo">jsPlumb</div>
<div class="logo"><img src="../../logo-bw.png"></div>
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../../apidocs">API</a>
Expand Down
5 changes: 2 additions & 3 deletions demo/chart/yui.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
<title>jsPlumb 1.5.4 demo - YUI3</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
<link rel="stylesheet" href="../demo-all.css">
<link rel="stylesheet" href="../demo-all.css">
<link rel="stylesheet" href="demo.css">
</head>
<body data-demo-id="chart" data-library="yui">
<div id="headerWrapper">
<div id="header">
<div class="logo">jsPlumb</div>
<div class="logo"><img src="../../logo-bw.png"></div>
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../../apidocs">API</a>
Expand Down
10 changes: 6 additions & 4 deletions demo/demo-all.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

.dropdown-menu>li>a {
width:100%;
width:80%;
text-transform: uppercase;
font-size:12px;
}
Expand Down Expand Up @@ -142,7 +142,8 @@ body {

a, a:visited {
text-decoration:none;
color:#057D9F;
/*color:#057D9F; */
color:black;
border-radius:0.2em;
-webkit-transition: color 0.15s ease-in;
-moz-transition: color 0.15s ease-in;
Expand Down Expand Up @@ -288,6 +289,7 @@ path, ._jsPlumb_endpoint { cursor:pointer; }
padding-right: 10px;
padding-left: 5px;
text-transform: uppercase;
z-index:100001;
}

.demo-links div, .library-links a {
Expand All @@ -306,8 +308,8 @@ path, ._jsPlumb_endpoint { cursor:pointer; }
line-height: 19px;
}

a.current-library {
color:#7AB02C ;
.current-library {
color:#7AB02C !important;
}

/** Z-INDEX **/
Expand Down
8 changes: 4 additions & 4 deletions demo/demo-list.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
// next/previous links
var d = _d("div", "demo-links", document.body),
dp = _d("div", "", d, "<a href='../" + list[prev][0] + "/" + library + ".html'>" + list[prev][1] + "<i class='fa fa-arrow-left'></i></a>"),
dc = _d("div", "", d, list[idx][1]),
dc = _d("div", "current-library", d, list[idx][1]),
dn = _d("div", "", d, "<a href='../" + list[next][0] + "/" + library + ".html'><i class='fa fa-arrow-right'></i>" + list[next][1] + "</a>");

if (typeof jQuery != "undefined") {
Expand All @@ -61,7 +61,7 @@

for (var i = 0; i < list.length; i++) {
var li = _d("li", "", ul, null, {role:"presentation"}),
aa = _d("a", "", li, list[i][1], { role:"menuitem", tabindex:"-1", href:list[i][0] +"/" + library + ".html"});
aa = _d("a", "", li, list[i][1], { role:"menuitem", tabindex:"-1", href:"../" + list[i][0] +"/" + library + ".html"});
}

$(a).dropdown();
Expand All @@ -71,7 +71,7 @@
var m = document.getElementsByClassName("menu")[0],
sel = _d("select", "", m, null, null, true);
for (var i = 0; i < list.length; i++) {
_d("option", "", sel, list[i][1], {"data-href":list[i][0] +"/" + library + ".html", "selected":list[i][0] == current}, null);
_d("option", "", sel, list[i][1], {"data-href":"../" + list[i][0] +"/" + library + ".html", "selected":list[i][0] == current}, null);
}
jsPlumb.CurrentLibrary.bind(sel, "change", function() {
document.location = sel.options[sel.selectedIndex].getAttribute("data-href");
Expand All @@ -83,7 +83,7 @@
ld = _d("div", "library-links", document.body);

for (var i = 0; i <libs.length; i++) {
_d("a", libs[i][0] == library ? "current-library" : "", ld, libs[i][1], {href:current + "/" + libs[i][0] + ".html"});
_d("a", libs[i][0] == library ? "current-library" : "", ld, libs[i][1], {href:"../" + current + "/" + libs[i][0] + ".html"});
}


Expand Down
8 changes: 6 additions & 2 deletions demo/draggableConnectors/demo.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,18 @@
.drag-drop-demo .window {
font-family:serif;
font-style:italic;
padding-top:14px;
line-height:10px;
padding-top:5px;
line-height:13px;
}

.drag-drop-demo a, .drag-drop-demo a:visited {
color:#057D9F;
}

.drag-drop-demo a:hover {
color:orange;
}

/** LINKS IN WINDOWS **/
.drag-locked { border:1px solid red; }
.cmdLink { font-size:0.80em;}
Expand Down
8 changes: 5 additions & 3 deletions demo/draggableConnectors/jquery.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<body data-demo-id="draggableConnectors" data-library="jquery">
<div id="headerWrapper">
<div id="header">
<div class="logo">jsPlumb</div>
<div class="logo"><img src="../../logo-bw.png"></div>
<div class="menu">
<a href="http://localhost:4567">DOCS</a>
<a href="../../apidocs">API</a>
Expand Down Expand Up @@ -57,9 +57,11 @@ <h4>DRAG &amp; DROP</h4>
<!-- DEP -->
<script src="../../lib/jquery-1.9.0.js"></script>
<script src="../../lib/jquery-ui-1.9.2-min.js"></script>
<script src="../../lib/jquery.ui.touch-punch.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script src="../../lib/jquery.ui.touch-punch.min.js"></script>
<!-- /DEP -->

<!-- for demo dropdown. not a jsplumb dependency -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>

<!-- JS -->
<!-- support lib for bezier stuff -->
Expand Down
Loading

0 comments on commit bf95abd

Please sign in to comment.