Skip to content

Commit

Permalink
Spliting the 'animations' plugin and removing js/util
Browse files Browse the repository at this point in the history
  • Loading branch information
ericabouaf committed Mar 7, 2010
1 parent 69a261b commit 04c3e17
Show file tree
Hide file tree
Showing 36 changed files with 376 additions and 136 deletions.
2 changes: 1 addition & 1 deletion examples/changing_directions.html
Expand Up @@ -17,7 +17,7 @@
<script type="text/javascript" src="../js/CanvasElement.js"></script>
<script type="text/javascript" src="../js/Wire.js"></script>
<script type="text/javascript" src="../js/Terminal.js"></script>
<script type="text/javascript" src="../js/util/DD.js"></script>
<script type="text/javascript" src="../js/DD.js"></script>

<link rel="stylesheet" type="text/css" href="../css/WireIt.css" />

Expand Down
8 changes: 4 additions & 4 deletions examples/containers.html
Expand Up @@ -23,7 +23,7 @@
<!-- InputEx -->
<script src="../lib/inputex/js/inputex.js" type='text/javascript'></script>
<script src="../lib/inputex/js/Field.js" type='text/javascript'></script>
<script type="text/javascript" src="../js/util/inputex/WirableField-beta.js"></script>
<script type="text/javascript" src="../js/inputex/WirableField-beta.js"></script>
<script src="../lib/inputex/js/Group.js" type='text/javascript'></script>
<script src="../lib/inputex/js/fields/StringField.js" type='text/javascript'></script>
<script src="../lib/inputex/js/fields/SelectField.js" type='text/javascript'></script>
Expand All @@ -40,11 +40,11 @@
<script type="text/javascript" src="../js/CanvasElement.js"></script>
<script type="text/javascript" src="../js/Wire.js"></script>
<script type="text/javascript" src="../js/Terminal.js"></script>
<script type="text/javascript" src="../js/util/DD.js"></script>
<script type="text/javascript" src="../js/util/DDResize.js"></script>
<script type="text/javascript" src="../js/DD.js"></script>
<script type="text/javascript" src="../js/DDResize.js"></script>
<script type="text/javascript" src="../js/Container.js"></script>
<script type="text/javascript" src="../js/Layer.js"></script>
<script type="text/javascript" src="../js/util/inputex/FormContainer-beta.js"></script>
<script type="text/javascript" src="../js/inputex/FormContainer-beta.js"></script>
<script type="text/javascript" src="../js/ImageContainer.js"></script>


Expand Down
18 changes: 2 additions & 16 deletions examples/dd_and_animation.html
Expand Up @@ -17,8 +17,7 @@
<script type="text/javascript" src="../js/CanvasElement.js"></script>
<script type="text/javascript" src="../js/Wire.js"></script>
<script type="text/javascript" src="../js/Terminal.js"></script>
<script type="text/javascript" src="../js/util/Anim.js"></script>
<script type="text/javascript" src="../js/util/DD.js"></script>
<script type="text/javascript" src="../js/DD.js"></script>

<link rel="stylesheet" type="text/css" href="../css/WireIt.css" />

Expand Down Expand Up @@ -65,17 +64,6 @@
var w2 = new WireIt.Wire(terminals1[1], terminals2[1], document.body);
w2.redraw();

// Create the animations for both blocks using WireIt.util.Anim
var myAnim1 = new WireIt.util.Anim(terminals1, // same constructor except constructor takes the terminals as 1st parameter
block1, { left: { to: 500 }, top: {to: 150} }, 2, YAHOO.util.Easing.easeOut);
var myAnim2 = new WireIt.util.Anim(terminals2,
block2, { left: { to: 100 } }, 1, YAHOO.util.Easing.easeOut);

// OnClick on the button, launch both animations
YAHOO.util.Event.addListener('animButton','click', function() {
myAnim1.animate();
myAnim2.animate();
})
};


Expand All @@ -85,9 +73,7 @@
<body>

