Skip to content

Commit

Permalink
package,index: switch to ui-leaflet and import global leaflet
Browse files Browse the repository at this point in the history
  • Loading branch information
andrenarchy committed Dec 7, 2016
1 parent 1a1706e commit 3ce5333
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ import 'rangy';
import 'rangy/lib/rangy-serializer';
import 'rangy/lib/rangy-textrange';

// dependency of ui-leaflet (global variable *facepalm*)
import 'leaflet';

// official angular modules
import { bootstrap, module } from 'angular';
import ngAnimate from 'angular-animate'; // ngAnimate module
Expand All @@ -29,7 +32,8 @@ import ngSanitize from 'angular-sanitize'; // ngSanitize module
import 'angular-route-segment'; // route-segment, view-segment
import 'angular-ui-bootstrap'; // ui.bootstrap
import 'angular-moment'; // angularMoment
import 'angular-leaflet-directive'; // leaflet-directive
import 'angular-simple-logger'; // nemLogger (dependency of ui-leaflet)
import 'ui-leaflet'; // ui-leaflet
import 'angulartics'; // angulartics
import 'angulartics-google-analytics';
import 'javascript-detect-element-resize/jquery.resize.js'; // injects resize+removeResize to jquery
Expand All @@ -54,10 +58,11 @@ export const paperhive = module(
'view-segment',
'ui.bootstrap',
'angularMoment',
'leaflet-directive',
'nemLogging',
'ui-leaflet',
'angulartics',
'angulartics.google.analytics',
]
],
)
.constant('config', configJson)
;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"dependencies": {
"angular": "^1.5.9",
"angular-animate": "^1.5.9",
"angular-leaflet-directive": "^0.10.0",
"angular-moment": "^1.0.0",
"angular-route": "^1.5.9",
"angular-route-segment": "^1.5.1",
Expand All @@ -91,6 +90,7 @@
"roboto-fontface": "^0.6.0",
"rx": "^4.1.0",
"socket.io-client": "^1.7.1",
"ui-leaflet": "^2.0.0",
"url": "^0.11.0"
}
}

0 comments on commit 3ce5333

Please sign in to comment.