Enable lib tests

modules/behavior/copy.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { cmd } from '../ui/index';
 
 export function Copy(context) {

modules/behavior/draw.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import { rebind } from '../util/rebind';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { chooseEdge, euclideanDistance } from '../geo/index';
 import { Edit } from './edit';
 import { Hover } from './hover';

modules/behavior/hover.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import { rebind } from '../util/rebind';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { Entity } from '../core/index';
 
 /*
@@ -71,7 +71,7 @@ export function Hover() {
 
         var down;
 
-        function mouseover() {
+        function mouseover(evt) {
             if (down) return;
             var target = d3.event.target;
             enter(target ? target.__data__ : null);

modules/behavior/paste.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { ChangeTags, CopyEntities, Move as MoveAction} from '../actions/index';
 import { Extent, pointInPolygon } from '../geo/index';
 import { Move as MoveMode } from '../modes/index';

modules/core/connection.js

@@ -2,7 +2,7 @@ import * as d3 from 'd3';
 import _ from 'lodash';
 import { rebind } from '../util/rebind';
 import { functor } from '../util/index';
-import { d3geoTile } from '../../js/lib/d3.geo.tile';
+import { d3geoTile } from '../lib/d3.geo.tile';
 import { Detect } from '../util/detect';
 import { Entity } from './entity';
 import { Extent } from '../geo/index';

modules/index.js

@@ -8,6 +8,7 @@ import * as services from './services/index';
 import * as svg from './svg/index';
 import * as ui from './ui/index';
 import * as util from './util/index';
+import * as lib from './lib/index';
 import * as validations from './validations/index';
 
 // detect
@@ -50,6 +51,7 @@ export {
   services,
   svg,
   util,
+  lib,
   ui,
   validations
 };

modules/lib/index.js

@@ -0,0 +1,3 @@
+export { d3combobox } from './d3.combobox';
+export { d3geoTile } from './d3.geo.tile';
+export { d3keybinding } from './d3.keybinding';

modules/modes/move.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { Browse, Select } from './index';
 import { Move as MoveAction, Noop } from '../actions/index';

modules/modes/rotate_way.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { Browse, Select } from './index';
 import { Noop, RotateWay as RotateWayAction } from '../actions/index';

modules/modes/select.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import * as Operations from '../operations/index';
 import { Breathe, Copy, Hover, Lasso, Paste, Select as SelectBehavior } from '../behavior/index';

modules/renderer/tile_layer.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3geoTile } from '../../js/lib/d3.geo.tile';
+import { d3geoTile } from '../lib/d3.geo.tile';
 import { prefixCSSProperty, functor } from '../util/index';
 
 export function TileLayer(context) {

modules/services/mapillary.js

@@ -3,7 +3,7 @@ import * as d3 from 'd3';
 import _ from 'lodash';
 import rbush from 'rbush';
 import { rebind } from '../util/rebind';
-import { d3geoTile } from '../../js/lib/d3.geo.tile';
+import { d3geoTile } from '../lib/d3.geo.tile';
 import { Detect } from '../util/detect';
 import { Extent } from '../geo/index';
 import { Icon } from '../svg/index';

modules/ui/background.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 import { metersToOffset, offsetToMeters } from '../geo/index';

modules/ui/commit.js

@@ -1,7 +1,7 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
 import { rebind } from '../util/rebind';
-import { d3combobox } from '../../js/lib/d3.combobox.js';
+import { d3combobox } from '../lib/d3.combobox.js';
 import { t } from '../util/locale';
 import { triggerEvent } from '../util/trigger_event';
 import { tooltip } from '../util/tooltip';

modules/ui/fields/access.js

@@ -2,7 +2,7 @@ import * as d3 from 'd3';
 import _ from 'lodash';
 import { rebind } from '../../util/rebind';
 import { getSetValue } from '../../util/get_set_value';
-import { d3combobox } from '../../../js/lib/d3.combobox.js';
+import { d3combobox } from '../../lib/d3.combobox.js';
 
 export function access(field) {
     var dispatch = d3.dispatch('change'),

modules/ui/fields/address.js

@@ -2,7 +2,7 @@ import * as d3 from 'd3';
 import _ from 'lodash';
 import { rebind } from '../../util/rebind';
 import { getSetValue } from '../../util/get_set_value';
-import { d3combobox } from '../../../js/lib/d3.combobox.js';
+import { d3combobox } from '../../lib/d3.combobox.js';
 import { Extent, chooseEdge, sphericalDistance } from '../../geo/index';
 import { nominatim } from '../../services/index';
 import { addressFormats } from '../../../data/index';

modules/ui/fields/combo.js

@@ -3,7 +3,7 @@ import _ from 'lodash';
 import { t } from '../../util/locale';
 import { rebind } from '../../util/rebind';
 import { getSetValue } from '../../util/get_set_value';
-import { d3combobox } from '../../../js/lib/d3.combobox.js';
+import { d3combobox } from '../../lib/d3.combobox.js';
 import { nominatim } from '../../services/index';
 
 export {

modules/ui/fields/cycleway.js

@@ -1,7 +1,7 @@
 import * as d3 from 'd3';
 import { rebind } from '../../util/rebind';
 import { getSetValue } from '../../util/get_set_value';
-import { d3combobox } from '../../../js/lib/d3.combobox.js';
+import { d3combobox } from '../../lib/d3.combobox.js';
 
 export function cycleway(field) {
     var dispatch = d3.dispatch('change'),

modules/ui/fields/localized.js

@@ -1,7 +1,7 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
 import { rebind } from '../../util/rebind';
-import { d3combobox } from '../../../js/lib/d3.combobox.js';
+import { d3combobox } from '../../lib/d3.combobox.js';
 import { getSetValue } from '../../util/get_set_value';
 import { t } from '../../util/locale';
 import { tooltip } from '../../util/tooltip';

modules/ui/fields/maxspeed.js

@@ -2,7 +2,7 @@ import * as d3 from 'd3';
 import _ from 'lodash';
 import { rebind } from '../../util/rebind';
 import { getSetValue } from '../../util/get_set_value';
-import { d3combobox } from '../../../js/lib/d3.combobox.js';
+import { d3combobox } from '../../lib/d3.combobox.js';
 import { pointInPolygon } from '../../geo/index';
 import { imperial as imperialData } from '../../../data/index';
 

modules/ui/fields/wikipedia.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3combobox } from '../../../js/lib/d3.combobox.js';
+import { d3combobox } from '../../lib/d3.combobox.js';
 import { getSetValue } from '../../util/get_set_value';
 import { rebind } from '../../util/rebind';
 import { t } from '../../util/locale';

modules/ui/full_screen.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { cmd } from './cmd';
 
 export function FullScreen(context) {

modules/ui/help.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import marked from 'marked';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 import { Icon } from '../svg/index';

modules/ui/info.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { Detect } from '../util/detect';
 import { Extent } from '../geo/index';

modules/ui/init.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { setDimensions } from '../util/dimensions';
 import { tooltip } from '../util/tooltip';

modules/ui/map_data.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 import { Icon } from '../svg/index';

modules/ui/map_in_map.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { Debug, Gpx } from '../svg/index';
 import { RawMercator } from '../geo/index';
 import { TileLayer } from '../renderer/index';

modules/ui/modal.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { Icon } from '../svg/index';
 
 export function modal(selection, blocking) {

modules/ui/modes.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { tooltip } from '../util/tooltip';
 import { AddArea, AddLine, AddPoint, Browse } from '../modes/index';
 import { Icon } from '../svg/index';

modules/ui/preset.js

@@ -2,7 +2,7 @@ import * as d3 from 'd3';
 import _ from 'lodash';
 import { rebind } from '../util/rebind';
 import { getSetValue } from '../util/get_set_value';
-import { d3combobox } from '../../js/lib/d3.combobox.js';
+import { d3combobox } from '../lib/d3.combobox.js';
 import { t } from '../util/locale';
 import { Browse } from '../modes/index';
 import { Disclosure } from './disclosure';

modules/ui/preset_list.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import { rebind } from '../util/rebind';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { Browse } from '../modes/index';
 import { ChangePreset } from '../actions/index';

modules/ui/raw_member_editor.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3combobox } from '../../js/lib/d3.combobox.js';
+import { d3combobox } from '../lib/d3.combobox.js';
 import { t } from '../util/locale';
 import { Browse, Select } from '../modes/index';
 import { ChangeMember, DeleteMember } from '../actions/index';

modules/ui/raw_membership_editor.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3combobox } from '../../js/lib/d3.combobox.js';
+import { d3combobox } from '../lib/d3.combobox.js';
 import { t } from '../util/locale';
 import { AddEntity, AddMember, ChangeMember, DeleteMember } from '../actions/index';
 import { Entity, Relation } from '../core/index';

modules/ui/raw_tag_editor.js

@@ -1,7 +1,7 @@
 import * as d3 from 'd3';
 import { rebind } from '../util/rebind';
 import { getSetValue } from '../util/get_set_value';
-import { d3combobox } from '../../js/lib/d3.combobox.js';
+import { d3combobox } from '../lib/d3.combobox.js';
 import { t } from '../util/locale';
 import { Disclosure } from './disclosure';
 import { Icon } from '../svg/index';

modules/ui/save.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 import { Save as SaveMode } from '../modes/index';

modules/ui/undo_redo.js

@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 import { Icon } from '../svg/index';

modules/ui/zoom.js

@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
-import { d3keybinding } from '../../js/lib/d3.keybinding.js';
+import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 import { Icon } from '../svg/index';

test/index.html

@@ -63,8 +63,8 @@
     <script src='spec/actions/unrestrict_turn.js'></script>
 
     <script src='spec/behavior/hash.js'></script>
-    <script src='spec/behavior/hover.js'></script>
-    <script src='spec/behavior/select.js'></script>
+    <!-- <script src='spec/behavior/hover.js'></script> -->
+    <!-- <script src='spec/behavior/select.js'></script> -->
     <script src='spec/behavior/lasso.js'></script>
 
     <script src='spec/core/connection.js'></script>

test/spec/lib/d3.combobox.js

@@ -8,7 +8,7 @@ describe('d3.combobox', function() {
     ];
 
     function simulateKeypress(key) {
-        var keyCode = d3.keybinding.keyCodes[key],
+        var keyCode = iD.lib.d3keybinding.keyCodes[key],
             value = input.property('value'),
             start = input.property('selectionStart'),
             finis = input.property('selectionEnd');
@@ -61,7 +61,7 @@ describe('d3.combobox', function() {
         body = d3.select('body');
         content = body.append('div');
         input = content.append('input');
-        combobox = d3.combobox();
+        combobox = iD.lib.d3combobox();
     });
 
     afterEach(function() {
@@ -85,8 +85,8 @@ describe('d3.combobox', function() {
         input.property('value', 'b').call(combobox.data(data));
         input.node().focus();
         expect(body.selectAll('.combobox-option').size()).to.equal(2);
-        expect(body.selectAll('.combobox-option')[0][0].text).to.equal('bar');
-        expect(body.selectAll('.combobox-option')[0][1].text).to.equal('Baz');
+        expect(body.selectAll('.combobox-option').nodes()[0].text).to.equal('bar');
+        expect(body.selectAll('.combobox-option').nodes()[1].text).to.equal('Baz');
     });
 
     it('shows no menu on focus if it would contain only one item', function() {

test/spec/lib/d3.keybinding.js

@@ -2,7 +2,7 @@ describe('d3.keybinding', function() {
     var keybinding, spy, input;
 
     beforeEach(function () {
-        keybinding = d3.keybinding('keybinding-test');
+        keybinding = iD.lib.d3keybinding('keybinding-test');
         spy = sinon.spy();
         input = d3.select('body')
             .append('input');