Skip to content

Honor User Settings #10

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
leviwilson wants to merge 3 commits into
base: gh-pages
Choose a base branch
from
+43 −20
Open

Honor User Settings #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59262dd
Honor the persisted style in localStorage
leviwilson Feb 28, 2016
f46e273
Consolidate reading from localStorage
leviwilson Feb 28, 2016
b9a6100
Change how settings are saved; proper initialization of style radio
leviwilson Feb 29, 2016
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
63 changes: 43 additions & 20 deletions graph-editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
window.onload = function()
{
var graphModel;
if ( !localStorage.getItem( "graph-diagram-markup" ) )
{
graphModel = gd.model();
graphModel.createNode().x( 0 ).y( 0 );
save( formatMarkup() );
}
if ( localStorage.getItem( "graph-diagram-style" ) )
{
d3.select( "link.graph-style" )
.attr( "href", localStorage.getItem( "graph-diagram-style" ) );
}
graphModel = parseMarkup( localStorage.getItem( "graph-diagram-markup" ) );
var graphModel,
settings = {
markup: {
name: 'graph-diagram-markup',
default: '<ul class="graph-diagram-markup" data-internal-scale="1" data-external-scale="1">\n' +
' <li class="node" data-node-id="0" data-x="0" data-y="0"></li>\n' +
'</ul>'
},
style: {
name: 'graph-diagram-style',
default: 'style/graph-style-chunky.css'
},
internalScale: {
name: 'internalScale', default: 1.0
}
};

d3.select('link.graph-style').attr('href', valueOrDefault(settings.style));
d3.select('#internalScale').node().value = valueOrDefault(settings.internalScale);
d3.select('input[name=styleChoice][value="' + valueOrDefault(settings.style).match(/style\/(.*)/)[1] + '"]')
.property('checked', true);
graphModel = parseMarkup(valueOrDefault(settings.markup));

var svg = d3.select("#canvas")
.append("svg:svg")
Expand Down Expand Up @@ -96,8 +105,9 @@ window.onload = function()

function save( markup )
{
localStorage.setItem( "graph-diagram-markup", markup );
localStorage.setItem( "graph-diagram-style", d3.select( "link.graph-style" ).attr( "href" ) );
saveSetting(settings.markup, markup);
saveSetting(settings.style, d3.select('link.graph-style').attr('href'));
saveSetting(settings.internalScale, d3.select('#internalScale').node().value);
}

var newNode = null;
Expand Down Expand Up @@ -331,6 +341,14 @@ window.onload = function()
.on( "click", cancelModal );
}

function valueOrDefault(setting) {
return localStorage.getItem(setting.name) || setting.default;
}

function saveSetting(setting, value) {
localStorage.setItem(setting.name, value);
}

var exportMarkup = function ()
{
appendModalBackdrop();
Expand Down Expand Up @@ -380,17 +398,19 @@ window.onload = function()
d3.select("link.graph-style")
.attr("href", "style/" + selectedStyle);

graphModel = parseMarkup( localStorage.getItem( "graph-diagram-markup" ) );
graphModel = parseMarkup(valueOrDefault(settings.markup));
save(formatMarkup());
draw();
cancelModal();
});

function changeInternalScale() {
graphModel.internalScale(d3.select("#internalScale").node().value);
draw();
var internalScale = d3.select('#internalScale').node().value;
saveSetting(settings.internalScale, internalScale);

graphModel.internalScale(internalScale);
draw();
}
d3.select("#internalScale").node().value = graphModel.internalScale();

d3.select(window).on("resize", draw);
d3.select("#internalScale" ).on("change", changeInternalScale);
Expand All @@ -402,5 +422,8 @@ window.onload = function()
d3.event.stopPropagation();
} );

draw();
setTimeout(function() {
graphModel = parseMarkup(valueOrDefault(settings.markup));
changeInternalScale();
}, 0);
};