pulse_meter-dygraphs_visualizer 0.4.15 → 0.4.16

data/lib/pulse_meter/dygraphs_visualize/coffee/presenters/widget.coffee

@@ -19,6 +19,14 @@ class WidgetPresenter
 		labelsDiv: @legendEl
 		labelsSeparateLines: false
 		rightGap: 30
+		highlightCircleSize: 2
+		strokeWidth: 1
+		strokeBorderWidth: 1
+
+		highlightSeriesOpts:
+			strokeWidth: 2
+			strokeBorderWidth: 1
+			highlightCircleSize: 5
 	}
 
 	mergedOptions: ->
@@ -29,7 +37,7 @@ class WidgetPresenter
 
 		$.extend(true,
 			@options(),
-			@globalOptions.dygraphsOptions,
+			@globalOptions().dygraphsOptions,
 			pageOptions,
 			@get('dygraphsOptions')
 		)

data/lib/pulse_meter/dygraphs_visualize/public/css/application.css

@@ -59,3 +59,6 @@ select#extend-timespan-val {
   margin-left: 0;
 }
 
+#legend span.highlight {
+  border: 1px solid gray;
+}

data/lib/pulse_meter/dygraphs_visualize/public/js/application.js

@@ -270,14 +270,22 @@ WidgetPresenter = (function() {
     return {
       labelsDiv: this.legendEl,
       labelsSeparateLines: false,
-      rightGap: 30
+      rightGap: 30,
+      highlightCircleSize: 2,
+      strokeWidth: 1,
+      strokeBorderWidth: 1,
+      highlightSeriesOpts: {
+        strokeWidth: 2,
+        strokeBorderWidth: 1,
+        highlightCircleSize: 5
+      }
     };
   };
 
   WidgetPresenter.prototype.mergedOptions = function() {
     var pageOptions;
     pageOptions = this.pageInfos.selected() ? this.pageInfos.selected().get('dygraphsOptions') : {};
-    return $.extend(true, this.options(), this.globalOptions.dygraphsOptions, pageOptions, this.get('dygraphsOptions'));
+    return $.extend(true, this.options(), this.globalOptions().dygraphsOptions, pageOptions, this.get('dygraphsOptions'));
   };
 
   WidgetPresenter.prototype.data = function() {
@@ -285,6 +293,7 @@ WidgetPresenter = (function() {
   };
 
   WidgetPresenter.prototype.draw = function() {
+    console.log(this.mergedOptions());
     return this.chart.draw(this.data(), this.mergedOptions());
   };
 

data/pulse_meter-dygraphs_visualizer.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "pulse_meter-dygraphs_visualizer"
   gem.require_paths = ["lib"]
-  gem.version       = "0.4.15"
+  gem.version       = "0.4.16"
 
   gem.add_runtime_dependency('pulse_meter_core')
   gem.add_runtime_dependency('gon-sinatra')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse_meter-dygraphs_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pulse_meter_core
@@ -468,7 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1357323714148990149
+      hash: 3396170172697498398
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23