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

Merge branch 'dev' into 'master' 

Corrige rama de módulo de estilos

See merge request redmic-project/client/widgets!1
parents a85d10d4 d04dd88a

.gitmodules

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
[submodule "src/stylesheets"]

	path = src/stylesheets

	url = ../style.git

	branch = dev

	branch = master

	ignore = dirty

src/app/ComboButton.js

+3 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ define([ 
				this.dropDown._popupWrapper.onmouseover = lang.hitch(this, this._stopTimeOut);

				this.dropDown._popupWrapper.onmouseleave = lang.hitch(this, this._startTimeOut);



				this.dropDownNode.onmouseover = lang.hitch(this, this._stopTimeOut);

				this.dropDownNode.onmouseleave = lang.hitch(this, this._startTimeOut);

			} else if (this.dropDown) {

				this._closePopup();
@@ -74,12 +75,13 @@ define([ 
		_closePopup: function(evt) {



			this.openPopup = false;

			this._stopTimeOut();

			popup.close(this.dropDown);

		},



		_startTimeOut: function() {



			this.timeOut = setTimeout(lang.hitch(this, this._closePopup), 1500);

			this.timeOut = setTimeout(lang.hitch(this, this._closePopup), 500);

		},



		_stopTimeOut: function() {

src/app/FilteringSelect.js

+3 −13
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ define([ 
				this.focusIn = -1;

				this._deleteValueInputAutocomplete();

				this.label = cleanSpace(this._getValueInput());

				//this.reset();

				this.emit(this.events.CHANGED, cleanSpace(this._getValueInput()));

			}

		},
@@ -333,10 +332,6 @@ define([ 


		_selectAutocompleteNode: function() {



			/*if (this.boxResultsNode.firstChild.getAttribute('data-redmic-id'))

				this._updateInputAutocomplete(this.boxResultsNode.firstChild.textContent);

			else

				this._updateInputAutocomplete(this.boxResultsNode.children[1].textContent);*/

			this._updateInputAutocomplete('');

		},
@@ -379,11 +374,9 @@ define([ 
				this._valid();

				return true;

			} else if ((this.label.length > 0) && (this.boxResultsNode && this.boxResultsNode.children.length === 0)) {

				this._notValid(); // emitir mensaje de valor erroneo

				//console.log("Valor erroneo");

				this._notValid();

			} else if ((this.boxResultsNode && this.boxResultsNode.children.length === 0) || this.required) {

				this._notValid(); // emitir mensaje de valor requerido

				//console.log("Se requiere el valor");

				this._notValid();

			} else {

				this._valid();

				return true;
@@ -634,10 +627,7 @@ define([ 
			}



			this.focusIn = spanNode;

			//this._setValueInput(item);

			this._labelFocus = item;

			//this.label = item;

			//this._updateInputAutocomplete(item);

			put(spanNode, ".hover");

		},

src/app/Map.js

+13 −8
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ define([ 
				urlMapBasemap: "https://atlas.redmic.es/geoserver/basemap/wms",

				layersBasemap: 'Redmic',

				formatBasemap: 'image/jpeg',

				latCenter: 28,

				lonCenter: -16,

				zoom: 6,

				widthAreaSelect: 300,

				heightAreaSelect: 200,

				latCenter: 28.5,

				lonCenter: -15.7,

				zoom: 5,

				widthAreaSelect: 250,

				heightAreaSelect: 120,

				events: {

					CHANGE: "change",

					QUERY_MAP: "queryMap",
@@ -50,6 +50,8 @@ define([ 


		postCreate: function() {



			this.inherited(arguments);



			// initialize map

			this.map = L.map(this.domNode, {

				doubleClickZoom: false,
@@ -60,7 +62,6 @@ define([ 
			});



			this._center();



			this._addLayerBase();

			// initialize areaSelect

			this._addAreaSelect();
@@ -89,7 +90,11 @@ define([ 
		_addAreaSelect: function() {



			// Add it to the map

			this.areaSelect = L.areaSelect({width:this.widthAreaSelect, height:this.heightAreaSelect});

			this.areaSelect = L.areaSelect({

				width: this.widthAreaSelect,

				height: this.heightAreaSelect

			});



			this.areaSelect.addTo(this.map);



			// Get a callback when the bounds change
@@ -98,7 +103,7 @@ define([ 


		_addLayer: function(obj) {



			if (obj.tiled == undefined) {

			if (obj.tiled === undefined) {

				obj.tiled = false;

			}

src/app/TextSearch.js

+13 −7
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ define([ 
		_selectKeyCodeArrows: function(keyCode) {



			if (keyCode === 13) {

				this._clickSearch();

				this._search();

			} else if (keyCode === 40) {

				this._selectNodeFocus(1);

			} else if (keyCode === 38) {
@@ -211,27 +211,33 @@ define([ 


			this.buttonSearchNode = put(this.domNode, "div.buttonSearch.border");

			put(this.buttonSearchNode, "i.fa.fa-search");

			this.buttonSearchNode.onclick = lang.hitch(this, this._clickSearch);

			this.buttonSearchNode.onclick = lang.hitch(this, this._onClickSearch);

		},



		_onClickSearch: function() {



			this._closeSuggestion();

			this._newSearch(true);

		},



		_execute: function() {



			this.lastSearch = null;



			this._clickSearch();

			this._search();

		},



		_clickSearch: function() {

		_search: function() {



			this._closeSuggestion();

			this._newSearch();

			this._newSearch(false);

		},



		_newSearch: function() {

		_newSearch: function(newSearch) {



			var value = this.getValueInput();



			if (this.lastSearch !== value) {

			if (newSearch || this.lastSearch !== value) {

				if (!value || value.length > 1) {

					this.lastSearch = value;

					this.emit(this.events.NEW_SEARCH, value);