Area enhancements#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
garethdjames wants to merge 5 commits into
base:master
Choose a base branch
from
Open

Area enhancements #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8cc74e
added bower configuration
Aug 6, 2013
56f4da3
added support for setting margins with attributes
Aug 6, 2013
4f62360
version number increments
Aug 7, 2013
8768494
option to rotate the label with a default of true
Aug 8, 2013
1f7a84c
added tooltips to area
Aug 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions bower.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
"name": "dangle",
"version": "1.1.1",
"main": "src/dangle.module.js",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
]
}
13 changes: 13 additions & 0 deletions css/dangle.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,4 +53,17 @@
fill: #000;
stroke: none;
font-size: 12px;
}

.area-tooltip {
position: absolute;
text-align: left;
width: 150px;
height: 40px;
padding: 2px;
font: 12px sans-serif;
background: white;
border: 2px #959595 solid;
border-radius: 2px;
pointer-events: none;
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"name": "dangle",
"description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
"version": "1.0.0",
"version": "1.1.1",
"homepage": "http://www.fullscale.co/dangle",
"keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
"repository": {
Expand Down
99 changes: 75 additions & 24 deletions src/modules/area/area.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
*/

angular.module('dangle')
.directive('fsArea', [function() {
.directive('fsArea', ['$filter', function($filter) {
'use strict';

return {
Expand All@@ -41,18 +41,28 @@ angular.module('dangle')
duration: '@',
delay: '@',
plot: '@',
pointRadius: '@'
pointRadius: '@',
marginLeft: '=',
marginRight: '=',
marginBottom:'=',
marginTop: '=',
xticks: '=',
yticks: '=',
tooltips: '@'
},

link: function(scope, element, attrs) {

var dateFilter = $filter('date');

var margin = {
top: 20,
right: 20,
bottom: 30,
left: 80
top: scope.marginTop || 20,
right: scope.marginRight || 20,
bottom: scope.marginBottom || 30,
left: scope.marginLeft || 80
};


// default width/height - mainly to create initial aspect ratio
var width = scope.width || 1280;
var height = scope.height || 300;
Expand All@@ -61,7 +71,9 @@ angular.module('dangle')
var interpolate = attrs.interpolate || 'false';

var label = attrs.label || 'Frequency';
var rotateLabel = attrs.rotateLabel || 'true';
var klass = attrs.class || '';
var tooltips = attrs.tooltips || 'false';

// add margins (make room for x,y labels)
width = width - margin.left - margin.right;
Expand All@@ -74,7 +86,7 @@ angular.module('dangle')
var y = d3.scale.linear()
.range([height, 0]);

// create x,y axis
// create x,y axis
var xAxis = d3.svg.axis()
.scale(x)
.orient('bottom');
Expand All@@ -83,7 +95,16 @@ angular.module('dangle')
.scale(y)
.orient('left');

// create line generator
//set the number of ticks if specified
if(scope.xticks) {
xAxis.ticks(scope.xticks);
}

if(scope.yticks) {
yAxis.ticks(scope.yticks);
}

// create line generator
var line = d3.svg.line()
.x(function(d) { return x(d.time); })
.y(function(d) { return y(d.count); });
Expand All@@ -94,7 +115,7 @@ angular.module('dangle')
.y0(height)
.y1(function(d) { return y(d.count); });

// enable interpolation if specified
// enable interpolation if specified
if (attrs.interpolate == 'true') {
line.interpolate('cardinal');
area.interpolate('cardinal');
Expand All@@ -120,23 +141,35 @@ angular.module('dangle')
.attr('transform', 'translate(0,' + height + ')')
.call(xAxis);

// insert the x axis (no data yet)
svg.append('g')
var axis = svg.append('g')
.attr('class', 'area y axis ' + klass)
.call(yAxis)
.append('text')
.attr('transform', 'rotate(-90)')
.attr('y', 6)
.attr('dy', '.71em')
.style('text-anchor', 'end')
.text(label);
.append('text')
.attr('dy', '.71em')
.text(label);
// insert the y axis (no data yet)
if(rotateLabel == 'true') {
axis
.attr('transform', 'rotate(-90)')
.attr('y', 6)
.style('text-anchor', 'end')
} else {
axis
.attr('y', -10)
.attr('dy', '.71em')
}


// generate the line. Data is empty at link time
svg.append('path')
.datum([])
.attr('class', 'area line ' + klass)
.attr("d", line);

var div = d3.select("body").append("div")
.attr("class", "area-tooltip")
.style("opacity", 0);


// main observer fn called when scope is updated. Data and scope vars are now bound
scope.$watch('bind', function(data) {
Expand All@@ -158,7 +191,7 @@ angular.module('dangle')
x.domain(d3.extent(data, function(d) { return d.time; }));
y.domain([0, d3.max(data, function(d) { return d.count; })]);

// create the transition
// create the transition
var t = svg.transition().duration(duration);

// feed the current data to our area/line generators
Expand All@@ -172,13 +205,13 @@ angular.module('dangle')
// using Math.random as (optional) key fn ensures old
// data values are flushed and all new values inserted
var points = svg.selectAll('circle')
.data(data.filter(function(d) {
return d.count;
}), function(d) {
return Math.random();
.data(data.filter(function(d) {
return d.count;
}), function(d) {
return Math.random();
});

// d3 enter fn binds each new value to a circle
// d3 enter fn binds each new value to a circle
points.enter()
.append('circle')
.attr('class', 'area line points ' + klass)
Expand All@@ -194,10 +227,28 @@ angular.module('dangle')
.attr("r", pointRadius);

// wire up any events (registers filter callback)
points.on('mousedown', function(d) {
points.on('mousedown', function(d) {
scope.$apply(function() {
(scope.onClick || angular.noop)(field, d.time);
});
}).on("mouseover", function(d) {
if(tooltips === 'true') {
div.transition()
.duration(200)
.style("opacity", .9);
div .html(
"<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
"<br>" + label + ":" + "<strong>" + d.count +"</strong>"
)
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
}
}).on("mouseout", function(d) {
if(tooltips === 'true') {
div.transition()
.duration(100)
.style("opacity", .0);
}
});

// d3 exit/remove flushes old values (removes old circles)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Area enhancements#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

garethdjames
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Area enhancements
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
c8cc74e

added bower configuration

Aug 6, 2013
56f4da3

added support for setting margins with attributes

Aug 6, 2013
4f62360

version number increments

Aug 7, 2013
8768494

option to rotate the label with a default of true

Aug 8, 2013
1f7a84c

added tooltips to area

Aug 8, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
bower.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
 "name": "dangle",
 "version": "1.1.1",
 "main": "src/dangle.module.js",
 "ignore": [
 "**/.*",
 "node_modules",
 "bower_components",
 "test",
 "tests"
 ]
}

13 changes: 13 additions & 0 deletions
css/dangle.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,4 +53,17 @@
 fill: #000;
 stroke: none;
 font-size: 12px;
}

.area-tooltip {
 position: absolute;
 text-align: left;
 width: 150px;
 height: 40px;
 padding: 2px;
 font: 12px sans-serif;
 background: white;
 border: 2px #959595 solid;
 border-radius: 2px;
 pointer-events: none;
}

2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "name": "dangle",
 "description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
 "version": "1.0.0",
 "version": "1.1.1",
 "homepage": "http://www.fullscale.co/dangle",
 "keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
 "repository": {
Expand Down

99 changes: 75 additions & 24 deletions
src/modules/area/area.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 */

angular.module('dangle')
 .directive('fsArea', [function() {
 .directive('fsArea', ['$filter', function($filter) {
 'use strict';

 return {
Expand All@@ -41,18 +41,28 @@ angular.module('dangle')
 duration: '@',
 delay: '@',
 plot: '@',
 pointRadius: '@' 
 pointRadius: '@',
 marginLeft: '=',
 marginRight: '=',
 marginBottom:'=',
 marginTop: '=',
 xticks: '=',
 yticks: '=',
 tooltips: '@'
 },

 link: function(scope, element, attrs) {

 var dateFilter = $filter('date');

 var margin = {
 top: 20,
 right: 20,
 bottom: 30,
 left: 80
 top: scope.marginTop || 20,
 right: scope.marginRight || 20,
 bottom: scope.marginBottom || 30,
 left: scope.marginLeft || 80
 };


 // default width/height - mainly to create initial aspect ratio
 var width = scope.width || 1280;
 var height = scope.height || 300;
Expand All@@ -61,7 +71,9 @@ angular.module('dangle')
 var interpolate = attrs.interpolate || 'false';

 var label = attrs.label || 'Frequency';
 var rotateLabel = attrs.rotateLabel || 'true';
 var klass = attrs.class || '';
 var tooltips = attrs.tooltips || 'false';

 // add margins (make room for x,y labels)
 width = width - margin.left - margin.right;
Expand All@@ -74,7 +86,7 @@ angular.module('dangle')
 var y = d3.scale.linear()
 .range([height, 0]);

 // create x,y axis
 // create x,y axis
 var xAxis = d3.svg.axis()
 .scale(x)
 .orient('bottom');
Expand All@@ -83,7 +95,16 @@ angular.module('dangle')
 .scale(y)
 .orient('left');

 // create line generator 
 //set the number of ticks if specified
 if(scope.xticks) {
 xAxis.ticks(scope.xticks);
 }

 if(scope.yticks) {
 yAxis.ticks(scope.yticks);
 }

 // create line generator
 var line = d3.svg.line()
 .x(function(d) { return x(d.time); })
 .y(function(d) { return y(d.count); });
Expand All@@ -94,7 +115,7 @@ angular.module('dangle')
 .y0(height)
 .y1(function(d) { return y(d.count); });

 // enable interpolation if specified
 // enable interpolation if specified
 if (attrs.interpolate == 'true') {
 line.interpolate('cardinal');
 area.interpolate('cardinal');
Expand All@@ -120,23 +141,35 @@ angular.module('dangle')
 .attr('transform', 'translate(0,' + height + ')')
 .call(xAxis);

 // insert the x axis (no data yet)
 svg.append('g')
 var axis = svg.append('g')
 .attr('class', 'area y axis ' + klass)
 .call(yAxis)
 .append('text')
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .attr('dy', '.71em')
 .style('text-anchor', 'end')
 .text(label);
 .append('text')
 .attr('dy', '.71em')
 .text(label);
 // insert the y axis (no data yet)
 if(rotateLabel == 'true') {
 axis
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .style('text-anchor', 'end')
 } else {
 axis
 .attr('y', -10)
 .attr('dy', '.71em')
 }


 // generate the line. Data is empty at link time
 svg.append('path')
 .datum([])
 .attr('class', 'area line ' + klass)
 .attr("d", line);

 var div = d3.select("body").append("div")
 .attr("class", "area-tooltip")
 .style("opacity", 0);


 // main observer fn called when scope is updated. Data and scope vars are now bound
 scope.$watch('bind', function(data) {
Expand All@@ -158,7 +191,7 @@ angular.module('dangle')
 x.domain(d3.extent(data, function(d) { return d.time; }));
 y.domain([0, d3.max(data, function(d) { return d.count; })]);

 // create the transition
 // create the transition
 var t = svg.transition().duration(duration);

 // feed the current data to our area/line generators
Expand All@@ -172,13 +205,13 @@ angular.module('dangle')
 // using Math.random as (optional) key fn ensures old
 // data values are flushed and all new values inserted
 var points = svg.selectAll('circle')
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 });

 // d3 enter fn binds each new value to a circle
 // d3 enter fn binds each new value to a circle
 points.enter()
 .append('circle')
 .attr('class', 'area line points ' + klass)
Expand All@@ -194,10 +227,28 @@ angular.module('dangle')
 .attr("r", pointRadius);

 // wire up any events (registers filter callback)
 points.on('mousedown', function(d) {
 points.on('mousedown', function(d) {
 scope.$apply(function() {
 (scope.onClick || angular.noop)(field, d.time);
 });
 }).on("mouseover", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(200)
 .style("opacity", .9);
 div .html(
 "<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
 "<br>" + label + ":" + "<strong>" + d.count +"</strong>"
 )
 .style("left", (d3.event.pageX) + "px")
 .style("top", (d3.event.pageY - 28) + "px");
 }
 }).on("mouseout", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(100)
 .style("opacity", .0);
 }
 });

 // d3 exit/remove flushes old values (removes old circles)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Area enhancements#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

garethdjames
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Area enhancements
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
c8cc74e

added bower configuration

Aug 6, 2013
56f4da3

added support for setting margins with attributes

Aug 6, 2013
4f62360

version number increments

Aug 7, 2013
8768494

option to rotate the label with a default of true

Aug 8, 2013
1f7a84c

added tooltips to area

Aug 8, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
bower.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
 "name": "dangle",
 "version": "1.1.1",
 "main": "src/dangle.module.js",
 "ignore": [
 "**/.*",
 "node_modules",
 "bower_components",
 "test",
 "tests"
 ]
}

13 changes: 13 additions & 0 deletions
css/dangle.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,4 +53,17 @@
 fill: #000;
 stroke: none;
 font-size: 12px;
}

.area-tooltip {
 position: absolute;
 text-align: left;
 width: 150px;
 height: 40px;
 padding: 2px;
 font: 12px sans-serif;
 background: white;
 border: 2px #959595 solid;
 border-radius: 2px;
 pointer-events: none;
}

2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "name": "dangle",
 "description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
 "version": "1.0.0",
 "version": "1.1.1",
 "homepage": "http://www.fullscale.co/dangle",
 "keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
 "repository": {
Expand Down

99 changes: 75 additions & 24 deletions
src/modules/area/area.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 */

angular.module('dangle')
 .directive('fsArea', [function() {
 .directive('fsArea', ['$filter', function($filter) {
 'use strict';

 return {
Expand All@@ -41,18 +41,28 @@ angular.module('dangle')
 duration: '@',
 delay: '@',
 plot: '@',
 pointRadius: '@' 
 pointRadius: '@',
 marginLeft: '=',
 marginRight: '=',
 marginBottom:'=',
 marginTop: '=',
 xticks: '=',
 yticks: '=',
 tooltips: '@'
 },

 link: function(scope, element, attrs) {

 var dateFilter = $filter('date');

 var margin = {
 top: 20,
 right: 20,
 bottom: 30,
 left: 80
 top: scope.marginTop || 20,
 right: scope.marginRight || 20,
 bottom: scope.marginBottom || 30,
 left: scope.marginLeft || 80
 };


 // default width/height - mainly to create initial aspect ratio
 var width = scope.width || 1280;
 var height = scope.height || 300;
Expand All@@ -61,7 +71,9 @@ angular.module('dangle')
 var interpolate = attrs.interpolate || 'false';

 var label = attrs.label || 'Frequency';
 var rotateLabel = attrs.rotateLabel || 'true';
 var klass = attrs.class || '';
 var tooltips = attrs.tooltips || 'false';

 // add margins (make room for x,y labels)
 width = width - margin.left - margin.right;
Expand All@@ -74,7 +86,7 @@ angular.module('dangle')
 var y = d3.scale.linear()
 .range([height, 0]);

 // create x,y axis
 // create x,y axis
 var xAxis = d3.svg.axis()
 .scale(x)
 .orient('bottom');
Expand All@@ -83,7 +95,16 @@ angular.module('dangle')
 .scale(y)
 .orient('left');

 // create line generator 
 //set the number of ticks if specified
 if(scope.xticks) {
 xAxis.ticks(scope.xticks);
 }

 if(scope.yticks) {
 yAxis.ticks(scope.yticks);
 }

 // create line generator
 var line = d3.svg.line()
 .x(function(d) { return x(d.time); })
 .y(function(d) { return y(d.count); });
Expand All@@ -94,7 +115,7 @@ angular.module('dangle')
 .y0(height)
 .y1(function(d) { return y(d.count); });

 // enable interpolation if specified
 // enable interpolation if specified
 if (attrs.interpolate == 'true') {
 line.interpolate('cardinal');
 area.interpolate('cardinal');
Expand All@@ -120,23 +141,35 @@ angular.module('dangle')
 .attr('transform', 'translate(0,' + height + ')')
 .call(xAxis);

 // insert the x axis (no data yet)
 svg.append('g')
 var axis = svg.append('g')
 .attr('class', 'area y axis ' + klass)
 .call(yAxis)
 .append('text')
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .attr('dy', '.71em')
 .style('text-anchor', 'end')
 .text(label);
 .append('text')
 .attr('dy', '.71em')
 .text(label);
 // insert the y axis (no data yet)
 if(rotateLabel == 'true') {
 axis
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .style('text-anchor', 'end')
 } else {
 axis
 .attr('y', -10)
 .attr('dy', '.71em')
 }


 // generate the line. Data is empty at link time
 svg.append('path')
 .datum([])
 .attr('class', 'area line ' + klass)
 .attr("d", line);

 var div = d3.select("body").append("div")
 .attr("class", "area-tooltip")
 .style("opacity", 0);


 // main observer fn called when scope is updated. Data and scope vars are now bound
 scope.$watch('bind', function(data) {
Expand All@@ -158,7 +191,7 @@ angular.module('dangle')
 x.domain(d3.extent(data, function(d) { return d.time; }));
 y.domain([0, d3.max(data, function(d) { return d.count; })]);

 // create the transition
 // create the transition
 var t = svg.transition().duration(duration);

 // feed the current data to our area/line generators
Expand All@@ -172,13 +205,13 @@ angular.module('dangle')
 // using Math.random as (optional) key fn ensures old
 // data values are flushed and all new values inserted
 var points = svg.selectAll('circle')
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 });

 // d3 enter fn binds each new value to a circle
 // d3 enter fn binds each new value to a circle
 points.enter()
 .append('circle')
 .attr('class', 'area line points ' + klass)
Expand All@@ -194,10 +227,28 @@ angular.module('dangle')
 .attr("r", pointRadius);

 // wire up any events (registers filter callback)
 points.on('mousedown', function(d) {
 points.on('mousedown', function(d) {
 scope.$apply(function() {
 (scope.onClick || angular.noop)(field, d.time);
 });
 }).on("mouseover", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(200)
 .style("opacity", .9);
 div .html(
 "<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
 "<br>" + label + ":" + "<strong>" + d.count +"</strong>"
 )
 .style("left", (d3.event.pageX) + "px")
 .style("top", (d3.event.pageY - 28) + "px");
 }
 }).on("mouseout", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(100)
 .style("opacity", .0);
 }
 });

 // d3 exit/remove flushes old values (removes old circles)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Area enhancements#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

garethdjames
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Area enhancements
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
c8cc74e

added bower configuration

Aug 6, 2013
56f4da3

added support for setting margins with attributes

Aug 6, 2013
4f62360

version number increments

Aug 7, 2013
8768494

option to rotate the label with a default of true

Aug 8, 2013
1f7a84c

added tooltips to area

Aug 8, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
bower.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
 "name": "dangle",
 "version": "1.1.1",
 "main": "src/dangle.module.js",
 "ignore": [
 "**/.*",
 "node_modules",
 "bower_components",
 "test",
 "tests"
 ]
}

13 changes: 13 additions & 0 deletions
css/dangle.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,4 +53,17 @@
 fill: #000;
 stroke: none;
 font-size: 12px;
}

.area-tooltip {
 position: absolute;
 text-align: left;
 width: 150px;
 height: 40px;
 padding: 2px;
 font: 12px sans-serif;
 background: white;
 border: 2px #959595 solid;
 border-radius: 2px;
 pointer-events: none;
}

2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "name": "dangle",
 "description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
 "version": "1.0.0",
 "version": "1.1.1",
 "homepage": "http://www.fullscale.co/dangle",
 "keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
 "repository": {
Expand Down

99 changes: 75 additions & 24 deletions
src/modules/area/area.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 */

angular.module('dangle')
 .directive('fsArea', [function() {
 .directive('fsArea', ['$filter', function($filter) {
 'use strict';

 return {
Expand All@@ -41,18 +41,28 @@ angular.module('dangle')
 duration: '@',
 delay: '@',
 plot: '@',
 pointRadius: '@' 
 pointRadius: '@',
 marginLeft: '=',
 marginRight: '=',
 marginBottom:'=',
 marginTop: '=',
 xticks: '=',
 yticks: '=',
 tooltips: '@'
 },

 link: function(scope, element, attrs) {

 var dateFilter = $filter('date');

 var margin = {
 top: 20,
 right: 20,
 bottom: 30,
 left: 80
 top: scope.marginTop || 20,
 right: scope.marginRight || 20,
 bottom: scope.marginBottom || 30,
 left: scope.marginLeft || 80
 };


 // default width/height - mainly to create initial aspect ratio
 var width = scope.width || 1280;
 var height = scope.height || 300;
Expand All@@ -61,7 +71,9 @@ angular.module('dangle')
 var interpolate = attrs.interpolate || 'false';

 var label = attrs.label || 'Frequency';
 var rotateLabel = attrs.rotateLabel || 'true';
 var klass = attrs.class || '';
 var tooltips = attrs.tooltips || 'false';

 // add margins (make room for x,y labels)
 width = width - margin.left - margin.right;
Expand All@@ -74,7 +86,7 @@ angular.module('dangle')
 var y = d3.scale.linear()
 .range([height, 0]);

 // create x,y axis
 // create x,y axis
 var xAxis = d3.svg.axis()
 .scale(x)
 .orient('bottom');
Expand All@@ -83,7 +95,16 @@ angular.module('dangle')
 .scale(y)
 .orient('left');

 // create line generator 
 //set the number of ticks if specified
 if(scope.xticks) {
 xAxis.ticks(scope.xticks);
 }

 if(scope.yticks) {
 yAxis.ticks(scope.yticks);
 }

 // create line generator
 var line = d3.svg.line()
 .x(function(d) { return x(d.time); })
 .y(function(d) { return y(d.count); });
Expand All@@ -94,7 +115,7 @@ angular.module('dangle')
 .y0(height)
 .y1(function(d) { return y(d.count); });

 // enable interpolation if specified
 // enable interpolation if specified
 if (attrs.interpolate == 'true') {
 line.interpolate('cardinal');
 area.interpolate('cardinal');
Expand All@@ -120,23 +141,35 @@ angular.module('dangle')
 .attr('transform', 'translate(0,' + height + ')')
 .call(xAxis);

 // insert the x axis (no data yet)
 svg.append('g')
 var axis = svg.append('g')
 .attr('class', 'area y axis ' + klass)
 .call(yAxis)
 .append('text')
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .attr('dy', '.71em')
 .style('text-anchor', 'end')
 .text(label);
 .append('text')
 .attr('dy', '.71em')
 .text(label);
 // insert the y axis (no data yet)
 if(rotateLabel == 'true') {
 axis
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .style('text-anchor', 'end')
 } else {
 axis
 .attr('y', -10)
 .attr('dy', '.71em')
 }


 // generate the line. Data is empty at link time
 svg.append('path')
 .datum([])
 .attr('class', 'area line ' + klass)
 .attr("d", line);

 var div = d3.select("body").append("div")
 .attr("class", "area-tooltip")
 .style("opacity", 0);


 // main observer fn called when scope is updated. Data and scope vars are now bound
 scope.$watch('bind', function(data) {
Expand All@@ -158,7 +191,7 @@ angular.module('dangle')
 x.domain(d3.extent(data, function(d) { return d.time; }));
 y.domain([0, d3.max(data, function(d) { return d.count; })]);

 // create the transition
 // create the transition
 var t = svg.transition().duration(duration);

 // feed the current data to our area/line generators
Expand All@@ -172,13 +205,13 @@ angular.module('dangle')
 // using Math.random as (optional) key fn ensures old
 // data values are flushed and all new values inserted
 var points = svg.selectAll('circle')
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 });

 // d3 enter fn binds each new value to a circle
 // d3 enter fn binds each new value to a circle
 points.enter()
 .append('circle')
 .attr('class', 'area line points ' + klass)
Expand All@@ -194,10 +227,28 @@ angular.module('dangle')
 .attr("r", pointRadius);

 // wire up any events (registers filter callback)
 points.on('mousedown', function(d) {
 points.on('mousedown', function(d) {
 scope.$apply(function() {
 (scope.onClick || angular.noop)(field, d.time);
 });
 }).on("mouseover", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(200)
 .style("opacity", .9);
 div .html(
 "<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
 "<br>" + label + ":" + "<strong>" + d.count +"</strong>"
 )
 .style("left", (d3.event.pageX) + "px")
 .style("top", (d3.event.pageY - 28) + "px");
 }
 }).on("mouseout", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(100)
 .style("opacity", .0);
 }
 });

 // d3 exit/remove flushes old values (removes old circles)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Area enhancements#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

garethdjames
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Area enhancements
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
c8cc74e

added bower configuration

Aug 6, 2013
56f4da3

added support for setting margins with attributes

Aug 6, 2013
4f62360

version number increments

Aug 7, 2013
8768494

option to rotate the label with a default of true

Aug 8, 2013
1f7a84c

added tooltips to area

Aug 8, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
bower.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
 "name": "dangle",
 "version": "1.1.1",
 "main": "src/dangle.module.js",
 "ignore": [
 "**/.*",
 "node_modules",
 "bower_components",
 "test",
 "tests"
 ]
}

13 changes: 13 additions & 0 deletions
css/dangle.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,4 +53,17 @@
 fill: #000;
 stroke: none;
 font-size: 12px;
}

.area-tooltip {
 position: absolute;
 text-align: left;
 width: 150px;
 height: 40px;
 padding: 2px;
 font: 12px sans-serif;
 background: white;
 border: 2px #959595 solid;
 border-radius: 2px;
 pointer-events: none;
}

2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "name": "dangle",
 "description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
 "version": "1.0.0",
 "version": "1.1.1",
 "homepage": "http://www.fullscale.co/dangle",
 "keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
 "repository": {
Expand Down

99 changes: 75 additions & 24 deletions
src/modules/area/area.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 */

angular.module('dangle')
 .directive('fsArea', [function() {
 .directive('fsArea', ['$filter', function($filter) {
 'use strict';

 return {
Expand All@@ -41,18 +41,28 @@ angular.module('dangle')
 duration: '@',
 delay: '@',
 plot: '@',
 pointRadius: '@' 
 pointRadius: '@',
 marginLeft: '=',
 marginRight: '=',
 marginBottom:'=',
 marginTop: '=',
 xticks: '=',
 yticks: '=',
 tooltips: '@'
 },

 link: function(scope, element, attrs) {

 var dateFilter = $filter('date');

 var margin = {
 top: 20,
 right: 20,
 bottom: 30,
 left: 80
 top: scope.marginTop || 20,
 right: scope.marginRight || 20,
 bottom: scope.marginBottom || 30,
 left: scope.marginLeft || 80
 };


 // default width/height - mainly to create initial aspect ratio
 var width = scope.width || 1280;
 var height = scope.height || 300;
Expand All@@ -61,7 +71,9 @@ angular.module('dangle')
 var interpolate = attrs.interpolate || 'false';

 var label = attrs.label || 'Frequency';
 var rotateLabel = attrs.rotateLabel || 'true';
 var klass = attrs.class || '';
 var tooltips = attrs.tooltips || 'false';

 // add margins (make room for x,y labels)
 width = width - margin.left - margin.right;
Expand All@@ -74,7 +86,7 @@ angular.module('dangle')
 var y = d3.scale.linear()
 .range([height, 0]);

 // create x,y axis
 // create x,y axis
 var xAxis = d3.svg.axis()
 .scale(x)
 .orient('bottom');
Expand All@@ -83,7 +95,16 @@ angular.module('dangle')
 .scale(y)
 .orient('left');

 // create line generator 
 //set the number of ticks if specified
 if(scope.xticks) {
 xAxis.ticks(scope.xticks);
 }

 if(scope.yticks) {
 yAxis.ticks(scope.yticks);
 }

 // create line generator
 var line = d3.svg.line()
 .x(function(d) { return x(d.time); })
 .y(function(d) { return y(d.count); });
Expand All@@ -94,7 +115,7 @@ angular.module('dangle')
 .y0(height)
 .y1(function(d) { return y(d.count); });

 // enable interpolation if specified
 // enable interpolation if specified
 if (attrs.interpolate == 'true') {
 line.interpolate('cardinal');
 area.interpolate('cardinal');
Expand All@@ -120,23 +141,35 @@ angular.module('dangle')
 .attr('transform', 'translate(0,' + height + ')')
 .call(xAxis);

 // insert the x axis (no data yet)
 svg.append('g')
 var axis = svg.append('g')
 .attr('class', 'area y axis ' + klass)
 .call(yAxis)
 .append('text')
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .attr('dy', '.71em')
 .style('text-anchor', 'end')
 .text(label);
 .append('text')
 .attr('dy', '.71em')
 .text(label);
 // insert the y axis (no data yet)
 if(rotateLabel == 'true') {
 axis
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .style('text-anchor', 'end')
 } else {
 axis
 .attr('y', -10)
 .attr('dy', '.71em')
 }


 // generate the line. Data is empty at link time
 svg.append('path')
 .datum([])
 .attr('class', 'area line ' + klass)
 .attr("d", line);

 var div = d3.select("body").append("div")
 .attr("class", "area-tooltip")
 .style("opacity", 0);


 // main observer fn called when scope is updated. Data and scope vars are now bound
 scope.$watch('bind', function(data) {
Expand All@@ -158,7 +191,7 @@ angular.module('dangle')
 x.domain(d3.extent(data, function(d) { return d.time; }));
 y.domain([0, d3.max(data, function(d) { return d.count; })]);

 // create the transition
 // create the transition
 var t = svg.transition().duration(duration);

 // feed the current data to our area/line generators
Expand All@@ -172,13 +205,13 @@ angular.module('dangle')
 // using Math.random as (optional) key fn ensures old
 // data values are flushed and all new values inserted
 var points = svg.selectAll('circle')
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 });

 // d3 enter fn binds each new value to a circle
 // d3 enter fn binds each new value to a circle
 points.enter()
 .append('circle')
 .attr('class', 'area line points ' + klass)
Expand All@@ -194,10 +227,28 @@ angular.module('dangle')
 .attr("r", pointRadius);

 // wire up any events (registers filter callback)
 points.on('mousedown', function(d) {
 points.on('mousedown', function(d) {
 scope.$apply(function() {
 (scope.onClick || angular.noop)(field, d.time);
 });
 }).on("mouseover", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(200)
 .style("opacity", .9);
 div .html(
 "<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
 "<br>" + label + ":" + "<strong>" + d.count +"</strong>"
 )
 .style("left", (d3.event.pageX) + "px")
 .style("top", (d3.event.pageY - 28) + "px");
 }
 }).on("mouseout", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(100)
 .style("opacity", .0);
 }
 });

 // d3 exit/remove flushes old values (removes old circles)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Area enhancements#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

garethdjames
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Area enhancements
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
c8cc74e

added bower configuration

Aug 6, 2013
56f4da3

added support for setting margins with attributes

Aug 6, 2013
4f62360

version number increments

Aug 7, 2013
8768494

option to rotate the label with a default of true

Aug 8, 2013
1f7a84c

added tooltips to area

Aug 8, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
bower.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
 "name": "dangle",
 "version": "1.1.1",
 "main": "src/dangle.module.js",
 "ignore": [
 "**/.*",
 "node_modules",
 "bower_components",
 "test",
 "tests"
 ]
}

13 changes: 13 additions & 0 deletions
css/dangle.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,4 +53,17 @@
 fill: #000;
 stroke: none;
 font-size: 12px;
}

.area-tooltip {
 position: absolute;
 text-align: left;
 width: 150px;
 height: 40px;
 padding: 2px;
 font: 12px sans-serif;
 background: white;
 border: 2px #959595 solid;
 border-radius: 2px;
 pointer-events: none;
}

2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "name": "dangle",
 "description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
 "version": "1.0.0",
 "version": "1.1.1",
 "homepage": "http://www.fullscale.co/dangle",
 "keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
 "repository": {
Expand Down

99 changes: 75 additions & 24 deletions
src/modules/area/area.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 */

angular.module('dangle')
 .directive('fsArea', [function() {
 .directive('fsArea', ['$filter', function($filter) {
 'use strict';

 return {
Expand All@@ -41,18 +41,28 @@ angular.module('dangle')
 duration: '@',
 delay: '@',
 plot: '@',
 pointRadius: '@' 
 pointRadius: '@',
 marginLeft: '=',
 marginRight: '=',
 marginBottom:'=',
 marginTop: '=',
 xticks: '=',
 yticks: '=',
 tooltips: '@'
 },

 link: function(scope, element, attrs) {

 var dateFilter = $filter('date');

 var margin = {
 top: 20,
 right: 20,
 bottom: 30,
 left: 80
 top: scope.marginTop || 20,
 right: scope.marginRight || 20,
 bottom: scope.marginBottom || 30,
 left: scope.marginLeft || 80
 };


 // default width/height - mainly to create initial aspect ratio
 var width = scope.width || 1280;
 var height = scope.height || 300;
Expand All@@ -61,7 +71,9 @@ angular.module('dangle')
 var interpolate = attrs.interpolate || 'false';

 var label = attrs.label || 'Frequency';
 var rotateLabel = attrs.rotateLabel || 'true';
 var klass = attrs.class || '';
 var tooltips = attrs.tooltips || 'false';

 // add margins (make room for x,y labels)
 width = width - margin.left - margin.right;
Expand All@@ -74,7 +86,7 @@ angular.module('dangle')
 var y = d3.scale.linear()
 .range([height, 0]);

 // create x,y axis
 // create x,y axis
 var xAxis = d3.svg.axis()
 .scale(x)
 .orient('bottom');
Expand All@@ -83,7 +95,16 @@ angular.module('dangle')
 .scale(y)
 .orient('left');

 // create line generator 
 //set the number of ticks if specified
 if(scope.xticks) {
 xAxis.ticks(scope.xticks);
 }

 if(scope.yticks) {
 yAxis.ticks(scope.yticks);
 }

 // create line generator
 var line = d3.svg.line()
 .x(function(d) { return x(d.time); })
 .y(function(d) { return y(d.count); });
Expand All@@ -94,7 +115,7 @@ angular.module('dangle')
 .y0(height)
 .y1(function(d) { return y(d.count); });

 // enable interpolation if specified
 // enable interpolation if specified
 if (attrs.interpolate == 'true') {
 line.interpolate('cardinal');
 area.interpolate('cardinal');
Expand All@@ -120,23 +141,35 @@ angular.module('dangle')
 .attr('transform', 'translate(0,' + height + ')')
 .call(xAxis);

 // insert the x axis (no data yet)
 svg.append('g')
 var axis = svg.append('g')
 .attr('class', 'area y axis ' + klass)
 .call(yAxis)
 .append('text')
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .attr('dy', '.71em')
 .style('text-anchor', 'end')
 .text(label);
 .append('text')
 .attr('dy', '.71em')
 .text(label);
 // insert the y axis (no data yet)
 if(rotateLabel == 'true') {
 axis
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .style('text-anchor', 'end')
 } else {
 axis
 .attr('y', -10)
 .attr('dy', '.71em')
 }


 // generate the line. Data is empty at link time
 svg.append('path')
 .datum([])
 .attr('class', 'area line ' + klass)
 .attr("d", line);

 var div = d3.select("body").append("div")
 .attr("class", "area-tooltip")
 .style("opacity", 0);


 // main observer fn called when scope is updated. Data and scope vars are now bound
 scope.$watch('bind', function(data) {
Expand All@@ -158,7 +191,7 @@ angular.module('dangle')
 x.domain(d3.extent(data, function(d) { return d.time; }));
 y.domain([0, d3.max(data, function(d) { return d.count; })]);

 // create the transition
 // create the transition
 var t = svg.transition().duration(duration);

 // feed the current data to our area/line generators
Expand All@@ -172,13 +205,13 @@ angular.module('dangle')
 // using Math.random as (optional) key fn ensures old
 // data values are flushed and all new values inserted
 var points = svg.selectAll('circle')
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 });

 // d3 enter fn binds each new value to a circle
 // d3 enter fn binds each new value to a circle
 points.enter()
 .append('circle')
 .attr('class', 'area line points ' + klass)
Expand All@@ -194,10 +227,28 @@ angular.module('dangle')
 .attr("r", pointRadius);

 // wire up any events (registers filter callback)
 points.on('mousedown', function(d) {
 points.on('mousedown', function(d) {
 scope.$apply(function() {
 (scope.onClick || angular.noop)(field, d.time);
 });
 }).on("mouseover", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(200)
 .style("opacity", .9);
 div .html(
 "<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
 "<br>" + label + ":" + "<strong>" + d.count +"</strong>"
 )
 .style("left", (d3.event.pageX) + "px")
 .style("top", (d3.event.pageY - 28) + "px");
 }
 }).on("mouseout", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(100)
 .style("opacity", .0);
 }
 });

 // d3 exit/remove flushes old values (removes old circles)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Area enhancements#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

garethdjames
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Area enhancements
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
c8cc74e

added bower configuration

Aug 6, 2013
56f4da3

added support for setting margins with attributes

Aug 6, 2013
4f62360

version number increments

Aug 7, 2013
8768494

option to rotate the label with a default of true

Aug 8, 2013
1f7a84c

added tooltips to area

Aug 8, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
bower.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
 "name": "dangle",
 "version": "1.1.1",
 "main": "src/dangle.module.js",
 "ignore": [
 "**/.*",
 "node_modules",
 "bower_components",
 "test",
 "tests"
 ]
}

13 changes: 13 additions & 0 deletions
css/dangle.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,4 +53,17 @@
 fill: #000;
 stroke: none;
 font-size: 12px;
}

.area-tooltip {
 position: absolute;
 text-align: left;
 width: 150px;
 height: 40px;
 padding: 2px;
 font: 12px sans-serif;
 background: white;
 border: 2px #959595 solid;
 border-radius: 2px;
 pointer-events: none;
}

2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "name": "dangle",
 "description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
 "version": "1.0.0",
 "version": "1.1.1",
 "homepage": "http://www.fullscale.co/dangle",
 "keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
 "repository": {
Expand Down

99 changes: 75 additions & 24 deletions
src/modules/area/area.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 */

angular.module('dangle')
 .directive('fsArea', [function() {
 .directive('fsArea', ['$filter', function($filter) {
 'use strict';

 return {
Expand All@@ -41,18 +41,28 @@ angular.module('dangle')
 duration: '@',
 delay: '@',
 plot: '@',
 pointRadius: '@' 
 pointRadius: '@',
 marginLeft: '=',
 marginRight: '=',
 marginBottom:'=',
 marginTop: '=',
 xticks: '=',
 yticks: '=',
 tooltips: '@'
 },

 link: function(scope, element, attrs) {

 var dateFilter = $filter('date');

 var margin = {
 top: 20,
 right: 20,
 bottom: 30,
 left: 80
 top: scope.marginTop || 20,
 right: scope.marginRight || 20,
 bottom: scope.marginBottom || 30,
 left: scope.marginLeft || 80
 };


 // default width/height - mainly to create initial aspect ratio
 var width = scope.width || 1280;
 var height = scope.height || 300;
Expand All@@ -61,7 +71,9 @@ angular.module('dangle')
 var interpolate = attrs.interpolate || 'false';

 var label = attrs.label || 'Frequency';
 var rotateLabel = attrs.rotateLabel || 'true';
 var klass = attrs.class || '';
 var tooltips = attrs.tooltips || 'false';

 // add margins (make room for x,y labels)
 width = width - margin.left - margin.right;
Expand All@@ -74,7 +86,7 @@ angular.module('dangle')
 var y = d3.scale.linear()
 .range([height, 0]);

 // create x,y axis
 // create x,y axis
 var xAxis = d3.svg.axis()
 .scale(x)
 .orient('bottom');
Expand All@@ -83,7 +95,16 @@ angular.module('dangle')
 .scale(y)
 .orient('left');

 // create line generator 
 //set the number of ticks if specified
 if(scope.xticks) {
 xAxis.ticks(scope.xticks);
 }

 if(scope.yticks) {
 yAxis.ticks(scope.yticks);
 }

 // create line generator
 var line = d3.svg.line()
 .x(function(d) { return x(d.time); })
 .y(function(d) { return y(d.count); });
Expand All@@ -94,7 +115,7 @@ angular.module('dangle')
 .y0(height)
 .y1(function(d) { return y(d.count); });

 // enable interpolation if specified
 // enable interpolation if specified
 if (attrs.interpolate == 'true') {
 line.interpolate('cardinal');
 area.interpolate('cardinal');
Expand All@@ -120,23 +141,35 @@ angular.module('dangle')
 .attr('transform', 'translate(0,' + height + ')')
 .call(xAxis);

 // insert the x axis (no data yet)
 svg.append('g')
 var axis = svg.append('g')
 .attr('class', 'area y axis ' + klass)
 .call(yAxis)
 .append('text')
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .attr('dy', '.71em')
 .style('text-anchor', 'end')
 .text(label);
 .append('text')
 .attr('dy', '.71em')
 .text(label);
 // insert the y axis (no data yet)
 if(rotateLabel == 'true') {
 axis
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .style('text-anchor', 'end')
 } else {
 axis
 .attr('y', -10)
 .attr('dy', '.71em')
 }


 // generate the line. Data is empty at link time
 svg.append('path')
 .datum([])
 .attr('class', 'area line ' + klass)
 .attr("d", line);

 var div = d3.select("body").append("div")
 .attr("class", "area-tooltip")
 .style("opacity", 0);


 // main observer fn called when scope is updated. Data and scope vars are now bound
 scope.$watch('bind', function(data) {
Expand All@@ -158,7 +191,7 @@ angular.module('dangle')
 x.domain(d3.extent(data, function(d) { return d.time; }));
 y.domain([0, d3.max(data, function(d) { return d.count; })]);

 // create the transition
 // create the transition
 var t = svg.transition().duration(duration);

 // feed the current data to our area/line generators
Expand All@@ -172,13 +205,13 @@ angular.module('dangle')
 // using Math.random as (optional) key fn ensures old
 // data values are flushed and all new values inserted
 var points = svg.selectAll('circle')
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 });

 // d3 enter fn binds each new value to a circle
 // d3 enter fn binds each new value to a circle
 points.enter()
 .append('circle')
 .attr('class', 'area line points ' + klass)
Expand All@@ -194,10 +227,28 @@ angular.module('dangle')
 .attr("r", pointRadius);

 // wire up any events (registers filter callback)
 points.on('mousedown', function(d) {
 points.on('mousedown', function(d) {
 scope.$apply(function() {
 (scope.onClick || angular.noop)(field, d.time);
 });
 }).on("mouseover", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(200)
 .style("opacity", .9);
 div .html(
 "<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
 "<br>" + label + ":" + "<strong>" + d.count +"</strong>"
 )
 .style("left", (d3.event.pageX) + "px")
 .style("top", (d3.event.pageY - 28) + "px");
 }
 }).on("mouseout", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(100)
 .style("opacity", .0);
 }
 });

 // d3 exit/remove flushes old values (removes old circles)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Area enhancements#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

garethdjames
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Area enhancements
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
c8cc74e

added bower configuration

Aug 6, 2013
56f4da3

added support for setting margins with attributes

Aug 6, 2013
4f62360

version number increments

Aug 7, 2013
8768494

option to rotate the label with a default of true

Aug 8, 2013
1f7a84c

added tooltips to area

Aug 8, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
bower.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
{
 "name": "dangle",
 "version": "1.1.1",
 "main": "src/dangle.module.js",
 "ignore": [
 "**/.*",
 "node_modules",
 "bower_components",
 "test",
 "tests"
 ]
}

13 changes: 13 additions & 0 deletions
css/dangle.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,4 +53,17 @@
 fill: #000;
 stroke: none;
 font-size: 12px;
}

.area-tooltip {
 position: absolute;
 text-align: left;
 width: 150px;
 height: 40px;
 padding: 2px;
 font: 12px sans-serif;
 background: white;
 border: 2px #959595 solid;
 border-radius: 2px;
 pointer-events: none;
}

2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "name": "dangle",
 "description": "A set of AngularJS directives that provide common visualizations for elasticsearch based on D3",
 "version": "1.0.0",
 "version": "1.1.1",
 "homepage": "http://www.fullscale.co/dangle",
 "keywords": ["angularjs", "d3", "charts", "graphs", "elasticsearch"],
 "repository": {
Expand Down

99 changes: 75 additions & 24 deletions
src/modules/area/area.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 */

angular.module('dangle')
 .directive('fsArea', [function() {
 .directive('fsArea', ['$filter', function($filter) {
 'use strict';

 return {
Expand All@@ -41,18 +41,28 @@ angular.module('dangle')
 duration: '@',
 delay: '@',
 plot: '@',
 pointRadius: '@' 
 pointRadius: '@',
 marginLeft: '=',
 marginRight: '=',
 marginBottom:'=',
 marginTop: '=',
 xticks: '=',
 yticks: '=',
 tooltips: '@'
 },

 link: function(scope, element, attrs) {

 var dateFilter = $filter('date');

 var margin = {
 top: 20,
 right: 20,
 bottom: 30,
 left: 80
 top: scope.marginTop || 20,
 right: scope.marginRight || 20,
 bottom: scope.marginBottom || 30,
 left: scope.marginLeft || 80
 };


 // default width/height - mainly to create initial aspect ratio
 var width = scope.width || 1280;
 var height = scope.height || 300;
Expand All@@ -61,7 +71,9 @@ angular.module('dangle')
 var interpolate = attrs.interpolate || 'false';

 var label = attrs.label || 'Frequency';
 var rotateLabel = attrs.rotateLabel || 'true';
 var klass = attrs.class || '';
 var tooltips = attrs.tooltips || 'false';

 // add margins (make room for x,y labels)
 width = width - margin.left - margin.right;
Expand All@@ -74,7 +86,7 @@ angular.module('dangle')
 var y = d3.scale.linear()
 .range([height, 0]);

 // create x,y axis
 // create x,y axis
 var xAxis = d3.svg.axis()
 .scale(x)
 .orient('bottom');
Expand All@@ -83,7 +95,16 @@ angular.module('dangle')
 .scale(y)
 .orient('left');

 // create line generator 
 //set the number of ticks if specified
 if(scope.xticks) {
 xAxis.ticks(scope.xticks);
 }

 if(scope.yticks) {
 yAxis.ticks(scope.yticks);
 }

 // create line generator
 var line = d3.svg.line()
 .x(function(d) { return x(d.time); })
 .y(function(d) { return y(d.count); });
Expand All@@ -94,7 +115,7 @@ angular.module('dangle')
 .y0(height)
 .y1(function(d) { return y(d.count); });

 // enable interpolation if specified
 // enable interpolation if specified
 if (attrs.interpolate == 'true') {
 line.interpolate('cardinal');
 area.interpolate('cardinal');
Expand All@@ -120,23 +141,35 @@ angular.module('dangle')
 .attr('transform', 'translate(0,' + height + ')')
 .call(xAxis);

 // insert the x axis (no data yet)
 svg.append('g')
 var axis = svg.append('g')
 .attr('class', 'area y axis ' + klass)
 .call(yAxis)
 .append('text')
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .attr('dy', '.71em')
 .style('text-anchor', 'end')
 .text(label);
 .append('text')
 .attr('dy', '.71em')
 .text(label);
 // insert the y axis (no data yet)
 if(rotateLabel == 'true') {
 axis
 .attr('transform', 'rotate(-90)')
 .attr('y', 6)
 .style('text-anchor', 'end')
 } else {
 axis
 .attr('y', -10)
 .attr('dy', '.71em')
 }


 // generate the line. Data is empty at link time
 svg.append('path')
 .datum([])
 .attr('class', 'area line ' + klass)
 .attr("d", line);

 var div = d3.select("body").append("div")
 .attr("class", "area-tooltip")
 .style("opacity", 0);


 // main observer fn called when scope is updated. Data and scope vars are now bound
 scope.$watch('bind', function(data) {
Expand All@@ -158,7 +191,7 @@ angular.module('dangle')
 x.domain(d3.extent(data, function(d) { return d.time; }));
 y.domain([0, d3.max(data, function(d) { return d.count; })]);

 // create the transition
 // create the transition
 var t = svg.transition().duration(duration);

 // feed the current data to our area/line generators
Expand All@@ -172,13 +205,13 @@ angular.module('dangle')
 // using Math.random as (optional) key fn ensures old
 // data values are flushed and all new values inserted
 var points = svg.selectAll('circle')
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 .data(data.filter(function(d) {
 return d.count;
 }), function(d) {
 return Math.random();
 });

 // d3 enter fn binds each new value to a circle
 // d3 enter fn binds each new value to a circle
 points.enter()
 .append('circle')
 .attr('class', 'area line points ' + klass)
Expand All@@ -194,10 +227,28 @@ angular.module('dangle')
 .attr("r", pointRadius);

 // wire up any events (registers filter callback)
 points.on('mousedown', function(d) {
 points.on('mousedown', function(d) {
 scope.$apply(function() {
 (scope.onClick || angular.noop)(field, d.time);
 });
 }).on("mouseover", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(200)
 .style("opacity", .9);
 div .html(
 "<strong>" + dateFilter(new Date(d.time), "EEEE, MMM d, yyyy") + "</strong>" +
 "<br>" + label + ":" + "<strong>" + d.count +"</strong>"
 )
 .style("left", (d3.event.pageX) + "px")
 .style("top", (d3.event.pageY - 28) + "px");
 }
 }).on("mouseout", function(d) {
 if(tooltips === 'true') {
 div.transition()
 .duration(100)
 .style("opacity", .0);
 }
 });

 // d3 exit/remove flushes old values (removes old circles)
Expand Down