<p style="margin: 15px;"><a href="../index.html">&lt; Back</a></p>
<p style="margin: 15px;">Show usage of WireIt.util.DD and WireIt.util.Anim to make terminal containers draggable</p>

<button id='animButton' style="margin: 15px;">Click to animate !</button>
<p style="margin: 15px;">Show usage of WireIt.util.DD to make terminal containers draggable</p>

<div id='block1' class="blockBox" style="left: 300px; top: 100px;">Move Me !</div>

Expand Down
4 changes: 2 additions & 2 deletions examples/presentation.html
Expand Up @@ -17,8 +17,8 @@
<script type="text/javascript" src="../js/CanvasElement.js"></script>
<script type="text/javascript" src="../js/Wire.js"></script>
<script type="text/javascript" src="../js/Terminal.js"></script>
<script type="text/javascript" src="../js/util/DD.js"></script>
<script type="text/javascript" src="../js/util/DDResize.js"></script>
<script type="text/javascript" src="../js/DD.js"></script>
<script type="text/javascript" src="../js/DDResize.js"></script>
<script type="text/javascript" src="../js/Container.js"></script>
<script type="text/javascript" src="../js/Layer.js"></script>

Expand Down
5 changes: 2 additions & 3 deletions examples/wire_events.html
Expand Up @@ -18,9 +18,8 @@
<script type="text/javascript" src="../js/CanvasElement.js"></script>
<script type="text/javascript" src="../js/Wire.js"></script>
<script type="text/javascript" src="../js/Terminal.js"></script>
<script type="text/javascript" src="../js/util/Anim.js"></script>
<script type="text/javascript" src="../js/util/DD.js"></script>
<script type="text/javascript" src="../js/util/DDResize.js"></script>
<script type="text/javascript" src="../js/DD.js"></script>
<script type="text/javascript" src="../js/DDResize.js"></script>
<script type="text/javascript" src="../js/Container.js"></script>
<script type="text/javascript" src="../js/Layer.js"></script>

Expand Down
5 changes: 2 additions & 3 deletions examples/wire_tooltips.html
Expand Up @@ -19,9 +19,8 @@
<script type="text/javascript" src="../js/CanvasElement.js"></script>
<script type="text/javascript" src="../js/Wire.js"></script>
<script type="text/javascript" src="../js/Terminal.js"></script>
<script type="text/javascript" src="../js/util/Anim.js"></script>
<script type="text/javascript" src="../js/util/DD.js"></script>
<script type="text/javascript" src="../js/util/DDResize.js"></script>
<script type="text/javascript" src="../js/DD.js"></script>
<script type="text/javascript" src="../js/DDResize.js"></script>
<script type="text/javascript" src="../js/Container.js"></script>
<script type="text/javascript" src="../js/Layer.js"></script>

Expand Down
File renamed without changes.
File renamed without changes.
35 changes: 0 additions & 35 deletions js/Layer.js
Expand Up @@ -459,41 +459,6 @@ WireIt.Layer.prototype = {
w.onMouseMove(rx,ry);
}
}
},


/**
* Layer explosing animation
* @method clearExplode
*/
clearExplode: function(callback, bind) {

var center = [ Math.floor(YAHOO.util.Dom.getViewportWidth()/2),
Math.floor(YAHOO.util.Dom.getViewportHeight()/2)];
var R = 1.2*Math.sqrt( Math.pow(center[0],2)+Math.pow(center[1],2));

for(var i = 0 ; i < this.containers.length ; i++) {
var left = parseInt(dbWire.layer.containers[i].el.style.left.substr(0,dbWire.layer.containers[i].el.style.left.length-2),10);
var top = parseInt(dbWire.layer.containers[i].el.style.top.substr(0,dbWire.layer.containers[i].el.style.top.length-2),10);

var d = Math.sqrt( Math.pow(left-center[0],2)+Math.pow(top-center[1],2) );

var u = [ (left-center[0])/d, (top-center[1])/d];
YAHOO.util.Dom.setStyle(this.containers[i].el, "opacity", "0.8");

var myAnim = new WireIt.util.Anim(this.containers[i].terminals, this.containers[i].el, {
left: { to: center[0]+R*u[0] },
top: { to: center[1]+R*u[1] },
opacity: { to: 0, by: 0.05},
duration: 3
});
if(i == this.containers.length-1) {
myAnim.onComplete.subscribe(function() { this.clear(); callback.call(bind);}, this, true);
}
myAnim.animate();
}

}


};
7 changes: 7 additions & 0 deletions plugins/animations/README.md
@@ -0,0 +1,7 @@
# WireIt animations plugin


