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

migrate presets to ES6 modules for #3118

Browse Source
This commit is contained in:
Beau Gunderson
2016-06-14 20:37:14 -07:00
parent f36812d8a4
commit 4dbce64b7d
13 changed files with 509 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/index.html
+1 -6
View File
@@ -42,6 +42,7 @@
<script src='../js/id/id.js'></script>
<script src='../js/lib/id/actions.js'></script>
<script src='../js/lib/id/presets.js'></script>
<script src='../js/lib/id/validations.js'></script>
<script src='../js/id/util.js'></script>
@@ -185,12 +186,6 @@
<script src='../js/id/core/tree.js'></script>
<script src='../js/id/core/tags.js'></script>
<script src='../js/id/presets.js'></script>
<script src='../js/id/presets/preset.js'></script>
<script src='../js/id/presets/category.js'></script>
<script src='../js/id/presets/collection.js'></script>
<script src='../js/id/presets/field.js'></script>
<script src='../js/id/util/session_mutex.js'></script>
<script src='../js/id/util/suggest_names.js'></script>
test/rendering.html
+2 -4
View File
@@ -34,9 +34,7 @@
<script src='../js/id/core/relation.js'></script>
<script src='../js/id/core/way.js'></script>
<script src='../js/id/presets.js'></script>
<script src='../js/id/presets/collection.js'></script>
<script src='../js/id/presets/preset.js'></script>
<script src='../js/lib/id/presets.js'></script>
<form style="position: fixed; right: 10px; bottom: 10px">
<input id="background-color" type="range" min="0" max="255" value="255">
@@ -61,7 +59,7 @@
};
context.presets = function() {
return iD.presets().load({
return iD.presets.presets().load({
presets: {
"amenity/restaurant": {
geometry: ['point'],
test/spec/presets.js
+4 -4
View File
@@ -1,4 +1,4 @@
describe("iD.presets", function() {
describe("iD.presets.presets", function() {
var p = {
point: {
tags: {},
@@ -22,7 +22,7 @@ describe("iD.presets", function() {
}
};
var c = iD.presets().load({presets: p});
var c = iD.presets.presets().load({presets: p});
describe("#match", function() {
it("returns a collection containing presets matching a geometry and tags", function() {
@@ -41,7 +41,7 @@ describe("iD.presets", function() {
});
describe("#areaKeys", function() {
var presets = iD.presets().load({
var presets = iD.presets.presets().load({
presets: {
'amenity/fuel/shell': {
tags: { 'amenity': 'fuel' },
@@ -110,7 +110,7 @@ describe("iD.presets", function() {
var presets;
before(function() {
presets = iD.presets().load(iD.data.presets);
presets = iD.presets.presets().load(iD.data.presets);
});
it("prefers building to multipolygon", function() {