From 91fc13348b116ec477a5615373dcfb94c374b97d Mon Sep 17 00:00:00 2001
From: jos <wjosdejong@gmail.com>
Date: Tue, 22 Apr 2014 15:04:30 +0200
Subject: [PATCH] Disabled css transitions for now, needs some more work

---
 src/timeline/Timeline.js                |  6 ------
 src/timeline/component/ItemSet.js       |  4 ++--
 src/timeline/component/css/groupset.css | 19 -------------------
 src/timeline/component/css/item.css     |  8 ++++++--
 src/timeline/component/css/itemset.css  |  2 +-
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/timeline/Timeline.js b/src/timeline/Timeline.js
index 4c7f54ee..cf319aae 100644
--- a/src/timeline/Timeline.js
+++ b/src/timeline/Timeline.js
@@ -109,12 +109,6 @@ function Timeline (container, items, options) {
 
   // main panel (contains time axis and itemsets)
   var mainOptions = util.extend(Object.create(this.options), {
-    top: function () {
-      return (mainOptions.orientation == 'top') ? '0' : '';
-    },
-    bottom: function () {
-      return (mainOptions.orientation == 'top') ? '' : '0';
-    },
     left: function () {
       // we align left to enable a smooth resizing of the window
       return me.sidePanel.width;
diff --git a/src/timeline/component/ItemSet.js b/src/timeline/component/ItemSet.js
index c3415709..6ac1c0a2 100644
--- a/src/timeline/component/ItemSet.js
+++ b/src/timeline/component/ItemSet.js
@@ -378,8 +378,8 @@ ItemSet.prototype.repaint = function repaint() {
   this.dom.axis.style.right  = asSize(options.right, '');
   this.dom.axis.style.width  = asSize(options.width, '100%');
   this.dom.axis.style.height = asSize(0);
-  this.dom.axis.style.top    = (orientation == 'top') ? '0' : '';
-  this.dom.axis.style.bottom = (orientation == 'top') ? '' : '0';
+  this.dom.axis.style.top    = asSize((orientation == 'top') ? '0' : '');
+  this.dom.axis.style.bottom = asSize((orientation == 'top') ? '' : '0');
 
   return this._isResized();
 };
diff --git a/src/timeline/component/css/groupset.css b/src/timeline/component/css/groupset.css
index 2d03ae87..f500462e 100644
--- a/src/timeline/component/css/groupset.css
+++ b/src/timeline/component/css/groupset.css
@@ -1,23 +1,4 @@
 
-/* TODO: cleanup
-.vis.timeline .groupset {
-  position: relative;
-  padding: 0;
-  margin: 0;
-}
-
-.vis.timeline .labels {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-
-  padding: 0;
-  margin: 0;
-}
-*/
-
 .vis.timeline .labelset {
   position: relative;
   width: 100%;
diff --git a/src/timeline/component/css/item.css b/src/timeline/component/css/item.css
index 5d176738..68cc6d24 100644
--- a/src/timeline/component/css/item.css
+++ b/src/timeline/component/css/item.css
@@ -7,8 +7,10 @@
   display: inline-block;
   padding: 5px;
 
+  /* TODO: enable animations
   -webkit-transition: top .4s ease-in-out, bottom .4s ease-in-out;
   transition:         top .4s ease-in-out, bottom .4s ease-in-out;
+  */
 }
 
 .vis.timeline .item.selected {
@@ -88,8 +90,10 @@
   border-left-width: 1px;
   border-left-style: solid;
 
-  -webkit-transition: height .4s ease-in-out;
-  transition:         height .4s ease-in-out;
+  /* TODO: enable animations
+  -webkit-transition: height .4s ease-in-out, top .4s ease-in-out;
+  transition:         height .4s ease-in-out, top .4s ease-in-out;
+ */
 
   color: red;
 }
diff --git a/src/timeline/component/css/itemset.css b/src/timeline/component/css/itemset.css
index 4d21c747..f185baa4 100644
--- a/src/timeline/component/css/itemset.css
+++ b/src/timeline/component/css/itemset.css
@@ -7,7 +7,7 @@
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 
-  /* FIXME: get transoition working for rootpanel and itemset
+  /* FIXME: get transition working for rootpanel and itemset
   -webkit-transition: height 4s ease-in-out;
   transition:         height 4s ease-in-out;
   /**/