CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 17:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1739 from tyrasd/patch-1737

Browse Source 
Fix loading graph of unserialized objects. Fixes walkthrough
This commit is contained in:
John Firebaugh
2013-08-24 07:56:33 -07:00
parent 2c93e053ae 9a4894a328
commit 2fbfb76cc4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/id/ui/intro.js
View File

@@ -12,12 +12,18 @@ iD.ui.intro = function(context) {
background = context.background().baseLayerSource(),
opacity = d3.select('.background-layer').style('opacity'),
loadedTiles = context.connection().loadedTiles(),
baseEntities = context.history().graph().base().entities;
baseEntities = context.history().graph().base().entities,
introGraph;
// Load semi-real data used in intro
context.connection().toggle(false).flush();
context.history().save().reset();
context.history().merge(iD.Graph().load(JSON.parse(iD.introGraph)).entities);
introGraph = JSON.parse(iD.introGraph);
for (var key in introGraph) {
introGraph[key] = iD.Entity(introGraph[key]);
}
context.history().merge(iD.Graph().load(introGraph).entities);
context.background().bing();
// Block saving