diff --git a/Jakefile.js b/Jakefile.js index 53945f6d..faef1289 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -36,21 +36,21 @@ task('build', {async: true}, function () { // concatenate and stringify the css files concat({ src: [ - './src/timeline/component/css/timeline.css', - './src/timeline/component/css/panel.css', - './src/timeline/component/css/labelset.css', - './src/timeline/component/css/itemset.css', - './src/timeline/component/css/item.css', - './src/timeline/component/css/timeaxis.css', - './src/timeline/component/css/currenttime.css', - './src/timeline/component/css/customtime.css', - './src/timeline/component/css/animation.css', - - './src/timeline/component/css/dataaxis.css', - './src/timeline/component/css/pathStyles.css', - - './src/network/css/network-manipulation.css', - './src/network/css/network-navigation.css' + './lib/timeline/component/css/timeline.css', + './lib/timeline/component/css/panel.css', + './lib/timeline/component/css/labelset.css', + './lib/timeline/component/css/itemset.css', + './lib/timeline/component/css/item.css', + './lib/timeline/component/css/timeaxis.css', + './lib/timeline/component/css/currenttime.css', + './lib/timeline/component/css/customtime.css', + './lib/timeline/component/css/animation.css', + + './lib/timeline/component/css/dataaxis.css', + './lib/timeline/component/css/pathStyles.css', + + './lib/network/css/network-manipulation.css', + './lib/network/css/network-navigation.css' ], dest: VIS_CSS, separator: '\n' @@ -61,66 +61,66 @@ task('build', {async: true}, function () { concat({ dest: VIS_TMP, src: [ - './src/module/imports.js', - - './src/shim.js', - './src/util.js', - './src/DOMutil.js', - './src/DataSet.js', - './src/DataView.js', - - './src/timeline/component/GraphGroup.js', - './src/timeline/component/Legend.js', - './src/timeline/component/DataAxis.js', - './src/timeline/component/LineGraph.js', - './src/timeline/DataStep.js', - - './src/timeline/Stack.js', - './src/timeline/TimeStep.js', - './src/timeline/Range.js', - './src/timeline/component/Component.js', - './src/timeline/component/TimeAxis.js', - './src/timeline/component/CurrentTime.js', - './src/timeline/component/CustomTime.js', - './src/timeline/component/ItemSet.js', - './src/timeline/component/item/*.js', - './src/timeline/component/Group.js', - './src/timeline/Timeline.js', - './src/timeline/Graph2d.js', - - './src/network/dotparser.js', - './src/network/shapes.js', - './src/network/Node.js', - './src/network/Edge.js', - './src/network/Popup.js', - './src/network/Groups.js', - './src/network/Images.js', - './src/network/networkMixins/physics/PhysicsMixin.js', - './src/network/networkMixins/physics/HierarchialRepulsion.js', - './src/network/networkMixins/physics/BarnesHut.js', - './src/network/networkMixins/physics/Repulsion.js', - './src/network/networkMixins/HierarchicalLayoutMixin.js', - './src/network/networkMixins/ManipulationMixin.js', - './src/network/networkMixins/SectorsMixin.js', - './src/network/networkMixins/ClusterMixin.js', - './src/network/networkMixins/SelectionMixin.js', - './src/network/networkMixins/NavigationMixin.js', - './src/network/networkMixins/MixinLoader.js', - './src/network/Network.js', - - './src/graph3d/Graph3d.js', - - './src/module/exports.js' + './lib/module/imports.js', + + './lib/shim.js', + './lib/util.js', + './lib/DOMutil.js', + './lib/DataSet.js', + './lib/DataView.js', + + './lib/timeline/component/GraphGroup.js', + './lib/timeline/component/Legend.js', + './lib/timeline/component/DataAxis.js', + './lib/timeline/component/LineGraph.js', + './lib/timeline/DataStep.js', + + './lib/timeline/Stack.js', + './lib/timeline/TimeStep.js', + './lib/timeline/Range.js', + './lib/timeline/component/Component.js', + './lib/timeline/component/TimeAxis.js', + './lib/timeline/component/CurrentTime.js', + './lib/timeline/component/CustomTime.js', + './lib/timeline/component/ItemSet.js', + './lib/timeline/component/item/*.js', + './lib/timeline/component/Group.js', + './lib/timeline/Timeline.js', + './lib/timeline/Graph2d.js', + + './lib/network/dotparser.js', + './lib/network/shapes.js', + './lib/network/Node.js', + './lib/network/Edge.js', + './lib/network/Popup.js', + './lib/network/Groups.js', + './lib/network/Images.js', + './lib/network/networkMixins/physics/PhysicsMixin.js', + './lib/network/networkMixins/physics/HierarchialRepulsion.js', + './lib/network/networkMixins/physics/BarnesHut.js', + './lib/network/networkMixins/physics/Repulsion.js', + './lib/network/networkMixins/HierarchicalLayoutMixin.js', + './lib/network/networkMixins/ManipulationMixin.js', + './lib/network/networkMixins/SectorsMixin.js', + './lib/network/networkMixins/ClusterMixin.js', + './lib/network/networkMixins/SelectionMixin.js', + './lib/network/networkMixins/NavigationMixin.js', + './lib/network/networkMixins/MixinLoader.js', + './lib/network/Network.js', + + './lib/graph3d/Graph3d.js', + + './lib/module/exports.js' ], separator: '\n' }); // copy images - wrench.copyDirSyncRecursive('./src/network/img', DIST + '/img/network', { + wrench.copyDirSyncRecursive('./lib/network/img', DIST + '/img/network', { forceDelete: true }); - wrench.copyDirSyncRecursive('./src/timeline/img', DIST + '/img/timeline', { + wrench.copyDirSyncRecursive('./lib/timeline/img', DIST + '/img/timeline', { forceDelete: true }); @@ -136,7 +136,7 @@ task('build', {async: true}, function () { } console.log("browserify",Date.now() - timeStart); timeStart = Date.now(); // add header and footer - var lib = read('./src/module/header.js') + code; + var lib = read('./lib/module/header.js') + code; // write bundled file write(VIS, lib); @@ -161,7 +161,7 @@ task('minify', {async: true}, function () { minify({ src: VIS, dest: VIS_MIN, - header: read('./src/module/header.js') + header: read('./lib/module/header.js') }); // update version number and stuff in the javascript files diff --git a/src/DOMutil.js b/lib/DOMutil.js similarity index 100% rename from src/DOMutil.js rename to lib/DOMutil.js diff --git a/src/DataSet.js b/lib/DataSet.js similarity index 100% rename from src/DataSet.js rename to lib/DataSet.js diff --git a/src/DataView.js b/lib/DataView.js similarity index 100% rename from src/DataView.js rename to lib/DataView.js diff --git a/src/graph3d/Graph3d.js b/lib/graph3d/Graph3d.js similarity index 100% rename from src/graph3d/Graph3d.js rename to lib/graph3d/Graph3d.js diff --git a/src/module/exports.js b/lib/module/exports.js similarity index 100% rename from src/module/exports.js rename to lib/module/exports.js diff --git a/src/module/header.js b/lib/module/header.js similarity index 100% rename from src/module/header.js rename to lib/module/header.js diff --git a/src/module/imports.js b/lib/module/imports.js similarity index 100% rename from src/module/imports.js rename to lib/module/imports.js diff --git a/src/network/Edge.js b/lib/network/Edge.js similarity index 100% rename from src/network/Edge.js rename to lib/network/Edge.js diff --git a/src/network/Groups.js b/lib/network/Groups.js similarity index 100% rename from src/network/Groups.js rename to lib/network/Groups.js diff --git a/src/network/Images.js b/lib/network/Images.js similarity index 100% rename from src/network/Images.js rename to lib/network/Images.js diff --git a/src/network/Network.js b/lib/network/Network.js similarity index 100% rename from src/network/Network.js rename to lib/network/Network.js diff --git a/src/network/Node.js b/lib/network/Node.js similarity index 100% rename from src/network/Node.js rename to lib/network/Node.js diff --git a/src/network/Popup.js b/lib/network/Popup.js similarity index 100% rename from src/network/Popup.js rename to lib/network/Popup.js diff --git a/src/network/css/network-manipulation.css b/lib/network/css/network-manipulation.css similarity index 100% rename from src/network/css/network-manipulation.css rename to lib/network/css/network-manipulation.css diff --git a/src/network/css/network-navigation.css b/lib/network/css/network-navigation.css similarity index 100% rename from src/network/css/network-navigation.css rename to lib/network/css/network-navigation.css diff --git a/src/network/dotparser.js b/lib/network/dotparser.js similarity index 100% rename from src/network/dotparser.js rename to lib/network/dotparser.js diff --git a/src/network/img/acceptDeleteIcon.png b/lib/network/img/acceptDeleteIcon.png similarity index 100% rename from src/network/img/acceptDeleteIcon.png rename to lib/network/img/acceptDeleteIcon.png diff --git a/src/network/img/addNodeIcon.png b/lib/network/img/addNodeIcon.png similarity index 100% rename from src/network/img/addNodeIcon.png rename to lib/network/img/addNodeIcon.png diff --git a/src/network/img/backIcon.png b/lib/network/img/backIcon.png similarity index 100% rename from src/network/img/backIcon.png rename to lib/network/img/backIcon.png diff --git a/src/network/img/connectIcon.png b/lib/network/img/connectIcon.png similarity index 100% rename from src/network/img/connectIcon.png rename to lib/network/img/connectIcon.png diff --git a/src/network/img/cross.png b/lib/network/img/cross.png similarity index 100% rename from src/network/img/cross.png rename to lib/network/img/cross.png diff --git a/src/network/img/cross2.png b/lib/network/img/cross2.png similarity index 100% rename from src/network/img/cross2.png rename to lib/network/img/cross2.png diff --git a/src/network/img/deleteIcon.png b/lib/network/img/deleteIcon.png similarity index 100% rename from src/network/img/deleteIcon.png rename to lib/network/img/deleteIcon.png diff --git a/src/network/img/downArrow.png b/lib/network/img/downArrow.png similarity index 100% rename from src/network/img/downArrow.png rename to lib/network/img/downArrow.png diff --git a/src/network/img/editIcon.png b/lib/network/img/editIcon.png similarity index 100% rename from src/network/img/editIcon.png rename to lib/network/img/editIcon.png diff --git a/src/network/img/leftArrow.png b/lib/network/img/leftArrow.png similarity index 100% rename from src/network/img/leftArrow.png rename to lib/network/img/leftArrow.png diff --git a/src/network/img/minus.png b/lib/network/img/minus.png similarity index 100% rename from src/network/img/minus.png rename to lib/network/img/minus.png diff --git a/src/network/img/plus.png b/lib/network/img/plus.png similarity index 100% rename from src/network/img/plus.png rename to lib/network/img/plus.png diff --git a/src/network/img/rightArrow.png b/lib/network/img/rightArrow.png similarity index 100% rename from src/network/img/rightArrow.png rename to lib/network/img/rightArrow.png diff --git a/src/network/img/upArrow.png b/lib/network/img/upArrow.png similarity index 100% rename from src/network/img/upArrow.png rename to lib/network/img/upArrow.png diff --git a/src/network/img/zoomExtends.png b/lib/network/img/zoomExtends.png similarity index 100% rename from src/network/img/zoomExtends.png rename to lib/network/img/zoomExtends.png diff --git a/src/network/networkMixins/ClusterMixin.js b/lib/network/networkMixins/ClusterMixin.js similarity index 100% rename from src/network/networkMixins/ClusterMixin.js rename to lib/network/networkMixins/ClusterMixin.js diff --git a/src/network/networkMixins/HierarchicalLayoutMixin.js b/lib/network/networkMixins/HierarchicalLayoutMixin.js similarity index 100% rename from src/network/networkMixins/HierarchicalLayoutMixin.js rename to lib/network/networkMixins/HierarchicalLayoutMixin.js diff --git a/src/network/networkMixins/ManipulationMixin.js b/lib/network/networkMixins/ManipulationMixin.js similarity index 100% rename from src/network/networkMixins/ManipulationMixin.js rename to lib/network/networkMixins/ManipulationMixin.js diff --git a/src/network/networkMixins/MixinLoader.js b/lib/network/networkMixins/MixinLoader.js similarity index 100% rename from src/network/networkMixins/MixinLoader.js rename to lib/network/networkMixins/MixinLoader.js diff --git a/src/network/networkMixins/NavigationMixin.js b/lib/network/networkMixins/NavigationMixin.js similarity index 100% rename from src/network/networkMixins/NavigationMixin.js rename to lib/network/networkMixins/NavigationMixin.js diff --git a/src/network/networkMixins/SectorsMixin.js b/lib/network/networkMixins/SectorsMixin.js similarity index 100% rename from src/network/networkMixins/SectorsMixin.js rename to lib/network/networkMixins/SectorsMixin.js diff --git a/src/network/networkMixins/SelectionMixin.js b/lib/network/networkMixins/SelectionMixin.js similarity index 100% rename from src/network/networkMixins/SelectionMixin.js rename to lib/network/networkMixins/SelectionMixin.js diff --git a/src/network/networkMixins/physics/BarnesHut.js b/lib/network/networkMixins/physics/BarnesHut.js similarity index 100% rename from src/network/networkMixins/physics/BarnesHut.js rename to lib/network/networkMixins/physics/BarnesHut.js diff --git a/src/network/networkMixins/physics/HierarchialRepulsion.js b/lib/network/networkMixins/physics/HierarchialRepulsion.js similarity index 100% rename from src/network/networkMixins/physics/HierarchialRepulsion.js rename to lib/network/networkMixins/physics/HierarchialRepulsion.js diff --git a/src/network/networkMixins/physics/PhysicsMixin.js b/lib/network/networkMixins/physics/PhysicsMixin.js similarity index 100% rename from src/network/networkMixins/physics/PhysicsMixin.js rename to lib/network/networkMixins/physics/PhysicsMixin.js diff --git a/src/network/networkMixins/physics/Repulsion.js b/lib/network/networkMixins/physics/Repulsion.js similarity index 100% rename from src/network/networkMixins/physics/Repulsion.js rename to lib/network/networkMixins/physics/Repulsion.js diff --git a/src/network/shapes.js b/lib/network/shapes.js similarity index 100% rename from src/network/shapes.js rename to lib/network/shapes.js diff --git a/src/shim.js b/lib/shim.js similarity index 100% rename from src/shim.js rename to lib/shim.js diff --git a/src/timeline/DataStep.js b/lib/timeline/DataStep.js similarity index 100% rename from src/timeline/DataStep.js rename to lib/timeline/DataStep.js diff --git a/src/timeline/Graph2d.js b/lib/timeline/Graph2d.js similarity index 100% rename from src/timeline/Graph2d.js rename to lib/timeline/Graph2d.js diff --git a/src/timeline/Range.js b/lib/timeline/Range.js similarity index 100% rename from src/timeline/Range.js rename to lib/timeline/Range.js diff --git a/src/timeline/Stack.js b/lib/timeline/Stack.js similarity index 100% rename from src/timeline/Stack.js rename to lib/timeline/Stack.js diff --git a/src/timeline/TimeStep.js b/lib/timeline/TimeStep.js similarity index 100% rename from src/timeline/TimeStep.js rename to lib/timeline/TimeStep.js diff --git a/src/timeline/Timeline.js b/lib/timeline/Timeline.js similarity index 100% rename from src/timeline/Timeline.js rename to lib/timeline/Timeline.js diff --git a/src/timeline/component/Component.js b/lib/timeline/component/Component.js similarity index 100% rename from src/timeline/component/Component.js rename to lib/timeline/component/Component.js diff --git a/src/timeline/component/CurrentTime.js b/lib/timeline/component/CurrentTime.js similarity index 100% rename from src/timeline/component/CurrentTime.js rename to lib/timeline/component/CurrentTime.js diff --git a/src/timeline/component/CustomTime.js b/lib/timeline/component/CustomTime.js similarity index 100% rename from src/timeline/component/CustomTime.js rename to lib/timeline/component/CustomTime.js diff --git a/src/timeline/component/DataAxis.js b/lib/timeline/component/DataAxis.js similarity index 100% rename from src/timeline/component/DataAxis.js rename to lib/timeline/component/DataAxis.js diff --git a/src/timeline/component/GraphGroup.js b/lib/timeline/component/GraphGroup.js similarity index 100% rename from src/timeline/component/GraphGroup.js rename to lib/timeline/component/GraphGroup.js diff --git a/src/timeline/component/Group.js b/lib/timeline/component/Group.js similarity index 100% rename from src/timeline/component/Group.js rename to lib/timeline/component/Group.js diff --git a/src/timeline/component/ItemSet.js b/lib/timeline/component/ItemSet.js similarity index 100% rename from src/timeline/component/ItemSet.js rename to lib/timeline/component/ItemSet.js diff --git a/src/timeline/component/Legend.js b/lib/timeline/component/Legend.js similarity index 100% rename from src/timeline/component/Legend.js rename to lib/timeline/component/Legend.js diff --git a/src/timeline/component/LineGraph.js b/lib/timeline/component/LineGraph.js similarity index 100% rename from src/timeline/component/LineGraph.js rename to lib/timeline/component/LineGraph.js diff --git a/src/timeline/component/TimeAxis.js b/lib/timeline/component/TimeAxis.js similarity index 100% rename from src/timeline/component/TimeAxis.js rename to lib/timeline/component/TimeAxis.js diff --git a/src/timeline/component/css/animation.css b/lib/timeline/component/css/animation.css similarity index 100% rename from src/timeline/component/css/animation.css rename to lib/timeline/component/css/animation.css diff --git a/src/timeline/component/css/currenttime.css b/lib/timeline/component/css/currenttime.css similarity index 100% rename from src/timeline/component/css/currenttime.css rename to lib/timeline/component/css/currenttime.css diff --git a/src/timeline/component/css/customtime.css b/lib/timeline/component/css/customtime.css similarity index 100% rename from src/timeline/component/css/customtime.css rename to lib/timeline/component/css/customtime.css diff --git a/src/timeline/component/css/dataaxis.css b/lib/timeline/component/css/dataaxis.css similarity index 100% rename from src/timeline/component/css/dataaxis.css rename to lib/timeline/component/css/dataaxis.css diff --git a/src/timeline/component/css/item.css b/lib/timeline/component/css/item.css similarity index 100% rename from src/timeline/component/css/item.css rename to lib/timeline/component/css/item.css diff --git a/src/timeline/component/css/itemset.css b/lib/timeline/component/css/itemset.css similarity index 100% rename from src/timeline/component/css/itemset.css rename to lib/timeline/component/css/itemset.css diff --git a/src/timeline/component/css/labelset.css b/lib/timeline/component/css/labelset.css similarity index 100% rename from src/timeline/component/css/labelset.css rename to lib/timeline/component/css/labelset.css diff --git a/src/timeline/component/css/panel.css b/lib/timeline/component/css/panel.css similarity index 100% rename from src/timeline/component/css/panel.css rename to lib/timeline/component/css/panel.css diff --git a/src/timeline/component/css/pathStyles.css b/lib/timeline/component/css/pathStyles.css similarity index 100% rename from src/timeline/component/css/pathStyles.css rename to lib/timeline/component/css/pathStyles.css diff --git a/src/timeline/component/css/timeaxis.css b/lib/timeline/component/css/timeaxis.css similarity index 100% rename from src/timeline/component/css/timeaxis.css rename to lib/timeline/component/css/timeaxis.css diff --git a/src/timeline/component/css/timeline.css b/lib/timeline/component/css/timeline.css similarity index 100% rename from src/timeline/component/css/timeline.css rename to lib/timeline/component/css/timeline.css diff --git a/src/timeline/component/item/Item.js b/lib/timeline/component/item/Item.js similarity index 100% rename from src/timeline/component/item/Item.js rename to lib/timeline/component/item/Item.js diff --git a/src/timeline/component/item/ItemBox.js b/lib/timeline/component/item/ItemBox.js similarity index 100% rename from src/timeline/component/item/ItemBox.js rename to lib/timeline/component/item/ItemBox.js diff --git a/src/timeline/component/item/ItemPoint.js b/lib/timeline/component/item/ItemPoint.js similarity index 100% rename from src/timeline/component/item/ItemPoint.js rename to lib/timeline/component/item/ItemPoint.js diff --git a/src/timeline/component/item/ItemRange.js b/lib/timeline/component/item/ItemRange.js similarity index 100% rename from src/timeline/component/item/ItemRange.js rename to lib/timeline/component/item/ItemRange.js diff --git a/src/timeline/img/delete.png b/lib/timeline/img/delete.png similarity index 100% rename from src/timeline/img/delete.png rename to lib/timeline/img/delete.png diff --git a/src/util.js b/lib/util.js similarity index 100% rename from src/util.js rename to lib/util.js diff --git a/test/dotparser.js b/test/dotparser.js index 48832813..823dac1b 100644 --- a/test/dotparser.js +++ b/test/dotparser.js @@ -1,6 +1,6 @@ var assert = require('assert'), fs = require('fs'), - dot = require('../src/network/dotparser.js'); + dot = require('../lib/network/dotparser.js'); fs.readFile('test/dot.txt', function (err, data) { data = String(data);