Merge pull request #5 from ScottDowne/updates

Updates
secretrobotron · Jan 5, 2012 · 901a0cc · 901a0cc
2 parents 4c1eeb3 + 1235ed6
commit 901a0cc
Show file tree

Hide file tree

Showing 8 changed files with 9,177 additions and 267 deletions.
diff --git a/index.html b/index.html
@@ -15,31 +15,13 @@
     <script>
 
       document.addEventListener('DOMContentLoaded', function (e) {
-        var duration = 10; // seconds
 
         var trackline = new TrackLiner({
           element: "container",
-          scale: 100, //pixels
-          duration: duration,
-          dynamicTrackCreation: true,
-          restrictToKnownPlugins: true,
+          dynamicTrackCreation: true
         });
-
-        trackline.createTrack('Should\'t Work').createTrackEvent( 'default', { start: 1, end: 5, label: 'awesome' } );
-        trackline.createTrack('Should Work 1', 'default').createTrackEvent( { start: 0, end: 2,
-          classes: ['test-class'],
-        });
-        trackline.createTrack('Should Work 2', 'default').createTrackEvent( 'default', { 
-          start: 4, 
-          end: 7,
-          css: {
-            font: '12pt Helvetica',
-            fontWeight: 'bold',
-            color: '#000',
-          },
-          label: 'LOL!',
-        });
-        trackline.createTrack();
+
+        trackline.addTrack( trackline.createTrack() );
 
         var elems = document.getElementsByClassName('droppable');
         for (var i=0; i<elems.length; ++i) {
@@ -64,11 +46,10 @@
     </style>
   </head>
   <body>
-    <div id="container" style="height: 50%;">
+    <div id="container" style="width: 100%; height: 50%;">
     </div>
     <div id="droppables">
-      <div class="droppable" data-trackliner-type="default">Should Work</div>
-      <div class="droppable" data-trackliner-type="default2">Shouldn't Work</div>
+      <div class="droppable">Drag me!</div>
     </div>
   </body>
 </html>
diff --git a/test/index.html b/test/index.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Popcorn API</title>
+  <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen">
+  <script src="../external/jquery.js"></script>
+  <script src="../external/jquery-ui.js"></script>
+  <link rel="stylesheet" type="text/css" href="../external/jquery-ui.css"/>
+
+  <script src="qunit/qunit.js"></script>
+
+  <link rel="stylesheet" href="../trackLiner.css" type="text/css" media="screen">
+  <script src="../trackLiner.js"></script>
+  <script src="trackliner.unit.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">
+    TrackLiner.js API
+  </h1>
+  <h2 id="qunit-banner"></h2>
+  <div id="qunit-testrunner-toolbar"></div>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <div id="qunit-fixture"></div>
+
+  <br />
+  <div id="container" style="width: 100%; height: 100px;"></div>
+  <div id="droppables">
+    <div class="droppable">Drag me!</div>
+  </div>
+
+</body>
+</html>