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

Actualiza D3 a v7, corrige su uso compilado 

Retoca detalles de uso de D3 en modo compilado tras su actualización a
desde v5.
Retoca ajustes relacionados con la compilación y limpieza de recursos.
parent 8c019483

grunt/config/cleanBuiltApp.js

+1 −1
Original line number Diff line number Diff line 
module.exports = function(grunt) {



	var directoriesToDelete = [

		'alertify', 'awesome-markers', 'cbtree', 'd3', 'd3Tip', 'dijit', 'dojo', 'dojox', 'deepmerge', 'dropzone',

		'alertify', 'awesome-markers', 'cbtree', 'd3Tip', 'dijit', 'dojo', 'dojox', 'deepmerge', 'dropzone',

		'handlebars', 'L-areaselect', 'L-coordinates', 'L-draw', 'L-miniMap', 'L-navBar', 'leaflet',

		'leaflet-measure', 'leaflet-nontiledlayer', 'mediatorjs', 'moment', 'uuid', 'proj4js', 'pruneCluster',

		'put-selector', 'redmic', 'RWidgets', 'sockjs', 'stomp-websocket', 'templates', 'tv4', 'wicket'

grunt/task/buildApp.js

+5 −1
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ module.exports = function(grunt) { 
					cleanFilesCmd += optionPrefix + ' -name "' + file + '" -delete';

				}



				var appDir = destPath + 'app',

					cleanUnusedAppFilesCmd = 'find ' + appDir + ' -maxdepth 1 -type f -name "*.js" -delete';



				return [

					'echo "\nCleaning build and debug resources from built application at ' + destPath + '\n"',

					keepFilesCmd,
@@ -99,7 +102,8 @@ module.exports = function(grunt) { 
					cleanRecursiveDirsCmd,

					createDirectoriesToRestoreFilesCmd,

					restoreFilesCmds.join('; '),

					cleanFilesCmd

					cleanFilesCmd,

					cleanUnusedAppFilesCmd

				].join('; ');

			}

		});

package.json

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
    "alertifyjs": "1.13.1",

    "cbtree": "https://github.com/pjekel/cbtree.git#master",

    "color-js": "1.0.5",

    "d3": "6.7.0",

    "d3": "7.4.4",

    "d3-v6-tip": "1.0.9",

    "deepmerge": "3.3.0",

    "dijit": "1.17.2",

public/javascript/app/designs/details/main/Statistics.js

+4 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ define([ 
	, "dojo/_base/lang"

	, "redmic/modules/browser/_ButtonsInRow"

	, "redmic/modules/browser/ListImpl"

	, "templates/AdministrativeStatisticsList"

	//, "templates/AdministrativeStatisticsList"

	, "templates/StatisticsTitle"

], function(

	_Main
@@ -20,7 +20,7 @@ define([ 
	, lang

	, _ButtonsInRow

	, ListImpl

	, TemplateList

	//, TemplateList

	, TemplateTitle

){

	return declare([Layout, Controller, _Main, _AddTitle], {
@@ -61,7 +61,8 @@ define([ 
					props: {

						title: this.i18n.administrative,

						target: this.targetBrowser,

						template: TemplateList,

						//template: TemplateList,

						template: TemplateTitle,

						rowConfig: {

							buttonsConfig: {

								listButton: [{

public/javascript/dojoConfigBuild.js

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ dojoConfig = { 
	},{

		name: 'colorjs',

		location: '../colorjs'

	},{

		name: 'd3',

		location: '../d3'

	}],



	map: {