Commit 2b17ea64 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza tercer grupo de dependencias, adapta 

Adapta uso de dependencia uuid a nueva versión, renombrada y cargada por
separado según versión.

Corrige algunos etiquetados del perfil de compilación.
parent 0c89c5e9

grunt/config/cleanBuiltApp.js

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ module.exports = function(grunt) { 
	var directoriesToDelete = [

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

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

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

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

		'put-selector', 'redmic', 'RWidgets', 'sockjs', 'stompjs', 'templates', 'tv4', 'wicket'

	];

package.json

+5 −5
Original line number Diff line number Diff line
@@ -78,17 +78,17 @@ 
    "mediator-js": "0.11.0",

    "moment": "2.29.3",

    "nib": "1.1.2",

    "node-uuid": "https://github.com/kelektiv/node-uuid.git#v1.4.7",

    "packery": "2.1.1",

    "uuid": "8.3.2",

    "packery": "2.1.2",

    "pdfjs": "https://github.com/mozilla/pdf.js.git#v2.3.200",

    "prunecluster": "https://github.com/pedroetb/PruneCluster.git",

    "put-selector": "0.3.6",

    "sockjs-client": "1.1.4",

    "stompjs": "https://github.com/jmesnil/stomp-websocket.git#master",

    "stylus": "0.54.8",

    "stylus": "0.57.0",

    "tv4": "https://github.com/geraintluff/tv4.git#master",

    "uglify-js": "3.3.24",

    "wicket": "1.3.6"

    "uglify-js": "3.15.4",

    "wicket": "1.3.8"

  },

  "engines": {

    "node": ">=6.0",

public/javascript/app/base/models/_Model.js

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

	, "dojo/Evented"

	, "dojo/topic"

	, 'node-uuid/uuid'

	, 'uuid/uuidv4.min'

	, "RWidgets/Utilities"

], function (

	ObjAttr
@@ -71,7 +71,7 @@ define([ 
			//	summary:

			//		Asigna un nuevo UUID a la instancia.



			this._uuid = uuid.v4();

			this._uuid = uuid();

		},



		_modelUuidGetter: function() {
@@ -371,7 +371,7 @@ define([ 


			while ((results = regExp.exec(path)) !== null) {

				var pathToArray = results[1],

					uuid = results[2];

					itemUuid = results[2];



				if (results.index) {

					pathToArray = pathToArray.substring(1);
@@ -383,7 +383,7 @@ define([ 
					return;

				}



				var indexForUuid = instance._getItemIndex(uuid);

				var indexForUuid = instance._getItemIndex(itemUuid);



				if (indexForUuid === -1) {

					return;

public/javascript/app/base/models/attr/ArrayAttr.js

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

	, "dojo/Deferred"

	, "RWidgets/Utilities"

	, 'node-uuid/uuid'

	, 'uuid/uuidv4.min'

	, "./_ComplexAttr"

], function (

	declare
@@ -144,16 +144,16 @@ define([ 
			return (Utilities.isValidNumber(index) && index >= 0) ? this._itemIdsByPosition[index] : index;

		},



		_getItemIndex: function(/*String*/ uuid) {

		_getItemIndex: function(/*String*/ itemUuid) {

			//	summary:

			//		Devuelve el índice que le corresponde dentro del array al UUID especificado.

			//	uuid:

			//	itemUuid:

			//		UUID del elemento cuyo índice es buscado

			//	returns:

			//		Índice del elemento dentro del array (o -1 si no se encuentra)



			for (var i = 0; i < this._length; i++) {

				if (this._itemIdsByPosition[i] === uuid) {

				if (this._itemIdsByPosition[i] === itemUuid) {

					return i;

				}

			}
@@ -253,7 +253,7 @@ define([ 
			//	summary:

			//		Genera y devuelve un nuevo UUID



			return uuid.v4();	// return String

			return uuid();	// return String

		},



		_addValue: function(/*String*/ generatedIndex, /*Integer*/ positionIndex) {
@@ -338,17 +338,17 @@ define([ 
			}

		},



		_buildItems: function(/*Object*/ schema, /*String*/ uuid, /*Integer*/ index) {

		_buildItems: function(/*Object*/ schema, /*String*/ itemUuid, /*Integer*/ index) {

			//	summary:

			//		Constructor de los elementos del array.

			//	schema:

			//		Sub-schema con los elementos del array

			//	uuid:

			//	itemUuid:

			//		UUID del elemento que vamos a construir

			//	index:

			//		Índice del elemento que vamos a construir



			var props = this._getPropsForNewInstance(uuid, schema),

			var props = this._getPropsForNewInstance(itemUuid, schema),

				previousInitValue = this._initValue ? this._initValue[index] : undefined,

				dfd = new Deferred();
@@ -371,10 +371,10 @@ define([ 
			return dfd;

		},



		_getChildIsRequired: function(/*String*/ uuid) {

		_getChildIsRequired: function(/*String*/ itemUuid) {

			//	summary:

			//		Comprueba si un elemento es requerido según el schema de su ancestro.

			//	uuid:

			//	itemUuid:

			//		UUID del elemento que comprobamos.

			//	returns:

			//		Estado de requerido del elemento.
@@ -577,18 +577,17 @@ define([ 
			//	summary:

			//		Devuelve si el valor ha cambiado con respecto al original de la instancia.



			var type = this._schema.type;



			if (this._isTypeNull() && !value &&

				(!initValue || initValue.length === 0)) {

			if (this._isTypeNull() && !value && (!initValue || initValue.length === 0)) {

				return false;

			} else if (!value || !initValue || value.length !== initValue.length) {

			}



			if (!value || !initValue || value.length !== initValue.length) {

				return true;

			}



			var uuid, instance;

			for (uuid in this._items) {

				instance = this._items[uuid];

			var itemUuid, instance;

			for (itemUuid in this._items) {

				instance = this._items[itemUuid];

				if (instance.get && instance.get("hasChanged")) {

					return true;

				}

public/javascript/dojoConfig.js

+2 −2
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ dojoConfig = { 
		name: 'colorjs',

		location: '../color-js'

	},{

		name: 'node-uuid',

		location: '../node-uuid'

		name: 'uuid',

		location: '../uuid/dist/umd'

	},{

		name: 'json-schema-ref-parser',

		location: '../json-schema-ref-parser/dist'