* Utility to provide Animation on any DOM element containing terminals

* clearExplode on Layer

99 changes: 99 additions & 0 deletions plugins/animations/examples/animation.html
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<html>
<head>
<title>WireIt Example, Move and Animate elements containing terminals</title>

<!-- YUI -->
<link rel="stylesheet" type="text/css" href="../lib/yui/fonts/fonts-min.css" />
<link rel="stylesheet" type="text/css" href="../lib/yui/reset/reset-min.css" />

<script type="text/javascript" src="../lib/yui/utilities/utilities.js"></script>

<!-- Excanvas -->
<!--[if IE]><script type="text/javascript" src="../lib/excanvas.js"></script><![endif]-->

<!-- WireIt -->
<script type="text/javascript" src="../js/WireIt.js"></script>
<script type="text/javascript" src="../js/CanvasElement.js"></script>
<script type="text/javascript" src="../js/Wire.js"></script>
<script type="text/javascript" src="../js/Terminal.js"></script>
<script type="text/javascript" src="../js/DD.js"></script>

<!-- Animations plugin -->
<script type="text/javascript" src="../js/Anim.js"></script>

<link rel="stylesheet" type="text/css" href="../css/WireIt.css" />

<style>

div.blockBox {
/* WireIt */
position: absolute;
z-index: 5;
opacity: 0.8;

/* Others */
width: 100px;
height: 100px;
background-color: rgb(255,200,200);
cursor: move;
}

</style>

<script>
window.onload = function() {

// Create 2 terminals into Block1
var block1 = YAHOO.util.Dom.get('block1');
var terminals1 = [new WireIt.Terminal(block1, {direction: [-1,0], offsetPosition: [-14,35]}),
new WireIt.Terminal(block1, {direction: [1,0], offsetPosition: [85,35]})];

// Make the block1 draggable
new WireIt.util.DD(terminals1,block1);

// Create 2 terminals into Block2
var block2 = YAHOO.util.Dom.get('block2');
var terminals2 = [new WireIt.Terminal(block2, {direction: [-1,0], offsetPosition: [-14,35]}),
new WireIt.Terminal(block2, {direction: [1,0], offsetPosition: [85,35]})];

// Make the block2 draggable
new WireIt.util.DD(terminals2,block2);

// Create a wire between some terminals
var w1 = new WireIt.Wire(terminals1[0], terminals2[0], document.body);
w1.redraw();

var w2 = new WireIt.Wire(terminals1[1], terminals2[1], document.body);
w2.redraw();

// Create the animations for both blocks using WireIt.util.Anim
var myAnim1 = new WireIt.util.Anim(terminals1, // same constructor except constructor takes the terminals as 1st parameter
block1, { left: { to: 500 }, top: {to: 150} }, 2, YAHOO.util.Easing.easeOut);
var myAnim2 = new WireIt.util.Anim(terminals2,
block2, { left: { to: 100 } }, 1, YAHOO.util.Easing.easeOut);

// OnClick on the button, launch both animations
YAHOO.util.Event.addListener('animButton','click', function() {
myAnim1.animate();
myAnim2.animate();
})
};


</script>

</head>
<body>

<p style="margin: 15px;"><a href="../index.html">&lt; Back</a></p>
<p style="margin: 15px;">Show usage of WireIt.util.DD and WireIt.util.Anim to make terminal containers draggable</p>

<button id='animButton' style="margin: 15px;">Click to animate !</button>

