Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Dia v2 #175

Merged
merged 21 commits into from
Aug 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
13b1133
Dia: code tidy up mostly cosmetic changes
gokmen Jul 29, 2017
42d4d57
Dia: update z-index on interaction to bring front most recent used dia
gokmen Jul 29, 2017
4baae1d
Dia: simplify getJointPos flow with canvas position diff improvement
gokmen Jul 29, 2017
2695ae2
DiaScene: addContainer: to return container and create canvas first
gokmen Jul 29, 2017
a15fe77
DiaScene: guessJoint: to handle more possibilities between nodes
gokmen Jul 29, 2017
56d9755
DiaScene: improvements on deleteConnection, allowedToConnect and joints
gokmen Jul 29, 2017
6863730
DiaScene: drawConnectionLine improvements
gokmen Jul 29, 2017
d115da9
DiaScene: include z-index as in scene attributes
gokmen Jul 29, 2017
9dfb86c
DiaScene: getBezierCurves for getting position for given t as described
gokmen Jul 29, 2017
16ce9d4
DiaScene: addTransfer: new method to keep transfer data between nodes
gokmen Jul 29, 2017
abf6427
DiaScene: draw transfers while drawingLines on update
gokmen Jul 29, 2017
2b6cdf0
DiaScene: updateScene improvements with autoUpdate and other helpers
gokmen Jul 29, 2017
4410fab
Package.json: updates for npm5, clean-css argument change, add lock file
gokmen Jul 31, 2017
cd96c64
Examples: move examples to their subfolders for now
gokmen Jul 31, 2017
1cdde65
kd.Object: remove outdated chain method
gokmen Aug 1, 2017
ab33609
DiaScene: don’t allow to stopAutoUpdate if it has active transfer
gokmen Aug 1, 2017
05d4e12
Dia: dumpScene to get a whole object for the scene
gokmen Aug 1, 2017
6bbdd82
Makefile: add build step messages
gokmen Aug 1, 2017
7e89060
DiaContainer: z-index on containers should remain as is
gokmen Aug 1, 2017
3d7289e
Examples: Dia examples added
gokmen Aug 1, 2017
0623923
Package: version bump, add package-lock for faster npm install
gokmen Aug 2, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build
dist
bundle.js
coverage
examples/kd.*
24 changes: 11 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,14 @@ development: $(TARGETS)
}); \
});"

example: watch-example
@$(BIN)/serve

watch-example:
@$(BIN)/watchify \
-v \
-g coffeeify \
--extension=".coffee" \
--outfile example/bundle.js \
--debug \
example/index.js &
example: dist
@echo ' - Running example server...'
@cp ./dist/kd.js examples/
@cp ./dist/kd.css examples/
@$(BIN)/serve examples -o

js:
@echo ' - Browserify and Uglify...'
@$(BIN)/browserify \
-g coffeeify \
--extension=".coffee" \
Expand All @@ -67,18 +62,21 @@ js:
-o kd.min.js

css:
@echo ' - Stylus and clean-css...'
@$(BIN)/stylus \
--include-css \
--print \
lib/styles/index.styl \
| $(BIN)/cleancss \
--s0 \
--output kd.css
-O0 \
-o kd.css

clean: clean_dist
@rm -fr build

clean_dist:
@echo ' - Cleanup...'
@rm -fr dist
@rm -f examples/kd.*

.PHONY: example dist
107 changes: 107 additions & 0 deletions examples/dia/dia.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
var main = new kd.View()
main.appendToDomBody()

var scene = new kd.DiaScene({
cssClass: 'main-scene',
})

scene.addContainer(
(container1 = new kd.DiaContainer({
cssClass: 'container-1',
draggable: true,
partial: 'drag me',
})),
{ x: 60, y: 60 }
)

scene.addContainer(
(container2 = new kd.DiaContainer({
cssClass: 'container-2',
draggable: true,
partial: 'drag me',
})),
{ x: 500, y: 100 }
)

var circle1 = container1.addDia(
new kd.DiaObject({
cssClass: 'circle',
partial: 'drag me',
}),
{ x: 20, y: 20 }
)

var circle2 = container2.addDia(
new kd.DiaObject({
cssClass: 'circle',
partial: 'drag me',
}),
{ x: 20, y: 20 }
)

