vis-rails 0.0.4 → 0.0.5

data/vendor/assets/vis/timeline/component/item/ItemRangeOverflow.js

@@ -16,6 +16,22 @@ function ItemRangeOverflow (parent, data, options, defaultOptions) {
     }
   };
 
+  // define a private property _width, which is the with of the range box
+  // adhering to the ranges start and end date. The property width has a
+  // getter which returns the max of border width and content width
+  this._width = 0;
+  Object.defineProperty(this, 'width', {
+    get: function () {
+      return (this.props.content && this._width < this.props.content.width) ?
+          this.props.content.width :
+          this._width;
+    },
+
+    set: function (width) {
+      this._width = width;
+    }
+  });
+
   ItemRange.call(this, parent, data, options, defaultOptions);
 }
 
@@ -62,13 +78,18 @@ ItemRangeOverflow.prototype.repaint = function repaint() {
         dom.content.innerHTML = this.content;
       }
       else {
-        throw new Error('Property "content" missing in item ' + this.data.id);
+        throw new Error('Property "content" missing in item ' + this.id);
       }
       changed = true;
     }
 
+    this._repaintDeleteButton(dom.box);
+    this._repaintDragLeft();
+    this._repaintDragRight();
+
     // update class
-    var className = this.data.className ? (' ' + this.data.className) : '';
+    var className = (this.data.className? ' ' + this.data.className : '') +
+        (this.selected ? ' selected' : '');
     if (this.className != className) {
       this.className = className;
       dom.box.className = 'item rangeoverflow' + className;
@@ -80,12 +101,19 @@ ItemRangeOverflow.prototype.repaint = function repaint() {
 };
 
 /**
- * Return the items width
- * @return {Number} width
+ * Reposition the item, recalculate its left, top, and width, using the current
+ * range and size of the items itemset
+ * @override
  */
-ItemRangeOverflow.prototype.getWidth = function getWidth() {
-  if (this.props.content !== undefined && this.width < this.props.content.width)
-    return this.props.content.width;
-  else
-    return this.width;
+ItemRangeOverflow.prototype.reposition = function reposition() {
+  var dom = this.dom,
+      props = this.props;
+
+  if (dom) {
+    dom.box.style.top = this.top + 'px';
+    dom.box.style.left = this.left + 'px';
+    dom.box.style.width = this._width + 'px';
+
+    dom.content.style.left = props.content.left + 'px';
+  }
 };

data/vendor/assets/vis/util.js

@@ -533,21 +533,6 @@ util.getTarget = function getTarget(event) {
   return target;
 };
 
-/**
- * Stop event propagation
- */
-util.stopPropagation = function stopPropagation(event) {
-  if (!event)
-    event = window.event;
-
-  if (event.stopPropagation) {
-    event.stopPropagation();  // non-IE browsers
-  }
-  else {
-    event.cancelBubble = true;  // IE browsers
-  }
-};
-
 /**
  * Fake a hammer.js gesture. Event can be a ScrollEvent or MouseMoveEvent
  * @param {Element} element
@@ -557,28 +542,23 @@ util.fakeGesture = function fakeGesture (element, event) {
   var eventType = null;
 
   // for hammer.js 1.0.5
-  //return Hammer.event.collectEventData(this, eventType, event);
+  // var gesture = Hammer.event.collectEventData(this, eventType, event);
 
   // for hammer.js 1.0.6
   var touches = Hammer.event.getTouchList(event, eventType);
-  return Hammer.event.collectEventData(this, eventType, touches, event);
-};
-
-/**
- * Cancels the event if it is cancelable, without stopping further propagation of the event.
- */
-util.preventDefault = function preventDefault (event) {
-  if (!event)
-    event = window.event;
+  var gesture = Hammer.event.collectEventData(this, eventType, touches, event);
 
-  if (event.preventDefault) {
-    event.preventDefault();  // non-IE browsers
+  // on IE in standards mode, no touches are recognized by hammer.js,
+  // resulting in NaN values for center.pageX and center.pageY
+  if (isNaN(gesture.center.pageX)) {
+    gesture.center.pageX = event.pageX;
   }
-  else {
-    event.returnValue = false;  // IE browsers
+  if (isNaN(gesture.center.pageY)) {
+    gesture.center.pageY = event.pageY;
   }
-};
 
+  return gesture;
+};
 
 util.option = {};
 
@@ -671,3 +651,162 @@ util.option.asElement = function (value, defaultValue) {
 
   return value || defaultValue || null;
 };
+
+
+
+util.GiveDec = function GiveDec(Hex)
+{
+  if(Hex == "A")
+    Value = 10;
+  else
+  if(Hex == "B")
+    Value = 11;
+  else
+  if(Hex == "C")
+    Value = 12;
+  else
+  if(Hex == "D")
+    Value = 13;
+  else
+  if(Hex == "E")
+    Value = 14;
+  else
+  if(Hex == "F")
+    Value = 15;
+  else
+    Value = eval(Hex)
+  return Value;
+}
+
+util.GiveHex = function GiveHex(Dec)
+{
+  if(Dec == 10)
+    Value = "A";
+  else
+  if(Dec == 11)
+    Value = "B";
+  else
+  if(Dec == 12)
+    Value = "C";
+  else
+  if(Dec == 13)
+    Value = "D";
+  else
+  if(Dec == 14)
+    Value = "E";
+  else
+  if(Dec == 15)
+    Value = "F";
+  else
+    Value = "" + Dec;
+  return Value;
+}
+
+/**
+ * http://www.yellowpipe.com/yis/tools/hex-to-rgb/color-converter.php
+ *
+ * @param {String} hex
+ * @returns {{r: *, g: *, b: *}}
+ */
+util.hexToRGB = function hexToRGB(hex) {
+  hex = hex.replace("#","").toUpperCase();
+
+  var a = util.GiveDec(hex.substring(0, 1));
+  var b = util.GiveDec(hex.substring(1, 2));
+  var c = util.GiveDec(hex.substring(2, 3));
+  var d = util.GiveDec(hex.substring(3, 4));
+  var e = util.GiveDec(hex.substring(4, 5));
+  var f = util.GiveDec(hex.substring(5, 6));
+
+  var r = (a * 16) + b;
+  var g = (c * 16) + d;
+  var b = (e * 16) + f;
+
+  return {r:r,g:g,b:b};
+};
+
+util.RGBToHex = function RGBToHex(red,green,blue) {
+  var a = util.GiveHex(Math.floor(red / 16));
+  var b = util.GiveHex(red % 16);
+  var c = util.GiveHex(Math.floor(green / 16));
+  var d = util.GiveHex(green % 16);
+  var e = util.GiveHex(Math.floor(blue / 16));
+  var f = util.GiveHex(blue % 16);
+
+  var hex = a + b + c + d + e + f;
+  return "#" + hex;
+};
+
+
+/**
+ * http://www.javascripter.net/faq/rgb2hsv.htm
+ *
+ * @param red
+ * @param green
+ * @param blue
+ * @returns {*}
+ * @constructor
+ */
+util.RGBToHSV = function  RGBToHSV (red,green,blue) {
+  red=red/255; green=green/255; blue=blue/255;
+  var minRGB = Math.min(red,Math.min(green,blue));
+  var maxRGB = Math.max(red,Math.max(green,blue));
+
+  // Black-gray-white
+  if (minRGB == maxRGB) {
+    return {h:0,s:0,v:minRGB};
+  }
+
+  // Colors other than black-gray-white:
+  var d = (red==minRGB) ? green-blue : ((blue==minRGB) ? red-green : blue-red);
+  var h = (red==minRGB) ? 3 : ((blue==minRGB) ? 1 : 5);
+  var hue = 60*(h - d/(maxRGB - minRGB))/360;
+  var saturation = (maxRGB - minRGB)/maxRGB;
+  var value = maxRGB;
+  return {h:hue,s:saturation,v:value};
+};
+
+
+/**
+ * https://gist.github.com/mjijackson/5311256
+ * @param hue
+ * @param saturation
+ * @param value
+ * @returns {{r: number, g: number, b: number}}
+ * @constructor
+ */
+util.HSVToRGB = function HSVToRGB(h, s, v) {
+  var r, g, b;
+
+  var i = Math.floor(h * 6);
+  var f = h * 6 - i;
+  var p = v * (1 - s);
+  var q = v * (1 - f * s);
+  var t = v * (1 - (1 - f) * s);
+
+  switch (i % 6) {
+    case 0: r = v, g = t, b = p; break;
+    case 1: r = q, g = v, b = p; break;
+    case 2: r = p, g = v, b = t; break;
+    case 3: r = p, g = q, b = v; break;
+    case 4: r = t, g = p, b = v; break;
+    case 5: r = v, g = p, b = q; break;
+  }
+
+  return {r:Math.floor(r * 255), g:Math.floor(g * 255), b:Math.floor(b * 255) };
+};
+
+util.HSVToHex = function HSVToHex(h,s,v) {
+  var rgb = util.HSVToRGB(h,s,v);
+  return util.RGBToHex(rgb.r,rgb.g,rgb.b);
+}
+
+util.hexToHSV = function hexToHSV(hex) {
+  var rgb = util.hexToRGB(hex);
+  return util.RGBToHSV(rgb.r,rgb.g,rgb.b);
+}
+
+util.isValidHex = function isValidHex(hex) {
+  var isOk  = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(hex);
+  return isOk;
+}

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vis-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - AlexVangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: momentjs-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hammerjs-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem provides Rails driver for http://visjs.org browser-based visualization
@@ -85,9 +85,9 @@ files:
 - lib/vis/rails.rb
 - lib/vis/rails/engine.rb
 - lib/vis/rails/version.rb
+- vendor/assets/component/emitter.js
 - vendor/assets/javascripts/vis.js
 - vendor/assets/stylesheets/vis.css
-- vis-rails.gemspec
 - vendor/assets/vis/.gitignore
 - vendor/assets/vis/DataSet.js
 - vendor/assets/vis/DataView.js
@@ -103,12 +103,37 @@ files:
 - vendor/assets/vis/graph/Popup.js
 - vendor/assets/vis/graph/SectorsMixin.js
 - vendor/assets/vis/graph/SelectionMixin.js
+- vendor/assets/vis/graph/css/graph-manipulation.css
+- vendor/assets/vis/graph/css/graph-navigation.css
 - vendor/assets/vis/graph/dotparser.js
+- vendor/assets/vis/graph/graphMixins/ClusterMixin.js
+- vendor/assets/vis/graph/graphMixins/HierarchicalLayoutMixin.js
+- vendor/assets/vis/graph/graphMixins/ManipulationMixin.js
+- vendor/assets/vis/graph/graphMixins/MixinLoader.js
+- vendor/assets/vis/graph/graphMixins/NavigationMixin.js
+- vendor/assets/vis/graph/graphMixins/SectorsMixin.js
+- vendor/assets/vis/graph/graphMixins/SelectionMixin.js
+- vendor/assets/vis/graph/graphMixins/physics/BarnesHut.js
+- vendor/assets/vis/graph/graphMixins/physics/HierarchialRepulsion.js
+- vendor/assets/vis/graph/graphMixins/physics/PhysicsMixin.js
+- vendor/assets/vis/graph/graphMixins/physics/Repulsion.js
+- vendor/assets/vis/graph/img/acceptDeleteIcon.png
+- vendor/assets/vis/graph/img/addNodeIcon.png
+- vendor/assets/vis/graph/img/backIcon.png
+- vendor/assets/vis/graph/img/connectIcon.png
+- vendor/assets/vis/graph/img/cross.png
+- vendor/assets/vis/graph/img/cross2.png
+- vendor/assets/vis/graph/img/deleteIcon.png
+- vendor/assets/vis/graph/img/downArrow.png
 - vendor/assets/vis/graph/img/downarrow.png
+- vendor/assets/vis/graph/img/editIcon.png
+- vendor/assets/vis/graph/img/leftArrow.png
 - vendor/assets/vis/graph/img/leftarrow.png
 - vendor/assets/vis/graph/img/minus.png
 - vendor/assets/vis/graph/img/plus.png
+- vendor/assets/vis/graph/img/rightArrow.png
 - vendor/assets/vis/graph/img/rightarrow.png
+- vendor/assets/vis/graph/img/upArrow.png
 - vendor/assets/vis/graph/img/uparrow.png
 - vendor/assets/vis/graph/img/zoomExtends.png
 - vendor/assets/vis/graph/shapes.js
@@ -144,7 +169,9 @@ files:
 - vendor/assets/vis/timeline/component/item/ItemPoint.js
 - vendor/assets/vis/timeline/component/item/ItemRange.js
 - vendor/assets/vis/timeline/component/item/ItemRangeOverflow.js
+- vendor/assets/vis/timeline/img/delete.png
 - vendor/assets/vis/util.js
+- vis-rails.gemspec
 homepage: https://github.com/AlexVangelov/vis-rails
 licenses:
 - MIT
@@ -155,17 +182,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Using http://visjs.org visualization library with Rails