<div id='block1' class="blockBox" style="left: 300px; top: 100px;">Move Me !</div>

<div id='block2' class="blockBox" style="left: 500px; top: 200px;">Move Me !</div>

</body>
</html>
Empty file.
File renamed without changes.
34 changes: 34 additions & 0 deletions plugins/animations/js/Layer.js
@@ -0,0 +1,34 @@


/**
* Layer explosing animation
* @method clearExplode
*/
WireIt.Layer.prototype.clearExplode = function(callback, bind) {

var center = [ Math.floor(YAHOO.util.Dom.getViewportWidth()/2),
Math.floor(YAHOO.util.Dom.getViewportHeight()/2)];
var R = 1.2*Math.sqrt( Math.pow(center[0],2)+Math.pow(center[1],2));

for(var i = 0 ; i < this.containers.length ; i++) {
var left = parseInt(dbWire.layer.containers[i].el.style.left.substr(0,dbWire.layer.containers[i].el.style.left.length-2),10);
var top = parseInt(dbWire.layer.containers[i].el.style.top.substr(0,dbWire.layer.containers[i].el.style.top.length-2),10);

var d = Math.sqrt( Math.pow(left-center[0],2)+Math.pow(top-center[1],2) );

var u = [ (left-center[0])/d, (top-center[1])/d];
YAHOO.util.Dom.setStyle(this.containers[i].el, "opacity", "0.8");

var myAnim = new WireIt.util.Anim(this.containers[i].terminals, this.containers[i].el, {
left: { to: center[0]+R*u[0] },
top: { to: center[1]+R*u[1] },
opacity: { to: 0, by: 0.05},
duration: 3
});
if(i == this.containers.length-1) {
myAnim.onComplete.subscribe(function() { this.clear(); callback.call(bind);}, this, true);
}
myAnim.animate();
}

};
4 changes: 2 additions & 2 deletions plugins/composable/examples/jsBox/jsBox.html
Expand Up @@ -85,8 +85,8 @@
<script type="text/javascript" src="../../../../js/CanvasElement.js"></script>
<script type="text/javascript" src="../../../../js/Wire.js"></script>
<script type="text/javascript" src="../../../../js/Terminal.js"></script>
<script type="text/javascript" src="../../../../js/util/DD.js"></script>
<script type="text/javascript" src="../../../../js/util/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/DD.js"></script>
<script type="text/javascript" src="../../../../js/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/Container.js"></script>
<script type="text/javascript" src="../../../../js/Layer.js"></script>
<script type="text/javascript" src="../../../../js/LayerMap.js"></script>
Expand Down
8 changes: 4 additions & 4 deletions plugins/editor/examples/BPMN-editor/index.html
Expand Up @@ -112,7 +112,7 @@
<!-- InputEx with wirable options (WirableField-beta) -->
<script src="../../lib/inputex/js/inputex.js" type='text/javascript'></script>
<script src="../../lib/inputex/js/Field.js" type='text/javascript'></script>
<script type="text/javascript" src="../../js/util/inputex/WirableField-beta.js"></script>
<script type="text/javascript" src="../../js/inputex/WirableField-beta.js"></script>
<script src="../../lib/inputex/js/Group.js" type='text/javascript'></script>
<script src="../../lib/inputex/js/Visus.js" type='text/javascript'></script>
<script src="../../lib/inputex/js/fields/StringField.js" type='text/javascript'></script>
Expand All @@ -133,11 +133,11 @@
<script type="text/javascript" src="../../js/CanvasElement.js"></script>
<script type="text/javascript" src="../../js/Wire.js"></script>
<script type="text/javascript" src="../../js/Terminal.js"></script>
<script type="text/javascript" src="../../js/util/DD.js"></script>
<script type="text/javascript" src="../../js/util/DDResize.js"></script>
<script type="text/javascript" src="../../js/DD.js"></script>
<script type="text/javascript" src="../../js/DDResize.js"></script>
<script type="text/javascript" src="../../js/Container.js"></script>
<script type="text/javascript" src="../../js/Layer.js"></script>
<script type="text/javascript" src="../../js/util/inputex/FormContainer-beta.js"></script>
<script type="text/javascript" src="../../js/inputex/FormContainer-beta.js"></script>
<script type="text/javascript" src="../../js/LayerMap.js"></script>
<script type="text/javascript" src="../../js/BaseEditor.js"></script>
<script type="text/javascript" src="../../js/ModuleProxy.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions plugins/editor/examples/WiringEditor/index.html
Expand Up @@ -94,8 +94,8 @@
<script type="text/javascript" src="../../../../js/CanvasElement.js"></script>
<script type="text/javascript" src="../../../../js/Wire.js"></script>
<script type="text/javascript" src="../../../../js/Terminal.js"></script>
<script type="text/javascript" src="../../../../js/util/DD.js"></script>
<script type="text/javascript" src="../../../../js/util/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/DD.js"></script>
<script type="text/javascript" src="../../../../js/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/Container.js"></script>
<script type="text/javascript" src="../../../../js/Layer.js"></script>
<script type="text/javascript" src="../../../../js/LayerMap.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions plugins/editor/examples/WiringEditor/widget.html
Expand Up @@ -96,8 +96,8 @@
<script type="text/javascript" src="../../../../js/CanvasElement.js"></script>
<script type="text/javascript" src="../../../../js/Wire.js"></script>
<script type="text/javascript" src="../../../../js/Terminal.js"></script>
<script type="text/javascript" src="../../../../js/util/DD.js"></script>
<script type="text/javascript" src="../../../../js/util/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/DD.js"></script>
<script type="text/javascript" src="../../../../js/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/Container.js"></script>
<script type="text/javascript" src="../../../../js/Layer.js"></script>
<script type="text/javascript" src="../../../../js/LayerMap.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions plugins/editor/examples/ajaxAdapter/index.html
Expand Up @@ -95,8 +95,8 @@
<script type="text/javascript" src="../../../../js/CanvasElement.js"></script>
<script type="text/javascript" src="../../../../js/Wire.js"></script>
<script type="text/javascript" src="../../../../js/Terminal.js"></script>
<script type="text/javascript" src="../../../../js/util/DD.js"></script>
<script type="text/javascript" src="../../../../js/util/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/DD.js"></script>
<script type="text/javascript" src="../../../../js/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/Container.js"></script>
<script type="text/javascript" src="../../../../js/Layer.js"></script>
<script type="text/javascript" src="../../../../js/LayerMap.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions plugins/editor/examples/gearsAdapter/index.html
Expand Up @@ -94,8 +94,8 @@
<script type="text/javascript" src="../../../../js/CanvasElement.js"></script>
<script type="text/javascript" src="../../../../js/Wire.js"></script>
<script type="text/javascript" src="../../../../js/Terminal.js"></script>
<script type="text/javascript" src="../../../../js/util/DD.js"></script>
<script type="text/javascript" src="../../../../js/util/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/DD.js"></script>
<script type="text/javascript" src="../../../../js/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/Container.js"></script>
<script type="text/javascript" src="../../../../js/Layer.js"></script>
<script type="text/javascript" src="../../../../js/LayerMap.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions plugins/editor/examples/logicGates/index.html
Expand Up @@ -58,8 +58,8 @@
<script type="text/javascript" src="../../../../js/CanvasElement.js"></script>
<script type="text/javascript" src="../../../../js/Wire.js"></script>
<script type="text/javascript" src="../../../../js/Terminal.js"></script>
<script type="text/javascript" src="../../../../js/util/DD.js"></script>
<script type="text/javascript" src="../../../../js/util/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/DD.js"></script>
<script type="text/javascript" src="../../../../js/DDResize.js"></script>
<script type="text/javascript" src="../../../../js/Container.js"></script>
<script type="text/javascript" src="../../../../js/Layer.js"></script>
<script type="text/javascript" src="../../../../js/LayerMap.js"></script>
Expand Down

0 comments on commit 04c3e17

Please sign in to comment.