Merge branch 'devel'

wtsi-npg · Apr 1, 2015 · deb7858 · deb7858
2 parents b87ef53 + c9fde2d
commit deb7858
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 22,207 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory":"js/lib"
+}
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *~
-*.DS_Store
+*.DS_Store
+js/lib
diff --git a/.travis.yml b/.travis.yml
@@ -1,2 +1,8 @@
+language: node_js
+node_js :
+ - "0.12"
+before_script:
+ - npm install -g bower
+ - bower install
 script: phantomjs js/run-qunit.js test.html
 
diff --git a/README.md b/README.md
@@ -3,19 +3,24 @@ bcviz
 
 D3 based JavaScript visualisation for bamcheck file format
 
+Requires bower to install package dependencies.
 
 Creating and running demo:
 --------------------------
 
 1. Navigate to bcviz directory in terminal
 
+2. Execute bower to install dependencies:
+
+    bower install
+
 3. Start a localhost server in the directory using python:
 
-	python -m SimpleHTTPServer 8888 &
+    python -m SimpleHTTPServer 8888 &
 
 4. In your browser go to: 
-	
-	http://localhost:8888/
+
+    http://localhost:8888/
 
 Running tests:
 --------------

diff --git a/bower.json b/bower.json
@@ -0,0 +1,19 @@
+{
+  "name": "bcviz",
+  "dependencies":{
+    "jquery":"2.0.3",
+    "d3":"3.2.8",
+    "requirejs":"2.1.8"
+  },
+  "devDependencies":{
+    "qunit":"1.15.0"
+  },
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}
diff --git a/demo/demo.py b/demo/demo.py
@@ -27,8 +27,8 @@
     <head>
         <meta charset="utf-8">
         <title>Bamcheck demo</title>
-        <link rel="stylesheet" type="text/css" href="css/bcviz.css">
-        <script data-main="main" src="js/lib/require.js"></script>
+        <link rel="stylesheet" type="text/css" href="/css/bcviz.css">
+        <script data-main="main" src="/js/lib/requirejs/require.js"></script>
     </head>
     <body>
         <div id="instructions">
@@ -47,8 +47,8 @@
     baseUrl: '/js',
 
     paths: {
-        jquery: 'lib/jquery-2.0.3',
-        d3: 'lib/d3'
+        jquery: 'lib/jquery/jquery',
+        d3: 'lib/d3/d3'
     },
     shim: {
         d3: {

diff --git a/index.html b/index.html
@@ -3,11 +3,11 @@
     <head>
         <meta charset="utf-8">
         <title>bcviz Test Suite</title>
-        <link rel="stylesheet" type="text/css" href="css/qunit-1.15.0.css">
+        <link rel="stylesheet" type="text/css" href="js/lib/qunit/qunit/qunit.css">
         <link rel="stylesheet" type="text/css" href="css/bcviz.css">
     </head>
     <body>
-		<div id="qunit"></div>
+		<div id="qunit"></div> 
 		<div id="qunit-fixture"></div>
 		<br/><br/>
 
@@ -28,6 +28,6 @@
 
 		</div>
 
-		<script data-main="test/main" src="js/lib/require.js"></script>
+		<script data-main="test/main" src="js/lib/requirejs/require.js"></script>
     </body>
 </html>