Merge pull request almende#283 from NickHardy/patch-2

josdejong · josdejong · commit c46b3a8a30a6 · 2014-04-16T15:59:59.000+02:00
Added some information about floatingRange
diff --git a/js/src/timeline/doc/index.html b/js/src/timeline/doc/index.html
@@ -289,14 +289,15 @@ <h3>Fields</h3>
     <tr>
         <td>start</td>
         <td>Date</td>
-        <td>yes</td>
+        <td>yes*</td>
         <td>
             The start date of the event, for example <code>new Date(2010,2,23)</code>.
             <br>
             <blockquote style="color: red; font-style: italic;">
                 Remark: Months in the JavaScript Date object are zero-based,<br>
                 so <code>new Date(2010,2,23)</code> represents 23th of March, 2010.
             </blockquote>
+			* If the type is set to floatingRange, the start is optional.
         </td>
     </tr>
     <tr>
@@ -364,7 +365,7 @@ <h3>Fields</h3>
         <td>type</td>
         <td>String</td>
         <td>no</td>
-        <td>Type of the event, optional. Available values: "box", "range", "dot".
+        <td>Type of the event, optional. Available values: "box", "range", "dot", "floatingRange".
             By default, the type is "range" for events having a start and end
             date, and "box" for events with a start date. This default can be
             overwritten by the global option "style".
diff --git a/js/src/timeline/examples/example30_floatingRange.html b/js/src/timeline/examples/example30_floatingRange.html
@@ -0,0 +1,73 @@
+<html>
+<head>
+    <title>Timeline demo</title>
+
+    <style type="text/css">
+        body {font: 10pt arial;}
+    </style>
+
+    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
+    <script type="text/javascript" src="../timeline.js"></script>
+    <link rel="stylesheet" type="text/css" href="../timeline.css">
+
+    <script type="text/javascript">
+        var timeline;
+
+        google.load("visualization", "1");
+
+        // Set callback to run when API is loaded
+        google.setOnLoadCallback(drawVisualization);
+
+        // Called when the Visualization API is loaded.
+        function drawVisualization() {
+            // Create and populate a data table.
+            var data = new google.visualization.DataTable();
+            data.addColumn('datetime', 'start');
+            data.addColumn('datetime', 'end');
+            data.addColumn('string', 'content');
+            data.addColumn('string', 'type');
+
+            data.addRows([
+                [new Date(2010,7,23), , 'Conversation<br>' +
+                        '<img src="img/comments-icon.png" style="width:32px; height:32px;">', 'box'],
+                [new Date(2010,7,23,23,0,0), , 'Mail from boss<br>' +
+                        '<img src="img/mail-icon.png" style="width:32px; height:32px;">', 'box'],
+                [new Date(2010,7,26), new Date(2010,8,2), 'Traject A (default range)', 'range'],
+                [ , new Date(2010,7,26), 'Traject B ( floatingRange no start date )', 'floatingRange'],
+                [new Date(2010,7,31), , 'Traject C ( floatingRange no end date )', 'floatingRange'],
+                [ , , 'Traject D ( floatingRange no start date and no end date )', 'floatingRange']
+            ]);
+
+            // specify options
+            var options = {
+                "width":  "100%",
+                "height": "300px",
+                'editable': true,   // enable dragging and editing events
+            };
+
+            // Instantiate our timeline object.
+            timeline = new links.Timeline(document.getElementById('mytimeline'));
+
+            // Draw our timeline with the created data and options
+            timeline.draw(data, options);
+        }
+    </script>
+</head>
+
+<body>
+<h1>Timeline floatingRange demo</h1>
+<p>
+    This demo shows how to use floatingRange items.
+	The start and end dates are optional in this type of range.
+</p>
+
+<div id="mytimeline"></div>
+
+<!-- Information about where the used icons come from -->
+<p style="color:gray; font-size:10px; font-style:italic;">
+    Icons by <a href="http://dryicons.com" target="_blank" title="Aesthetica 2 Icons by DryIcons" style="color:gray;" >DryIcons</a>
+    and <a href="http://www.tpdkdesign.net" target="_blank" title="Refresh Cl Icons by TpdkDesign.net" style="color:gray;" >TpdkDesign.net</a>
+</p>
+
+</body>
+</html>
