Commit 0b2785c1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

v0.11.0

Closes #22

See merge request redmic-project/client/web!11
parents a76787eb c5ae4626

.gitmodules

+3 −3
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ 
[submodule "public/javascript/redmic-widgets"]

	path = public/javascript/redmic-widgets

	url = ../widgets.git

	branch = dev

	branch = master

	ignore = dirty

[submodule "public/stylesheets"]

	path = public/stylesheets

	url = ../style.git

	branch = dev

	branch = master

	ignore = dirty

[submodule "public/javascript/templates"]

	path = public/javascript/templates

	url = ../templates.git

	branch = dev

	branch = master

	ignore = dirty
 
 No newline at end of file

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.10.1",

  "version": "0.11.0",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "description": "Integrated marine data repository of Canary Islands - Client",

public/javascript/app/designs/externalTextSearchList/main/Worms.js

+7 −4
Original line number Diff line number Diff line
@@ -121,9 +121,12 @@ define([ 
			}



			var value = obj.text,

				target = this.baseTarget,

				requestObj = {},

				evt = 'REQUEST';

				target = this.baseTarget;



			if (!value.length) {

				this._publish(this.browser.getChannel("CLEAR"));

				return;

			}



			if (value == parseInt(value, 10)) {

				target += "/" + value;
@@ -133,7 +136,7 @@ define([ 


			this.target = target;



			this._emitEvt('REQUEST', this._getRequestObj(requestObj));

			this._emitEvt('REQUEST', this._getRequestObj({}));

		},



		_getRequestObj: function(request) {

redmic-widgets @ eeafa749

Compare 52b48da3 to eeafa749
Original line number Diff line number Diff line 
Subproject commit 52b48da37aca2205d2e06cc06f8c8c2e234f7e14
 
Subproject commit eeafa74992f2f189b8b85051d0313ffb473f3971

public/javascript/redmic/modules/browser/HierarchicalImpl.js

+3 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ define([ 
		_addAfterData: function(response) {



			this._showPendingParents();

			//this._pendingParentsToShow = [];

		},



		_parserIndexData: function(response) {
@@ -269,6 +268,9 @@ define([ 
			if (!rowInstance || !this._evaluateItem(item)) {

				return;

			} else if (item[this.leavesProperty]) {

				if (!this._pendingParentsToShow) {

					this._pendingParentsToShow = [];

				}

				this._pendingParentsToShow.push(idProperty);



				return;