Commit e12d3af7 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza fuente de dependencia y agrega script 

En lugar de traer la dependencia leaflet-awesome-markers desde
repositorio git, trae leaflet.awesome-markers desde el registro npm.
Esto evita el problema de no poder usar 'npm install' porque la
dependencia no provee un fichero package.json.

Incorpora script para la fase previa de empaquetado.
parent e2793946

dep/leaflet-awesome-markers

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../node_modules/leaflet-awesome-markers
 
 No newline at end of file

dep/leaflet.awesome-markers

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../node_modules/leaflet.awesome-markers
 
 No newline at end of file

grunt/task/copyIconFonts.js

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ module.exports = function(grunt) { 
			paths = {

				'fontRedmic': 'dep/Font-Awesome-Stylus/fonts',

				'fontAwesome': 'dep/font-redmic/build',

				'iconMarkers': 'dep/leaflet-awesome-markers/dist/images',

				'iconMarkers': 'dep/leaflet.awesome-markers/dist/images',

				'iconMeasure': 'dep/leaflet-measure/dist/assets',

				'iconFlags': 'dep/redmic-flag-icon-css/flags',

				'iconDraw': 'dep/leaflet-draw/dist/images',

package.json

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
    "type": "git",

    "url": "https://gitlab.com/redmic-project/client/style.git"

  },

  "scripts": {

    "prepack": "grunt build"

  },

  "devDependencies": {

    "alertifyjs": "1.14.0",

    "animate.css": "4.1.1",
@@ -33,7 +36,7 @@ 
    "grunt-contrib-stylus": "1.2.0",

    "grunt-shell": "3.0.1",

    "leaflet": "1.9.4",

    "leaflet-awesome-markers": "https://github.com/lennardv2/Leaflet.awesome-markers.git#2.0/develop",

    "leaflet.awesome-markers": "2.0.5",

    "leaflet-draw": "1.0.4",

    "leaflet-measure": "3.1.0",

    "leaflet-minimap": "3.6.1",

src/redmic/Map.styl

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 




@import '../dep/leaflet/dist/leaflet.css'

@import '../dep/leaflet-awesome-markers/dist/leaflet.awesome-markers.css'

@import '../dep/leaflet.awesome-markers/dist/leaflet.awesome-markers.css'

@import '../dep/pruneCluster/dist/LeafletStyleSheet.css'



.map