var square1 = container1.addDia(
new kd.DiaObject({
cssClass: 'square',
partial: 'drag me',
}),
{ x: 100, y: 100 }
)

var square2 = container2.addDia(
new kd.DiaObject({
cssClass: 'square',
partial: 'drag me',
}),
{ x: 100, y: 100 }
)

var connection1 = scene.connect(
{ dia: circle1, joint: 'right' },
{ dia: circle2, joint: 'left' }
)

var connection2 = scene.connect(
{ dia: square1, joint: 'right' },
{ dia: square2, joint: 'left' }
)

var transfer1, transfer2

function startTransfer1() {
transfer1 = scene.addTransfer(connection1, {
text: 'ping',
duration: 3000,
color: 'blue',
})
scene.once(`Transfer-${transfer1}-Done`, () => {
transfer1 = scene.addTransfer(connection1, {
text: 'pong',
duration: 3000,
color: 'green',
reverse: true,
})
scene.once(`Transfer-${transfer1}-Done`, startTransfer1)
})
}

function startTransfer2() {
transfer2 = scene.addTransfer(connection2, {
duration: 1000,
size: 4,
color: 'red',
})
scene.on(`Transfer-${transfer2}-Done`, () => {
transfer2 = scene.addTransfer(connection2, {
size: 4,
duration: 1000,
color: 'blue',
reverse: true,
})
scene.once(`Transfer-${transfer2}-Done`, startTransfer2)
})
}

startTransfer1()
startTransfer2()

main.addSubView(scene)
25 changes: 25 additions & 0 deletions examples/dia/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>kd.js Examples - dia</title>
<link rel="stylesheet" href="../kd.css">
<script src="../kd.js"></script>
<style type="text/css">
body {
font-family: Roboto, -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", sans-serif;
font-size: 12px;
}
.main-scene {
width: 100vw;
height: 100vh;
}
.container-1, .container-2 {
background: #eee;
}
</style>
</head>
<body>
<script src="dia.js"></script>
</body>
</html>
2 changes: 0 additions & 2 deletions examples/drag.js → examples/drag/drag.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
var kd = require('../lib/index')

var main = new kd.View({ cssClass: 'lobilo' })
main.appendToDomBody()

Expand Down
8 changes: 4 additions & 4 deletions examples/drag.html → examples/drag/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Document</title>
<link rel="stylesheet" href="/dist/kd.css">
<title>kd.js Examples - drag</title>
<link rel="stylesheet" href="../kd.css">
<style>
body, html {
margin: 0;
Expand Down Expand Up @@ -34,9 +34,9 @@
height: 50px;
}
</style>
<script src="../kd.js"></script>
</head>
<body>

<script src="/example/bundle.js"></script>
<script src="drag.js"></script>
</body>
</html>
60 changes: 60 additions & 0 deletions examples/flex/flex.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
var main = new kd.View()
main.appendToDomBody()

var flex = new kd.FlexSplit({
cssClass: 'mainview',
resizable: true,
type: kd.Flex.VERTICAL,
views: [
new kd.FlexSplit({
sizes: [40, 60],
views: [
new kd.View({ partial: 'left top' }),
new kd.View({ partial: 'left bottom' }),
],
}),
new kd.FlexSplit({
sizes: [20, 80],
views: [
new kd.View({ partial: 'right top' }),
new kd.View({ partial: 'right bottom' }),
],
}),
],
})

var input = new kd.InputView()
var form = new kd.View()

form.addSubView(input)
form.addSubView(
new kd.ButtonView({
title: "i'm a button. type in your name and click on me",
callback: function() {
alert('sup ' + input.getValue())
},
})
)

var tabs = new kd.TabView({
hideHandleCloseIcons: true,
attributes: {
style: 'height: 100vh',
},
paneData: [
{
title: 'tab1',
partial: "that's me, tab1",
},
{
title: 'form',
view: form,
},
{
title: 'flex split',
view: flex,
},
],
})

main.addSubView(tabs)
12 changes: 12 additions & 0 deletions examples/flex/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>kd.js Examples - flex</title>
<link rel="stylesheet" href="../kd.css">
<script src="../kd.js"></script>
</head>
<body>
<script src="flex.js"></script>
</body>
</html>
12 changes: 0 additions & 12 deletions examples/index.html

This file was deleted.

60 changes: 0 additions & 60 deletions examples/index.js

This file was deleted.

Loading