CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-07 20:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2009 from mourner/master

Browse Source 
Fix build and tests, add missing methods to lodash build
This commit is contained in:
John Firebaugh
2013-11-21 15:26:04 -08:00
parent 15590525d3 831f4964aa
commit c1d9799214
3 changed files with 671 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.js
View File

@@ -122,7 +122,7 @@ function generatePresets() {
});
fs.writeFileSync('data/presets/presets.json', stringify(presets));
fs.writeFileSync('js/id/core/area_keys.js', '/* jshint -W109 */\niD.Way.areaKeys = ' + stringify(areaKeys) + ';');
fs.writeFileSync('js/id/core/area_keys.js', '/* jshint -W109 */\niD.areaKeys = ' + stringify(areaKeys) + ';');
var presetsYaml = _.cloneDeep(translations);
_.forEach(presetsYaml.presets, function(preset) {

1031
js/lib/lodash.js
View File

File diff suppressed because it is too large Load Diff

6
test/spec/behavior/hash.js
View File

@@ -56,9 +56,15 @@ describe('iD.behavior.Hash', function () {
hash();
var clock = sinon.useFakeTimers();
context.map().center([38.9, -77.0]);
context.map().zoom(2.0);
clock.tick(500);
expect(location.hash).to.equal('#map=2.00/38.9/-77.0');
clock.restore();
});
});