From e7dff687a96eec92b4d3e20e4e1760bcd1bb82b8 Mon Sep 17 00:00:00 2001
From: parkera <parkera>
Date: Fri, 11 Mar 2016 09:23:22 +0000
Subject: [PATCH] SSDM-3024 : Update ELN v3 to latest version
SVN: 35877
---
.../search/AbstractCompositeSearchCriteria.js | 11 -
.../search/AbstractEntitySearchCriteria.js | 6 -
.../search/SearchCriteriaToStringBuilder.js | 58 -
.../search/StringContainsExactlyValue.js | 13 +
.../as/dto/common/update/FieldUpdateValue.js | 3 +
.../dataset/search/DataSetSearchCriteria.js | 5 -
.../deletion/search/DeletionSearchCriteria.js | 6 -
.../search/EntityTypeSearchCriteria.js | 6 -
.../search/ExperimentSearchCriteria.js | 5 -
.../js/v3/as/dto/global/GlobalSearchObject.js | 106 ++
.../GlobalSearchObjectFetchOptions.js | 89 +
.../GlobalSearchObjectSortOptions.js | 42 +
.../dto/global/search/GlobalSearchCriteria.js | 31 +
.../global/search/GlobalSearchObjectKind.js | 11 +
.../search/GlobalSearchObjectKindCriteria.js | 23 +
.../global/search/GlobalSearchTextCriteria.js | 22 +
.../search/GlobalSearchWildCardsCriteria.js | 15 +
.../material/search/MaterialSearchCriteria.js | 5 -
.../search/ObjectKindCriteria.js | 23 +
.../ObjectKindModificationSearchCriteria.js | 52 +-
.../search/OperationKindCriteria.js | 23 +
.../openbis/js/v3/as/dto/project/Project.js | 15 -
.../fetchoptions/ProjectFetchOptions.js | 17 +-
.../project/search/NoProjectSearchCriteria.js | 12 -
.../project/search/ProjectSearchCriteria.js | 6 -
.../lib/openbis/js/v3/as/dto/sample/Sample.js | 12 -
.../v3/as/dto/sample/create/SampleCreation.js | 9 +-
.../sample/fetchoptions/SampleFetchOptions.js | 17 +-
.../dto/sample/search/SampleSearchCriteria.js | 15 +-
.../v3/as/dto/sample/update/SampleUpdate.js | 12 -
.../search/CustomASServiceSearchCriteria.js | 6 -
.../dto/space/search/SpaceSearchCriteria.js | 6 -
.../v3/as/dto/tag/search/TagSearchCriteria.js | 6 -
.../js/v3/lib/underscore/js/underscore.js | 1549 ++++++++++++++++-
.../html/lib/openbis/js/v3/util/Json.js | 8 +-
35 files changed, 1984 insertions(+), 261 deletions(-)
delete mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/StringContainsExactlyValue.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/GlobalSearchObject.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/fetchoptions/GlobalSearchObjectSortOptions.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchCriteria.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchObjectKind.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchObjectKindCriteria.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchTextCriteria.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchWildCardsCriteria.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/ObjectKindCriteria.js
create mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/OperationKindCriteria.js
delete mode 100644 plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/search/NoProjectSearchCriteria.js
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
index 02d2df10501..0a4e7d033ff 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
@@ -29,17 +29,6 @@ define([ "stjs", "as/dto/common/search/AbstractSearchCriteria", "as/dto/common/s
prototype.withAndOperator = function() {
this.operator = SearchOperator.AND;
}
- prototype.toString = function() {
- return this.toString("");
- };
- prototype.toString = function(indentation) {
- return this.createBuilder().toString(indentation);
- };
- prototype.createBuilder = function() {
- var builder = new SearchCriteriaToStringBuilder();
- builder.setCriteria(this.criteria);
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/AbstractEntitySearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
index aaf12115e27..005fa13634e 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
@@ -65,12 +65,6 @@ define(
var AnyFieldSearchCriteria = require("as/dto/common/search/AnyFieldSearchCriteria");
return this.addCriteria(new AnyFieldSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setOperator(this.operator);
- return builder;
- };
}, {
operator : {
name : "Enum",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js
deleted file mode 100644
index 8e5c82ceb17..00000000000
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @author pkupczyk
- */
-define([ "stjs", "as/dto/common/search/AbstractCompositeSearchCriteria" ], function(stjs, AbstractCompositeSearchCriteria) {
- var SearchCriteriaToStringBuilder = function() {
- };
- stjs.extend(SearchCriteriaToStringBuilder, null, [], function(constructor, prototype) {
- prototype['@type'] = 'as.dto.common.search.SearchCriteriaToStringBuilder';
- prototype.name = null;
- prototype.operator = null;
- prototype.criteria = null;
- prototype.setName = function(name) {
- this.name = name;
- return this;
- };
- prototype.setOperator = function(operator) {
- this.operator = operator;
- return this;
- };
- prototype.setCriteria = function(criteria) {
- this.criteria = criteria;
- return this;
- };
- prototype.toString = function(anIndentation) {
- // TODO rewrite to JS version
- var sb = new StringBuilder();
- var indentation = anIndentation;
- if (indentation.isEmpty()) {
- sb.append(this.name.toUpperCase() + "\n");
- } else {
- sb.append(indentation + "with " + this.name.toLowerCase() + ":\n");
- }
- indentation += " ";
- if (this.operator != null) {
- sb.append(indentation + "with operator '" + this.operator + "'\n");
- }
- for ( var criterion in this.criteria) {
- if (stjs.isInstanceOf(criterion.constructor, AbstractCompositeSearchCriteria)) {
- var compositeCriteria = criterion;
- sb.append(compositeCriteria.toString(indentation));
- } else {
- sb.append(indentation + criterion.toString() + "\n");
- }
- }
- return sb.toString();
- };
- }, {
- operator : {
- name : "Enum",
- arguments : [ "SearchOperator" ]
- },
- criteria : {
- name : "Collection",
- arguments : [ "ISearchCriteria" ]
- }
- });
- return SearchCriteriaToStringBuilder;
-})
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/StringContainsExactlyValue.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/StringContainsExactlyValue.js
new file mode 100644
index 00000000000..c81c7adfa38
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/search/StringContainsExactlyValue.js
@@ -0,0 +1,13 @@
+define([ "stjs", "as/dto/common/search/AbstractStringValue" ], function(stjs, AbstractStringValue) {
+ var StringContainsExactlyValue = function(value) {
+ AbstractStringValue.call(this, value);
+ };
+ stjs.extend(StringContainsExactlyValue, AbstractStringValue, [ AbstractStringValue ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.common.search.StringContainsExactlyValue';
+ constructor.serialVersionUID = 1;
+ prototype.toString = function() {
+ return "contains exactly '" + this.getValue() + "'";
+ };
+ }, {});
+ return StringContainsExactlyValue;
+})
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/update/FieldUpdateValue.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/update/FieldUpdateValue.js
index d8dbb131524..d7807166bcd 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/update/FieldUpdateValue.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/common/update/FieldUpdateValue.js
@@ -15,6 +15,9 @@ define([ "stjs" ], function(stjs) {
* value for update
*/
prototype.setValue = function(value) {
+ if (this.value === value) {
+ return;
+ }
this.value = value;
this.isModified = true;
};
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/dataset/search/DataSetSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/dataset/search/DataSetSearchCriteria.js
index b2361796ce8..140ef89a188 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/dataset/search/DataSetSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/dataset/search/DataSetSearchCriteria.js
@@ -46,11 +46,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria",
prototype.getRelation = function() {
return this.relation;
};
- prototype.createBuilder = function() {
- var builder = AbstractEntitySearchCriteria.prototype.createBuilder.call(this);
- builder.setName(this.relation.name());
- return builder;
- };
}, {
relation : {
name : "Enum",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/deletion/search/DeletionSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/deletion/search/DeletionSearchCriteria.js
index 0a4c8421eba..1e15697c751 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/deletion/search/DeletionSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/deletion/search/DeletionSearchCriteria.js
@@ -5,12 +5,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria"
stjs.extend(DeletionSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
prototype['@type'] = 'as.dto.deletion.search.DeletionSearchCriteria';
constructor.serialVersionUID = 1;
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("DELETION");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
index ea2692a48ea..b8660825597 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
@@ -17,12 +17,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("TYPE");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/experiment/search/ExperimentSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
index 1ecb1b0bac2..6e31f502b88 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
@@ -19,11 +19,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria",
prototype.withAndOperator = function() {
return this.withOperator(SearchOperator.AND);
};
- prototype.createBuilder = function() {
- var builder = AbstractEntitySearchCriteria.prototype.createBuilder.call(this);
- builder.setName("EXPERIMENT");
- return builder;
- };
}, {
operator : {
name : "Enum",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/GlobalSearchObject.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/GlobalSearchObject.js
new file mode 100644
index 00000000000..189c3ecc012
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/GlobalSearchObject.js
@@ -0,0 +1,106 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var GlobalSearchObject = function() {
+ };
+ stjs.extend(GlobalSearchObject, null, [], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.global.GlobalSearchObject';
+ constructor.serialVersionUID = 1;
+ prototype.fetchOptions = null;
+ prototype.objectKind = null;
+ prototype.objectPermId = null;
+ prototype.objectIdentifier = null;
+ prototype.match = null;
+ prototype.score = null;
+ prototype.experiment = null;
+ prototype.sample = null;
+ prototype.dataSet = null;
+ prototype.material = null;
+
+ prototype.getFetchOptions = function() {
+ return this.fetchOptions;
+ };
+ prototype.setFetchOptions = function(fetchOptions) {
+ this.fetchOptions = fetchOptions;
+ };
+ prototype.getObjectKind = function() {
+ return this.objectKind;
+ };
+ prototype.setObjectKind = function(objectKind) {
+ this.objectKind = objectKind;
+ };
+ prototype.getObjectPermId = function() {
+ return this.objectPermId;
+ };
+ prototype.setObjectPermId = function(objectPermId) {
+ this.objectPermId = objectPermId;
+ };
+ prototype.getObjectIdentifier = function() {
+ return this.objectIdentifier;
+ };
+ prototype.setObjectIdentifier = function(objectIdentifier) {
+ this.objectIdentifier = objectIdentifier;
+ };
+ prototype.getMatch = function() {
+ return this.match;
+ };
+ prototype.setMatch = function(match) {
+ this.match = match;
+ };
+ prototype.getScore = function() {
+ return this.score;
+ };
+ prototype.setScore = function(score) {
+ this.score = score;
+ };
+ prototype.getExperiment = function() {
+ if (this.getFetchOptions().hasExperiment()) {
+ return this.experiment;
+ } else {
+ throw new exceptions.NotFetchedException("Experiment has not been fetched.");
+ }
+ };
+ prototype.setExperiment = function(experiment) {
+ this.experiment = experiment;
+ };
+ prototype.getSample = function() {
+ if (this.getFetchOptions().hasSample()) {
+ return this.sample;
+ } else {
+ throw new exceptions.NotFetchedException("Sample has not been fetched.");
+ }
+ };
+ prototype.setSample = function(sample) {
+ this.sample = sample;
+ };
+ prototype.getDataSet = function() {
+ if (this.getFetchOptions().hasDataSet()) {
+ return this.dataSet;
+ } else {
+ throw new exceptions.NotFetchedException("Data set has not been fetched.");
+ }
+ };
+ prototype.setDataSet = function(dataSet) {
+ this.dataSet = dataSet;
+ };
+ prototype.getMaterial = function() {
+ if (this.getFetchOptions().hasMaterial()) {
+ return this.material;
+ } else {
+ throw new exceptions.NotFetchedException("Material has not been fetched.");
+ }
+ };
+ prototype.setMaterial = function(material) {
+ this.material = material;
+ };
+
+ }, {
+ fetchOptions : "GlobalSearchObjectFetchOptions",
+ objectKind : "GlobalSearchObjectKind",
+ objectPermId : "IObjectId",
+ objectIdentifier : "IObjectId",
+ experiment : "Experiment",
+ sample : "Sample",
+ dataSet : "DataSet",
+ material : "Material"
+ });
+ return GlobalSearchObject;
+})
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.js
new file mode 100644
index 00000000000..647d54db04a
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.js
@@ -0,0 +1,89 @@
+define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/experiment/fetchoptions/ExperimentFetchOptions", "as/dto/sample/fetchoptions/SampleFetchOptions",
+ "as/dto/dataset/fetchoptions/DataSetFetchOptions", "as/dto/material/fetchoptions/MaterialFetchOptions", "as/dto/global/fetchoptions/GlobalSearchObjectSortOptions" ], function(require, stjs,
+ FetchOptions) {
+ var GlobalSearchObjectFetchOptions = function() {
+ };
+ stjs.extend(GlobalSearchObjectFetchOptions, FetchOptions, [ FetchOptions ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.global.fetchoptions.GlobalSearchObjectFetchOptions';
+ constructor.serialVersionUID = 1;
+ prototype.experiment = null;
+ prototype.sample = null;
+ prototype.dataSet = null;
+ prototype.material = null;
+ prototype.sort = null;
+
+ prototype.withExperiment = function() {
+ if (this.experiment == null) {
+ var ExperimentFetchOptions = require("as/dto/experiment/fetchoptions/ExperimentFetchOptions");
+ this.experiment = new ExperimentFetchOptions();
+ }
+ return this.experiment;
+ };
+ prototype.withExperimentUsing = function(fetchOptions) {
+ return this.experiment = fetchOptions;
+ };
+ prototype.hasExperiment = function() {
+ return this.experiment != null;
+ };
+
+ prototype.withSample = function() {
+ if (this.sample == null) {
+ var SampleFetchOptions = require("as/dto/sample/fetchoptions/SampleFetchOptions");
+ this.sample = new SampleFetchOptions();
+ }
+ return this.sample;
+ };
+ prototype.withSampleUsing = function(fetchOptions) {
+ return this.sample = fetchOptions;
+ };
+ prototype.hasSample = function() {
+ return this.sample != null;
+ };
+
+ prototype.withDataSet = function() {
+ if (this.dataSet == null) {
+ var DataSetFetchOptions = require("as/dto/dataset/fetchoptions/DataSetFetchOptions");
+ this.dataSet = new DataSetFetchOptions();
+ }
+ return this.dataSet;
+ };
+ prototype.withDataSetUsing = function(fetchOptions) {
+ return this.dataSet = fetchOptions;
+ };
+ prototype.hasDataSet = function() {
+ return this.dataSet != null;
+ };
+
+ prototype.withMaterial = function() {
+ if (this.material == null) {
+ var MaterialFetchOptions = require("as/dto/material/fetchoptions/MaterialFetchOptions");
+ this.material = new MaterialFetchOptions();
+ }
+ return this.material;
+ };
+ prototype.withMaterialUsing = function(fetchOptions) {
+ return this.material = fetchOptions;
+ };
+ prototype.hasMaterial = function() {
+ return this.material != null;
+ };
+
+ prototype.sortBy = function() {
+ if (this.sort == null) {
+ var GlobalSearchObjectSortOptions = require("as/dto/global/fetchoptions/GlobalSearchObjectSortOptions");
+ this.sort = new GlobalSearchObjectSortOptions();
+ }
+ return this.sort;
+ };
+ prototype.getSortBy = function() {
+ return this.sort;
+ };
+ }, {
+ experiment : "ExperimentFetchOptions",
+ sample : "SampleFetchOptions",
+ dataSet : "DataSetFetchOptions",
+ material : "MaterialFetchOptions",
+ sort : "GlobalSearchObjectSortOptions"
+ });
+ return GlobalSearchObjectFetchOptions;
+})
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/fetchoptions/GlobalSearchObjectSortOptions.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/fetchoptions/GlobalSearchObjectSortOptions.js
new file mode 100644
index 00000000000..d8df6e0c62d
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/fetchoptions/GlobalSearchObjectSortOptions.js
@@ -0,0 +1,42 @@
+define([ "require", "stjs", "as/dto/common/fetchoptions/SortOptions" ], function(require, stjs, SortOptions) {
+ var GlobalSearchObjectSortOptions = function() {
+ SortOptions.call(this);
+ };
+
+ var fields = {
+ SCORE : "SCORE",
+ OBJECT_KIND : "OBJECT_KIND",
+ OBJECT_PERM_ID : "OBJECT_PERM_ID",
+ OBJECT_IDENTIFIER : "OBJECT_IDENTIFIER"
+ };
+
+ stjs.extend(GlobalSearchObjectSortOptions, SortOptions, [ SortOptions ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.global.fetchoptions.GlobalSearchObjectSortOptions';
+ constructor.serialVersionUID = 1;
+ prototype.score = function() {
+ return this.getOrCreateSorting(fields.SCORE);
+ };
+ prototype.getScore = function() {
+ return this.getSorting(fields.SCORE);
+ };
+ prototype.objectKind = function() {
+ return this.getOrCreateSorting(fields.OBJECT_KIND);
+ };
+ prototype.getObjectKind = function() {
+ return this.getSorting(fields.OBJECT_KIND);
+ };
+ prototype.objectPermId = function() {
+ return this.getOrCreateSorting(fields.OBJECT_PERM_ID);
+ };
+ prototype.getObjectPermId = function() {
+ return this.getSorting(fields.OBJECT_PERM_ID);
+ };
+ prototype.objectIdentifier = function() {
+ return this.getOrCreateSorting(fields.OBJECT_IDENTIFIER);
+ };
+ prototype.getObjectIdentifier = function() {
+ return this.getSorting(fields.OBJECT_IDENTIFIER);
+ };
+ }, {});
+ return GlobalSearchObjectSortOptions;
+})
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchCriteria.js
new file mode 100644
index 00000000000..b875e7ffa5d
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchCriteria.js
@@ -0,0 +1,31 @@
+/**
+ * @author pkupczyk
+ */
+define([ "require", "stjs", "as/dto/common/search/AbstractCompositeSearchCriteria", "as/dto/global/search/GlobalSearchTextCriteria", "as/dto/global/search/GlobalSearchObjectKindCriteria",
+ "as/dto/global/search/GlobalSearchWildCardsCriteria" ], function(require, stjs, AbstractCompositeSearchCriteria) {
+ var GlobalSearchCriteria = function() {
+ AbstractCompositeSearchCriteria.call(this);
+ };
+ stjs.extend(GlobalSearchCriteria, AbstractCompositeSearchCriteria, [ AbstractCompositeSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.global.search.GlobalSearchCriteria';
+ constructor.serialVersionUID = 1;
+ prototype.withText = function() {
+ var GlobalSearchTextCriteria = require("as/dto/global/search/GlobalSearchTextCriteria");
+ return this.addCriteria(new GlobalSearchTextCriteria());
+ };
+ prototype.withObjectKind = function() {
+ var GlobalSearchObjectKindCriteria = require("as/dto/global/search/GlobalSearchObjectKindCriteria");
+ return this.addCriteria(new GlobalSearchObjectKindCriteria());
+ };
+ prototype.withWildCards = function() {
+ var GlobalSearchWildCardsCriteria = require("as/dto/global/search/GlobalSearchWildCardsCriteria");
+ return this.addCriteria(new GlobalSearchWildCardsCriteria());
+ };
+ }, {
+ criteria : {
+ name : "Collection",
+ arguments : [ "ISearchCriteria" ]
+ }
+ });
+ return GlobalSearchCriteria;
+})
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchObjectKind.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchObjectKind.js
new file mode 100644
index 00000000000..125c60682c1
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchObjectKind.js
@@ -0,0 +1,11 @@
+/**
+ * @author pkupczyk
+ */
+define([ "stjs", "as/dto/common/Enum" ], function(stjs, Enum) {
+ var GlobalSearchObjectKind = function() {
+ Enum.call(this, [ "EXPERIMENT", "SAMPLE", "DATA_SET", "MATERIAL" ]);
+ };
+ stjs.extend(GlobalSearchObjectKind, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new GlobalSearchObjectKind();
+})
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchObjectKindCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchObjectKindCriteria.js
new file mode 100644
index 00000000000..a4f5eab0f76
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchObjectKindCriteria.js
@@ -0,0 +1,23 @@
+define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractSearchCriteria" ], function(require, stjs, exceptions, AbstractSearchCriteria) {
+ var GlobalSearchObjectKindCriteria = function() {
+ this.objectKinds = [];
+ };
+
+ stjs.extend(GlobalSearchObjectKindCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.global.search.GlobalSearchObjectKindCriteria';
+ constructor.serialVersionUID = 1;
+ prototype.objectKinds = null;
+
+ prototype.thatIn = function(objectKinds) {
+ this.objectKinds = objectKinds;
+ };
+ prototype.getObjectKinds = function() {
+ return this.objectKinds;
+ };
+ prototype.toString = function() {
+ return "with object kinds " + this.objectKinds;
+ }
+ }, {});
+
+ return GlobalSearchObjectKindCriteria;
+})
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchTextCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchTextCriteria.js
new file mode 100644
index 00000000000..795b494ae38
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchTextCriteria.js
@@ -0,0 +1,22 @@
+define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractFieldSearchCriteria", "as/dto/common/search/SearchFieldType", "as/dto/common/search/StringContainsValue",
+ "as/dto/common/search/StringContainsExactlyValue" ], function(require, stjs, exceptions, AbstractFieldSearchCriteria, SearchFieldType) {
+ var GlobalSearchTextCriteria = function() {
+ AbstractFieldSearchCriteria.call(this, "anything", SearchFieldType.ANY_FIELD);
+ };
+
+ stjs.extend(GlobalSearchTextCriteria, AbstractFieldSearchCriteria, [ AbstractFieldSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.global.search.GlobalSearchTextCriteria';
+ constructor.serialVersionUID = 1;
+
+ prototype.thatContains = function(str) {
+ var StringContainsValue = require("as/dto/common/search/StringContainsValue");
+ this.setFieldValue(new StringContainsValue(str));
+ };
+ prototype.thatContainsExactly = function(str) {
+ var StringContainsExactlyValue = require("as/dto/common/search/StringContainsExactlyValue");
+ this.setFieldValue(new StringContainsExactlyValue(str));
+ };
+ }, {});
+
+ return GlobalSearchTextCriteria;
+})
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchWildCardsCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchWildCardsCriteria.js
new file mode 100644
index 00000000000..86143ff5ecb
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/global/search/GlobalSearchWildCardsCriteria.js
@@ -0,0 +1,15 @@
+define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractSearchCriteria" ], function(require, stjs, exceptions, AbstractSearchCriteria) {
+ var GlobalSearchWildCardsCriteria = function() {
+ };
+
+ stjs.extend(GlobalSearchWildCardsCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.global.search.GlobalSearchWildCardsCriteria';
+ constructor.serialVersionUID = 1;
+
+ prototype.toString = function() {
+ return "with wildcards";
+ };
+ }, {});
+
+ return GlobalSearchWildCardsCriteria;
+})
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/material/search/MaterialSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/material/search/MaterialSearchCriteria.js
index 8edef0f1420..886538bc231 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/material/search/MaterialSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/material/search/MaterialSearchCriteria.js
@@ -14,11 +14,6 @@ define([ "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/co
prototype.withAndOperator = function() {
return this.withOperator(SearchOperator.AND);
};
- prototype.createBuilder = function() {
- var builder = AbstractEntitySearchCriteria.prototype.createBuilder.call(this);
- builder.setName("MATERIAL");
- return builder;
- };
}, {
operator : {
name : "Enum",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/ObjectKindCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/ObjectKindCriteria.js
new file mode 100644
index 00000000000..81d70604495
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/ObjectKindCriteria.js
@@ -0,0 +1,23 @@
+define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractSearchCriteria" ], function(require, stjs, exceptions, AbstractSearchCriteria) {
+ var ObjectKindCriteria = function() {
+ this.objectKinds = [];
+ };
+
+ stjs.extend(ObjectKindCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.objectkindmodification.search.ObjectKindCriteria';
+ constructor.serialVersionUID = 1;
+ prototype.objectKinds = null;
+
+ prototype.thatIn = function(objectKinds) {
+ this.objectKinds = objectKinds;
+ };
+ prototype.getObjectKinds = function() {
+ return this.objectKinds;
+ };
+ prototype.toString = function() {
+ return "with object kinds " + this.objectKinds;
+ }
+ }, {});
+
+ return ObjectKindCriteria;
+})
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
index 078a84a00b1..b31733f524e 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
@@ -1,28 +1,30 @@
/**
- *
- *
* @author Franz-Josef Elmer
*/
-define([ "stjs", "as/dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
- var ObjectKindModificationSearchCriteria = function() {
- this.objectKinds = [];
- this.operationKinds = [];
- };
- stjs.extend(ObjectKindModificationSearchCriteria, null, [ ISearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'as.dto.objectkindmodification.search.ObjectKindModificationSearchCriteria';
- constructor.serialVersionUID = 1;
- prototype.withObjectKinds = function(objectKinds) {
- this.objectKinds = objectKinds;
- }
- prototype.withOperationKinds = function(operationKinds) {
- this.operationKinds = operationKinds;
- }
- prototype.getObjectKinds = function() {
- return this.objectKinds;
- }
- prototype.getOperationKinds = function() {
- return this.operationKinds;
- }
- }, {});
- return ObjectKindModificationSearchCriteria;
-})
+define([ "stjs", "as/dto/common/search/AbstractCompositeSearchCriteria", "as/dto/objectkindmodification/search/ObjectKindCriteria", "as/dto/objectkindmodification/search/OperationKindCriteria" ],
+ function(stjs, AbstractCompositeSearchCriteria, ObjectKindCriteria, OperationKindCriteria) {
+ var ObjectKindModificationSearchCriteria = function() {
+ AbstractCompositeSearchCriteria.call(this);
+ };
+ stjs.extend(ObjectKindModificationSearchCriteria, AbstractCompositeSearchCriteria, [ AbstractCompositeSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.objectkindmodification.search.ObjectKindModificationSearchCriteria';
+ constructor.serialVersionUID = 1;
+
+ prototype.withObjectKind = function() {
+ var ObjectKindCriteria = require("as/dto/objectkindmodification/search/ObjectKindCriteria");
+ return this.addCriteria(new ObjectKindCriteria());
+ };
+
+ prototype.withOperationKind = function() {
+ var OperationKindCriteria = require("as/dto/objectkindmodification/search/OperationKindCriteria");
+ return this.addCriteria(new OperationKindCriteria());
+ };
+
+ }, {
+ criteria : {
+ name : "Collection",
+ arguments : [ "ISearchCriteria" ]
+ }
+ });
+ return ObjectKindModificationSearchCriteria;
+ })
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/OperationKindCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/OperationKindCriteria.js
new file mode 100644
index 00000000000..0af3fc8399f
--- /dev/null
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/objectkindmodification/search/OperationKindCriteria.js
@@ -0,0 +1,23 @@
+define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractSearchCriteria" ], function(require, stjs, exceptions, AbstractSearchCriteria) {
+ var OperationKindCriteria = function() {
+ this.operationKinds = [];
+ };
+
+ stjs.extend(OperationKindCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.objectkindmodification.search.OperationKindCriteria';
+ constructor.serialVersionUID = 1;
+ prototype.operationKinds = null;
+
+ prototype.thatIn = function(operationKinds) {
+ this.operationKinds = operationKinds;
+ };
+ prototype.getOperationKinds = function() {
+ return this.operationKinds;
+ };
+ prototype.toString = function() {
+ return "with operation kinds " + this.operationKinds;
+ }
+ }, {});
+
+ return OperationKindCriteria;
+})
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/Project.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/Project.js
index bed52335318..c68ee466105 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/Project.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/Project.js
@@ -16,7 +16,6 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
prototype.registrationDate = null;
prototype.modificationDate = null;
prototype.experiments = null;
- prototype.samples = null;
prototype.history = null;
prototype.space = null;
prototype.registrator = null;
@@ -75,16 +74,6 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
prototype.setExperiments = function(experiments) {
this.experiments = experiments;
};
- prototype.getSamples = function() {
- if (this.getFetchOptions().hasSamples()) {
- return this.samples;
- } else {
- throw new exceptions.NotFetchedException("Samples have not been fetched.");
- }
- };
- prototype.setSamples = function(samples) {
- this.samples = samples;
- };
prototype.getHistory = function() {
if (this.getFetchOptions().hasHistory()) {
return this.history;
@@ -151,10 +140,6 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
identifier : "ProjectIdentifier",
registrationDate : "Date",
modificationDate : "Date",
- samples : {
- name : "List",
- arguments : [ "Sample" ]
- },
history : {
name : "List",
arguments : [ "HistoryEntry" ]
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/fetchoptions/ProjectFetchOptions.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/fetchoptions/ProjectFetchOptions.js
index 7844c2cbe0d..962386dadf5 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/fetchoptions/ProjectFetchOptions.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/fetchoptions/ProjectFetchOptions.js
@@ -3,7 +3,7 @@
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/person/fetchoptions/PersonFetchOptions', 'as/dto/space/fetchoptions/SpaceFetchOptions',
- 'as/dto/sample/fetchoptions/SampleFetchOptions', 'as/dto/experiment/fetchoptions/ExperimentFetchOptions', 'as/dto/attachment/fetchoptions/AttachmentFetchOptions',
+ 'as/dto/experiment/fetchoptions/ExperimentFetchOptions', 'as/dto/attachment/fetchoptions/AttachmentFetchOptions',
'as/dto/project/fetchoptions/ProjectSortOptions', 'as/dto/history/fetchoptions/HistoryEntryFetchOptions' ], function(require, stjs, FetchOptions) {
var ProjectFetchOptions = function() {
};
@@ -11,7 +11,6 @@ define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/p
prototype['@type'] = 'as.dto.project.fetchoptions.ProjectFetchOptions';
constructor.serialVersionUID = 1;
prototype.experiments = null;
- prototype.samples = null;
prototype.space = null;
prototype.registrator = null;
prototype.modifier = null;
@@ -32,19 +31,6 @@ define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/p
prototype.hasExperiments = function() {
return this.experiments != null;
};
- prototype.withSamples = function() {
- if (this.samples == null) {
- var SampleFetchOptions = require("as/dto/sample/fetchoptions/SampleFetchOptions");
- this.samples = new SampleFetchOptions();
- }
- return this.samples;
- };
- prototype.withSamplesUsing = function(fetchOptions) {
- return this.samples = fetchOptions;
- };
- prototype.hasSamples = function() {
- return this.samples != null;
- };
prototype.withSpace = function() {
if (this.space == null) {
var SpaceFetchOptions = require("as/dto/space/fetchoptions/SpaceFetchOptions");
@@ -135,7 +121,6 @@ define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/p
};
}, {
experiments : "ExperimentFetchOptions",
- samples : "SampleFetchOptions",
space : "SpaceFetchOptions",
registrator : "PersonFetchOptions",
modifier : "PersonFetchOptions",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/search/NoProjectSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/search/NoProjectSearchCriteria.js
deleted file mode 100644
index 51d8ff2ed6e..00000000000
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/search/NoProjectSearchCriteria.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @author pkupczyk
- */
-define([ "stjs", "as/dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
- var NoProjectSearchCriteria = function() {
- };
- stjs.extend(NoProjectSearchCriteria, null, [ ISearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'as.dto.project.search.NoProjectSearchCriteria';
- constructor.serialVersionUID = 1;
- }, {});
- return NoProjectSearchCriteria;
-})
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/search/ProjectSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/search/ProjectSearchCriteria.js
index 0bbb3ce3215..35cf131ef82 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/search/ProjectSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/project/search/ProjectSearchCriteria.js
@@ -21,12 +21,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var SpaceSearchCriteria = require("as/dto/space/search/SpaceSearchCriteria");
return this.addCriteria(new SpaceSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("PROJECT");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/Sample.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/Sample.js
index 6b973fca43b..33813d46205 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/Sample.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/Sample.js
@@ -15,7 +15,6 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
prototype.registrationDate = null;
prototype.modificationDate = null;
prototype.type = null;
- prototype.project = null;
prototype.space = null;
prototype.experiment = null;
prototype.properties = null;
@@ -76,16 +75,6 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
prototype.setType = function(type) {
this.type = type;
};
- prototype.getProject = function() {
- if (this.getFetchOptions().hasProject()) {
- return this.project;
- } else {
- throw new exceptions.NotFetchedException("Project has not been fetched.");
- }
- };
- prototype.setProject = function(project) {
- this.project = project;
- };
prototype.getSpace = function() {
if (this.getFetchOptions().hasSpace()) {
return this.space;
@@ -244,7 +233,6 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
registrationDate : "Date",
modificationDate : "Date",
type : "SampleType",
- project : "Project",
space : "Space",
experiment : "Experiment",
properties : {
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/create/SampleCreation.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/create/SampleCreation.js
index f7107c12230..e20bef57ecb 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/create/SampleCreation.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/create/SampleCreation.js
@@ -10,7 +10,6 @@ define([ "stjs" ], function(stjs) {
constructor.serialVersionUID = 1;
prototype.typeId = null;
prototype.experimentId = null;
- prototype.projectId = null;
prototype.spaceId = null;
prototype.code = null;
prototype.tagIds = null;
@@ -20,6 +19,7 @@ define([ "stjs" ], function(stjs) {
prototype.childIds = null;
prototype.attachments = null;
prototype.creationId = null;
+ prototype.autoGeneratedCode = null;
prototype.getTypeId = function() {
return this.typeId;
};
@@ -32,12 +32,6 @@ define([ "stjs" ], function(stjs) {
prototype.setExperimentId = function(experimentId) {
this.experimentId = experimentId;
};
- prototype.getProjectId = function() {
- return this.projectId;
- };
- prototype.setProjectId = function(projectId) {
- this.projectId = projectId;
- };
prototype.getSpaceId = function() {
return this.spaceId;
};
@@ -107,7 +101,6 @@ define([ "stjs" ], function(stjs) {
}, {
typeId : "IEntityTypeId",
experimentId : "IExperimentId",
- projectId : "IProjectId",
spaceId : "ISpaceId",
tagIds : {
name : "List",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/fetchoptions/SampleFetchOptions.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/fetchoptions/SampleFetchOptions.js
index 9fa3e331c5b..3032b444126 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/fetchoptions/SampleFetchOptions.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/fetchoptions/SampleFetchOptions.js
@@ -3,7 +3,7 @@
* {@link ch.ethz.sis.openbis.generic.shared.api.v3.dto.generators.DtoGenerator}
*/
define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/sample/fetchoptions/SampleTypeFetchOptions', 'as/dto/space/fetchoptions/SpaceFetchOptions',
- 'as/dto/project/fetchoptions/ProjectFetchOptions', 'as/dto/experiment/fetchoptions/ExperimentFetchOptions', 'as/dto/property/fetchoptions/PropertyFetchOptions', 'as/dto/tag/fetchoptions/TagFetchOptions',
+ 'as/dto/experiment/fetchoptions/ExperimentFetchOptions', 'as/dto/property/fetchoptions/PropertyFetchOptions', 'as/dto/tag/fetchoptions/TagFetchOptions',
'as/dto/person/fetchoptions/PersonFetchOptions', 'as/dto/attachment/fetchoptions/AttachmentFetchOptions', 'as/dto/material/fetchoptions/MaterialFetchOptions',
'as/dto/dataset/fetchoptions/DataSetFetchOptions', 'as/dto/history/fetchoptions/HistoryEntryFetchOptions', 'as/dto/sample/fetchoptions/SampleSortOptions' ], function(require, stjs, FetchOptions) {
var SampleFetchOptions = function() {
@@ -12,7 +12,6 @@ define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/s
prototype['@type'] = 'as.dto.sample.fetchoptions.SampleFetchOptions';
constructor.serialVersionUID = 1;
prototype.type = null;
- prototype.project = null;
prototype.space = null;
prototype.experiment = null;
prototype.properties = null;
@@ -41,19 +40,6 @@ define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/s
prototype.hasType = function() {
return this.type != null;
};
- prototype.withProject = function() {
- if (this.project == null) {
- var ProjectFetchOptions = require("as/dto/project/fetchoptions/ProjectFetchOptions");
- this.project = new ProjectFetchOptions();
- }
- return this.project;
- };
- prototype.withProjectUsing = function(fetchOptions) {
- return this.project = fetchOptions;
- };
- prototype.hasProject = function() {
- return this.project != null;
- };
prototype.withSpace = function() {
if (this.space == null) {
var SpaceFetchOptions = require("as/dto/space/fetchoptions/SpaceFetchOptions");
@@ -244,7 +230,6 @@ define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", 'as/dto/s
};
}, {
type : "SampleTypeFetchOptions",
- project : "ProjectFetchOptions",
space : "SpaceFetchOptions",
experiment : "ExperimentFetchOptions",
properties : "PropertyFetchOptions",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/search/SampleSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/search/SampleSearchCriteria.js
index ecc76b75108..62fcd50caf5 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/search/SampleSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/search/SampleSearchCriteria.js
@@ -2,7 +2,7 @@
* @author pkupczyk
*/
define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/common/search/SearchOperator", "as/dto/sample/search/SampleSearchRelation", "as/dto/space/search/SpaceSearchCriteria",
- "as/dto/project/search/ProjectSearchCriteria", "as/dto/project/search/NoProjectSearchCriteria", "as/dto/experiment/search/ExperimentSearchCriteria", "as/dto/experiment/search/NoExperimentSearchCriteria",
+ "as/dto/experiment/search/ExperimentSearchCriteria", "as/dto/experiment/search/NoExperimentSearchCriteria",
"as/dto/sample/search/NoSampleContainerSearchCriteria" ], function(require, stjs, AbstractEntitySearchCriteria, SearchOperator, SampleSearchRelation) {
var SampleSearchCriteria = function(relation) {
@@ -17,14 +17,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria",
var SpaceSearchCriteria = require("as/dto/space/search/SpaceSearchCriteria");
return this.addCriteria(new SpaceSearchCriteria());
};
- prototype.withProject = function() {
- var ProjectSearchCriteria = require("as/dto/project/search/ProjectSearchCriteria");
- return this.addCriteria(new ProjectSearchCriteria());
- };
- prototype.withoutProject = function() {
- var NoProjectSearchCriteria = require("as/dto/project/search/NoProjectSearchCriteria");
- return this.addCriteria(new NoProjectSearchCriteria());
- };
prototype.withExperiment = function() {
var ExperimentSearchCriteria = require("as/dto/experiment/search/ExperimentSearchCriteria");
return this.addCriteria(new ExperimentSearchCriteria());
@@ -55,11 +47,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria",
prototype.getRelation = function() {
return this.relation;
};
- prototype.createBuilder = function() {
- var builder = AbstractEntitySearchCriteria.prototype.createBuilder.call(this);
- builder.setName(this.relation.name());
- return builder;
- };
}, {
relation : {
name : "Enum",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/update/SampleUpdate.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/update/SampleUpdate.js
index 22667c53c3d..d2c8b77c608 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/update/SampleUpdate.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/sample/update/SampleUpdate.js
@@ -6,7 +6,6 @@ define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/
var SampleUpdate = function() {
this.properties = {};
this.experimentId = new FieldUpdateValue();
- this.projectId = new FieldUpdateValue();
this.spaceId = new FieldUpdateValue();
this.tagIds = new IdListUpdateValue();
this.containerId = new FieldUpdateValue();
@@ -21,7 +20,6 @@ define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/
prototype.sampleId = null;
prototype.properties = null;
prototype.experimentId = null;
- prototype.projectId = null;
prototype.spaceId = null;
prototype.tagIds = null;
prototype.containerId = null;
@@ -36,12 +34,6 @@ define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/
prototype.setSampleId = function(sampleId) {
this.sampleId = sampleId;
};
- prototype.getProjectId = function() {
- return this.projectId;
- };
- prototype.setProjectId = function(projectId) {
- this.projectId.setValue(projectId);
- };
prototype.getExperimentId = function() {
return this.experimentId;
};
@@ -102,10 +94,6 @@ define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/
name : "FieldUpdateValue",
arguments : [ "IExperimentId" ]
},
- projectId : {
- name : "FieldUpdateValue",
- arguments : [ "IProjectId" ]
- },
spaceId : {
name : "FieldUpdateValue",
arguments : [ "ISpaceId" ]
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/service/search/CustomASServiceSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/service/search/CustomASServiceSearchCriteria.js
index 3dcfff41ab0..323b2f20562 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/service/search/CustomASServiceSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/service/search/CustomASServiceSearchCriteria.js
@@ -10,12 +10,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var CodeSearchCriteria = require("as/dto/common/search/CodeSearchCriteria");
return this.addCriteria(new CodeSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("CUSTOM_AS_SERVICE");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/space/search/SpaceSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/space/search/SpaceSearchCriteria.js
index 04ceb951c99..69f39e1c921 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/space/search/SpaceSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/space/search/SpaceSearchCriteria.js
@@ -17,12 +17,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("SPACE");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/tag/search/TagSearchCriteria.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/tag/search/TagSearchCriteria.js
index 4aa7f9032ce..9ebf822eb06 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/tag/search/TagSearchCriteria.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/as/dto/tag/search/TagSearchCriteria.js
@@ -17,12 +17,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("TAG");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/lib/underscore/js/underscore.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/lib/underscore/js/underscore.js
index 38de2bc99b1..b29332f945b 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/lib/underscore/js/underscore.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/lib/underscore/js/underscore.js
@@ -1,5 +1,1548 @@
-// Underscore.js 1.7.0
+// Underscore.js 1.8.3
// http://underscorejs.org
-// (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
// Underscore may be freely distributed under the MIT license.
-(function(){var n=this,t=n._,r=Array.prototype,e=Object.prototype,u=Function.prototype,i=r.push,a=r.slice,o=r.concat,l=e.toString,c=e.hasOwnProperty,f=Array.isArray,s=Object.keys,p=u.bind,h=function(n){return n instanceof h?n:this instanceof h?void(this._wrapped=n):new h(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=h),exports._=h):n._=h,h.VERSION="1.7.0";var g=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}};h.iteratee=function(n,t,r){return null==n?h.identity:h.isFunction(n)?g(n,t,r):h.isObject(n)?h.matches(n):h.property(n)},h.each=h.forEach=function(n,t,r){if(null==n)return n;t=g(t,r);var e,u=n.length;if(u===+u)for(e=0;u>e;e++)t(n[e],e,n);else{var i=h.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},h.map=h.collect=function(n,t,r){if(null==n)return[];t=h.iteratee(t,r);for(var e,u=n.length!==+n.length&&h.keys(n),i=(u||n).length,a=Array(i),o=0;i>o;o++)e=u?u[o]:o,a[o]=t(n[e],e,n);return a};var v="Reduce of empty array with no initial value";h.reduce=h.foldl=h.inject=function(n,t,r,e){null==n&&(n=[]),t=g(t,e,4);var u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length,o=0;if(arguments.length<3){if(!a)throw new TypeError(v);r=n[i?i[o++]:o++]}for(;a>o;o++)u=i?i[o]:o,r=t(r,n[u],u,n);return r},h.reduceRight=h.foldr=function(n,t,r,e){null==n&&(n=[]),t=g(t,e,4);var u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;if(arguments.length<3){if(!a)throw new TypeError(v);r=n[i?i[--a]:--a]}for(;a--;)u=i?i[a]:a,r=t(r,n[u],u,n);return r},h.find=h.detect=function(n,t,r){var e;return t=h.iteratee(t,r),h.some(n,function(n,r,u){return t(n,r,u)?(e=n,!0):void 0}),e},h.filter=h.select=function(n,t,r){var e=[];return null==n?e:(t=h.iteratee(t,r),h.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e)},h.reject=function(n,t,r){return h.filter(n,h.negate(h.iteratee(t)),r)},h.every=h.all=function(n,t,r){if(null==n)return!0;t=h.iteratee(t,r);var e,u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;for(e=0;a>e;e++)if(u=i?i[e]:e,!t(n[u],u,n))return!1;return!0},h.some=h.any=function(n,t,r){if(null==n)return!1;t=h.iteratee(t,r);var e,u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;for(e=0;a>e;e++)if(u=i?i[e]:e,t(n[u],u,n))return!0;return!1},h.contains=h.include=function(n,t){return null==n?!1:(n.length!==+n.length&&(n=h.values(n)),h.indexOf(n,t)>=0)},h.invoke=function(n,t){var r=a.call(arguments,2),e=h.isFunction(t);return h.map(n,function(n){return(e?t:n[t]).apply(n,r)})},h.pluck=function(n,t){return h.map(n,h.property(t))},h.where=function(n,t){return h.filter(n,h.matches(t))},h.findWhere=function(n,t){return h.find(n,h.matches(t))},h.max=function(n,t,r){var e,u,i=-1/0,a=-1/0;if(null==t&&null!=n){n=n.length===+n.length?n:h.values(n);for(var o=0,l=n.length;l>o;o++)e=n[o],e>i&&(i=e)}else t=h.iteratee(t,r),h.each(n,function(n,r,e){u=t(n,r,e),(u>a||u===-1/0&&i===-1/0)&&(i=n,a=u)});return i},h.min=function(n,t,r){var e,u,i=1/0,a=1/0;if(null==t&&null!=n){n=n.length===+n.length?n:h.values(n);for(var o=0,l=n.length;l>o;o++)e=n[o],i>e&&(i=e)}else t=h.iteratee(t,r),h.each(n,function(n,r,e){u=t(n,r,e),(a>u||1/0===u&&1/0===i)&&(i=n,a=u)});return i},h.shuffle=function(n){for(var t,r=n&&n.length===+n.length?n:h.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=h.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},h.sample=function(n,t,r){return null==t||r?(n.length!==+n.length&&(n=h.values(n)),n[h.random(n.length-1)]):h.shuffle(n).slice(0,Math.max(0,t))},h.sortBy=function(n,t,r){return t=h.iteratee(t,r),h.pluck(h.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var m=function(n){return function(t,r,e){var u={};return r=h.iteratee(r,e),h.each(t,function(e,i){var a=r(e,i,t);n(u,e,a)}),u}};h.groupBy=m(function(n,t,r){h.has(n,r)?n[r].push(t):n[r]=[t]}),h.indexBy=m(function(n,t,r){n[r]=t}),h.countBy=m(function(n,t,r){h.has(n,r)?n[r]++:n[r]=1}),h.sortedIndex=function(n,t,r,e){r=h.iteratee(r,e,1);for(var u=r(t),i=0,a=n.length;a>i;){var o=i+a>>>1;r(n[o])<u?i=o+1:a=o}return i},h.toArray=function(n){return n?h.isArray(n)?a.call(n):n.length===+n.length?h.map(n,h.identity):h.values(n):[]},h.size=function(n){return null==n?0:n.length===+n.length?n.length:h.keys(n).length},h.partition=function(n,t,r){t=h.iteratee(t,r);var e=[],u=[];return h.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},h.first=h.head=h.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:0>t?[]:a.call(n,0,t)},h.initial=function(n,t,r){return a.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},h.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:a.call(n,Math.max(n.length-t,0))},h.rest=h.tail=h.drop=function(n,t,r){return a.call(n,null==t||r?1:t)},h.compact=function(n){return h.filter(n,h.identity)};var y=function(n,t,r,e){if(t&&h.every(n,h.isArray))return o.apply(e,n);for(var u=0,a=n.length;a>u;u++){var l=n[u];h.isArray(l)||h.isArguments(l)?t?i.apply(e,l):y(l,t,r,e):r||e.push(l)}return e};h.flatten=function(n,t){return y(n,t,!1,[])},h.without=function(n){return h.difference(n,a.call(arguments,1))},h.uniq=h.unique=function(n,t,r,e){if(null==n)return[];h.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=h.iteratee(r,e));for(var u=[],i=[],a=0,o=n.length;o>a;a++){var l=n[a];if(t)a&&i===l||u.push(l),i=l;else if(r){var c=r(l,a,n);h.indexOf(i,c)<0&&(i.push(c),u.push(l))}else h.indexOf(u,l)<0&&u.push(l)}return u},h.union=function(){return h.uniq(y(arguments,!0,!0,[]))},h.intersection=function(n){if(null==n)return[];for(var t=[],r=arguments.length,e=0,u=n.length;u>e;e++){var i=n[e];if(!h.contains(t,i)){for(var a=1;r>a&&h.contains(arguments[a],i);a++);a===r&&t.push(i)}}return t},h.difference=function(n){var t=y(a.call(arguments,1),!0,!0,[]);return h.filter(n,function(n){return!h.contains(t,n)})},h.zip=function(n){if(null==n)return[];for(var t=h.max(arguments,"length").length,r=Array(t),e=0;t>e;e++)r[e]=h.pluck(arguments,e);return r},h.object=function(n,t){if(null==n)return{};for(var r={},e=0,u=n.length;u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},h.indexOf=function(n,t,r){if(null==n)return-1;var e=0,u=n.length;if(r){if("number"!=typeof r)return e=h.sortedIndex(n,t),n[e]===t?e:-1;e=0>r?Math.max(0,u+r):r}for(;u>e;e++)if(n[e]===t)return e;return-1},h.lastIndexOf=function(n,t,r){if(null==n)return-1;var e=n.length;for("number"==typeof r&&(e=0>r?e+r+1:Math.min(e,r+1));--e>=0;)if(n[e]===t)return e;return-1},h.range=function(n,t,r){arguments.length<=1&&(t=n||0,n=0),r=r||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=Array(e),i=0;e>i;i++,n+=r)u[i]=n;return u};var d=function(){};h.bind=function(n,t){var r,e;if(p&&n.bind===p)return p.apply(n,a.call(arguments,1));if(!h.isFunction(n))throw new TypeError("Bind must be called on a function");return r=a.call(arguments,2),e=function(){if(!(this instanceof e))return n.apply(t,r.concat(a.call(arguments)));d.prototype=n.prototype;var u=new d;d.prototype=null;var i=n.apply(u,r.concat(a.call(arguments)));return h.isObject(i)?i:u}},h.partial=function(n){var t=a.call(arguments,1);return function(){for(var r=0,e=t.slice(),u=0,i=e.length;i>u;u++)e[u]===h&&(e[u]=arguments[r++]);for(;r<arguments.length;)e.push(arguments[r++]);return n.apply(this,e)}},h.bindAll=function(n){var t,r,e=arguments.length;if(1>=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=h.bind(n[r],n);return n},h.memoize=function(n,t){var r=function(e){var u=r.cache,i=t?t.apply(this,arguments):e;return h.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},h.delay=function(n,t){var r=a.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},h.defer=function(n){return h.delay.apply(h,[n,1].concat(a.call(arguments,1)))},h.throttle=function(n,t,r){var e,u,i,a=null,o=0;r||(r={});var l=function(){o=r.leading===!1?0:h.now(),a=null,i=n.apply(e,u),a||(e=u=null)};return function(){var c=h.now();o||r.leading!==!1||(o=c);var f=t-(c-o);return e=this,u=arguments,0>=f||f>t?(clearTimeout(a),a=null,o=c,i=n.apply(e,u),a||(e=u=null)):a||r.trailing===!1||(a=setTimeout(l,f)),i}},h.debounce=function(n,t,r){var e,u,i,a,o,l=function(){var c=h.now()-a;t>c&&c>0?e=setTimeout(l,t-c):(e=null,r||(o=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,a=h.now();var c=r&&!e;return e||(e=setTimeout(l,t)),c&&(o=n.apply(i,u),i=u=null),o}},h.wrap=function(n,t){return h.partial(t,n)},h.negate=function(n){return function(){return!n.apply(this,arguments)}},h.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},h.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},h.before=function(n,t){var r;return function(){return--n>0?r=t.apply(this,arguments):t=null,r}},h.once=h.partial(h.before,2),h.keys=function(n){if(!h.isObject(n))return[];if(s)return s(n);var t=[];for(var r in n)h.has(n,r)&&t.push(r);return t},h.values=function(n){for(var t=h.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},h.pairs=function(n){for(var t=h.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},h.invert=function(n){for(var t={},r=h.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},h.functions=h.methods=function(n){var t=[];for(var r in n)h.isFunction(n[r])&&t.push(r);return t.sort()},h.extend=function(n){if(!h.isObject(n))return n;for(var t,r,e=1,u=arguments.length;u>e;e++){t=arguments[e];for(r in t)c.call(t,r)&&(n[r]=t[r])}return n},h.pick=function(n,t,r){var e,u={};if(null==n)return u;if(h.isFunction(t)){t=g(t,r);for(e in n){var i=n[e];t(i,e,n)&&(u[e]=i)}}else{var l=o.apply([],a.call(arguments,1));n=new Object(n);for(var c=0,f=l.length;f>c;c++)e=l[c],e in n&&(u[e]=n[e])}return u},h.omit=function(n,t,r){if(h.isFunction(t))t=h.negate(t);else{var e=h.map(o.apply([],a.call(arguments,1)),String);t=function(n,t){return!h.contains(e,t)}}return h.pick(n,t,r)},h.defaults=function(n){if(!h.isObject(n))return n;for(var t=1,r=arguments.length;r>t;t++){var e=arguments[t];for(var u in e)n[u]===void 0&&(n[u]=e[u])}return n},h.clone=function(n){return h.isObject(n)?h.isArray(n)?n.slice():h.extend({},n):n},h.tap=function(n,t){return t(n),n};var b=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof h&&(n=n._wrapped),t instanceof h&&(t=t._wrapped);var u=l.call(n);if(u!==l.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}if("object"!=typeof n||"object"!=typeof t)return!1;for(var i=r.length;i--;)if(r[i]===n)return e[i]===t;var a=n.constructor,o=t.constructor;if(a!==o&&"constructor"in n&&"constructor"in t&&!(h.isFunction(a)&&a instanceof a&&h.isFunction(o)&&o instanceof o))return!1;r.push(n),e.push(t);var c,f;if("[object Array]"===u){if(c=n.length,f=c===t.length)for(;c--&&(f=b(n[c],t[c],r,e)););}else{var s,p=h.keys(n);if(c=p.length,f=h.keys(t).length===c)for(;c--&&(s=p[c],f=h.has(t,s)&&b(n[s],t[s],r,e)););}return r.pop(),e.pop(),f};h.isEqual=function(n,t){return b(n,t,[],[])},h.isEmpty=function(n){if(null==n)return!0;if(h.isArray(n)||h.isString(n)||h.isArguments(n))return 0===n.length;for(var t in n)if(h.has(n,t))return!1;return!0},h.isElement=function(n){return!(!n||1!==n.nodeType)},h.isArray=f||function(n){return"[object Array]"===l.call(n)},h.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},h.each(["Arguments","Function","String","Number","Date","RegExp"],function(n){h["is"+n]=function(t){return l.call(t)==="[object "+n+"]"}}),h.isArguments(arguments)||(h.isArguments=function(n){return h.has(n,"callee")}),"function"!=typeof/./&&(h.isFunction=function(n){return"function"==typeof n||!1}),h.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},h.isNaN=function(n){return h.isNumber(n)&&n!==+n},h.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===l.call(n)},h.isNull=function(n){return null===n},h.isUndefined=function(n){return n===void 0},h.has=function(n,t){return null!=n&&c.call(n,t)},h.noConflict=function(){return n._=t,this},h.identity=function(n){return n},h.constant=function(n){return function(){return n}},h.noop=function(){},h.property=function(n){return function(t){return t[n]}},h.matches=function(n){var t=h.pairs(n),r=t.length;return function(n){if(null==n)return!r;n=new Object(n);for(var e=0;r>e;e++){var u=t[e],i=u[0];if(u[1]!==n[i]||!(i in n))return!1}return!0}},h.times=function(n,t,r){var e=Array(Math.max(0,n));t=g(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},h.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},h.now=Date.now||function(){return(new Date).getTime()};var _={"&":"&","<":"<",">":">",'"':""","'":"'","`":"`"},w=h.invert(_),j=function(n){var t=function(t){return n[t]},r="(?:"+h.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};h.escape=j(_),h.unescape=j(w),h.result=function(n,t){if(null==n)return void 0;var r=n[t];return h.isFunction(r)?n[t]():r};var x=0;h.uniqueId=function(n){var t=++x+"";return n?n+t:t},h.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var A=/(.)^/,k={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},O=/\\|'|\r|\n|\u2028|\u2029/g,F=function(n){return"\\"+k[n]};h.template=function(n,t,r){!t&&r&&(t=r),t=h.defaults({},t,h.templateSettings);var e=RegExp([(t.escape||A).source,(t.interpolate||A).source,(t.evaluate||A).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,a,o){return i+=n.slice(u,o).replace(O,F),u=o+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":a&&(i+="';\n"+a+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var a=new Function(t.variable||"obj","_",i)}catch(o){throw o.source=i,o}var l=function(n){return a.call(this,n,h)},c=t.variable||"obj";return l.source="function("+c+"){\n"+i+"}",l},h.chain=function(n){var t=h(n);return t._chain=!0,t};var E=function(n){return this._chain?h(n).chain():n};h.mixin=function(n){h.each(h.functions(n),function(t){var r=h[t]=n[t];h.prototype[t]=function(){var n=[this._wrapped];return i.apply(n,arguments),E.call(this,r.apply(h,n))}})},h.mixin(h),h.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=r[n];h.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],E.call(this,r)}}),h.each(["concat","join","slice"],function(n){var t=r[n];h.prototype[n]=function(){return E.call(this,t.apply(this._wrapped,arguments))}}),h.prototype.value=function(){return this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return h})}).call(this);
+
+(function() {
+
+ // Baseline setup
+ // --------------
+
+ // Establish the root object, `window` in the browser, or `exports` on the server.
+ var root = this;
+
+ // Save the previous value of the `_` variable.
+ var previousUnderscore = root._;
+
+ // Save bytes in the minified (but not gzipped) version:
+ var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+ // Create quick reference variables for speed access to core prototypes.
+ var
+ push = ArrayProto.push,
+ slice = ArrayProto.slice,
+ toString = ObjProto.toString,
+ hasOwnProperty = ObjProto.hasOwnProperty;
+
+ // All **ECMAScript 5** native function implementations that we hope to use
+ // are declared here.
+ var
+ nativeIsArray = Array.isArray,
+ nativeKeys = Object.keys,
+ nativeBind = FuncProto.bind,
+ nativeCreate = Object.create;
+
+ // Naked function reference for surrogate-prototype-swapping.
+ var Ctor = function(){};
+
+ // Create a safe reference to the Underscore object for use below.
+ var _ = function(obj) {
+ if (obj instanceof _) return obj;
+ if (!(this instanceof _)) return new _(obj);
+ this._wrapped = obj;
+ };
+
+ // Export the Underscore object for **Node.js**, with
+ // backwards-compatibility for the old `require()` API. If we're in
+ // the browser, add `_` as a global object.
+ if (typeof exports !== 'undefined') {
+ if (typeof module !== 'undefined' && module.exports) {
+ exports = module.exports = _;
+ }
+ exports._ = _;
+ } else {
+ root._ = _;
+ }
+
+ // Current version.
+ _.VERSION = '1.8.3';
+
+ // Internal function that returns an efficient (for current engines) version
+ // of the passed-in callback, to be repeatedly applied in other Underscore
+ // functions.
+ var optimizeCb = function(func, context, argCount) {
+ if (context === void 0) return func;
+ switch (argCount == null ? 3 : argCount) {
+ case 1: return function(value) {
+ return func.call(context, value);
+ };
+ case 2: return function(value, other) {
+ return func.call(context, value, other);
+ };
+ case 3: return function(value, index, collection) {
+ return func.call(context, value, index, collection);
+ };
+ case 4: return function(accumulator, value, index, collection) {
+ return func.call(context, accumulator, value, index, collection);
+ };
+ }
+ return function() {
+ return func.apply(context, arguments);
+ };
+ };
+
+ // A mostly-internal function to generate callbacks that can be applied
+ // to each element in a collection, returning the desired result — either
+ // identity, an arbitrary callback, a property matcher, or a property accessor.
+ var cb = function(value, context, argCount) {
+ if (value == null) return _.identity;
+ if (_.isFunction(value)) return optimizeCb(value, context, argCount);
+ if (_.isObject(value)) return _.matcher(value);
+ return _.property(value);
+ };
+ _.iteratee = function(value, context) {
+ return cb(value, context, Infinity);
+ };
+
+ // An internal function for creating assigner functions.
+ var createAssigner = function(keysFunc, undefinedOnly) {
+ return function(obj) {
+ var length = arguments.length;
+ if (length < 2 || obj == null) return obj;
+ for (var index = 1; index < length; index++) {
+ var source = arguments[index],
+ keys = keysFunc(source),
+ l = keys.length;
+ for (var i = 0; i < l; i++) {
+ var key = keys[i];
+ if (!undefinedOnly || obj[key] === void 0) obj[key] = source[key];
+ }
+ }
+ return obj;
+ };
+ };
+
+ // An internal function for creating a new object that inherits from another.
+ var baseCreate = function(prototype) {
+ if (!_.isObject(prototype)) return {};
+ if (nativeCreate) return nativeCreate(prototype);
+ Ctor.prototype = prototype;
+ var result = new Ctor;
+ Ctor.prototype = null;
+ return result;
+ };
+
+ var property = function(key) {
+ return function(obj) {
+ return obj == null ? void 0 : obj[key];
+ };
+ };
+
+ // Helper for collection methods to determine whether a collection
+ // should be iterated as an array or as an object
+ // Related: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength
+ // Avoids a very nasty iOS 8 JIT bug on ARM-64. #2094
+ var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1;
+ var getLength = property('length');
+ var isArrayLike = function(collection) {
+ var length = getLength(collection);
+ return typeof length == 'number' && length >= 0 && length <= MAX_ARRAY_INDEX;
+ };
+
+ // Collection Functions
+ // --------------------
+
+ // The cornerstone, an `each` implementation, aka `forEach`.
+ // Handles raw objects in addition to array-likes. Treats all
+ // sparse array-likes as if they were dense.
+ _.each = _.forEach = function(obj, iteratee, context) {
+ iteratee = optimizeCb(iteratee, context);
+ var i, length;
+ if (isArrayLike(obj)) {
+ for (i = 0, length = obj.length; i < length; i++) {
+ iteratee(obj[i], i, obj);
+ }
+ } else {
+ var keys = _.keys(obj);
+ for (i = 0, length = keys.length; i < length; i++) {
+ iteratee(obj[keys[i]], keys[i], obj);
+ }
+ }
+ return obj;
+ };
+
+ // Return the results of applying the iteratee to each element.
+ _.map = _.collect = function(obj, iteratee, context) {
+ iteratee = cb(iteratee, context);
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length,
+ results = Array(length);
+ for (var index = 0; index < length; index++) {
+ var currentKey = keys ? keys[index] : index;
+ results[index] = iteratee(obj[currentKey], currentKey, obj);
+ }
+ return results;
+ };
+
+ // Create a reducing function iterating left or right.
+ function createReduce(dir) {
+ // Optimized iterator function as using arguments.length
+ // in the main function will deoptimize the, see #1991.
+ function iterator(obj, iteratee, memo, keys, index, length) {
+ for (; index >= 0 && index < length; index += dir) {
+ var currentKey = keys ? keys[index] : index;
+ memo = iteratee(memo, obj[currentKey], currentKey, obj);
+ }
+ return memo;
+ }
+
+ return function(obj, iteratee, memo, context) {
+ iteratee = optimizeCb(iteratee, context, 4);
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length,
+ index = dir > 0 ? 0 : length - 1;
+ // Determine the initial value if none is provided.
+ if (arguments.length < 3) {
+ memo = obj[keys ? keys[index] : index];
+ index += dir;
+ }
+ return iterator(obj, iteratee, memo, keys, index, length);
+ };
+ }
+
+ // **Reduce** builds up a single result from a list of values, aka `inject`,
+ // or `foldl`.
+ _.reduce = _.foldl = _.inject = createReduce(1);
+
+ // The right-associative version of reduce, also known as `foldr`.
+ _.reduceRight = _.foldr = createReduce(-1);
+
+ // Return the first value which passes a truth test. Aliased as `detect`.
+ _.find = _.detect = function(obj, predicate, context) {
+ var key;
+ if (isArrayLike(obj)) {
+ key = _.findIndex(obj, predicate, context);
+ } else {
+ key = _.findKey(obj, predicate, context);
+ }
+ if (key !== void 0 && key !== -1) return obj[key];
+ };
+
+ // Return all the elements that pass a truth test.
+ // Aliased as `select`.
+ _.filter = _.select = function(obj, predicate, context) {
+ var results = [];
+ predicate = cb(predicate, context);
+ _.each(obj, function(value, index, list) {
+ if (predicate(value, index, list)) results.push(value);
+ });
+ return results;
+ };
+
+ // Return all the elements for which a truth test fails.
+ _.reject = function(obj, predicate, context) {
+ return _.filter(obj, _.negate(cb(predicate)), context);
+ };
+
+ // Determine whether all of the elements match a truth test.
+ // Aliased as `all`.
+ _.every = _.all = function(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length;
+ for (var index = 0; index < length; index++) {
+ var currentKey = keys ? keys[index] : index;
+ if (!predicate(obj[currentKey], currentKey, obj)) return false;
+ }
+ return true;
+ };
+
+ // Determine if at least one element in the object matches a truth test.
+ // Aliased as `any`.
+ _.some = _.any = function(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length;
+ for (var index = 0; index < length; index++) {
+ var currentKey = keys ? keys[index] : index;
+ if (predicate(obj[currentKey], currentKey, obj)) return true;
+ }
+ return false;
+ };
+
+ // Determine if the array or object contains a given item (using `===`).
+ // Aliased as `includes` and `include`.
+ _.contains = _.includes = _.include = function(obj, item, fromIndex, guard) {
+ if (!isArrayLike(obj)) obj = _.values(obj);
+ if (typeof fromIndex != 'number' || guard) fromIndex = 0;
+ return _.indexOf(obj, item, fromIndex) >= 0;
+ };
+
+ // Invoke a method (with arguments) on every item in a collection.
+ _.invoke = function(obj, method) {
+ var args = slice.call(arguments, 2);
+ var isFunc = _.isFunction(method);
+ return _.map(obj, function(value) {
+ var func = isFunc ? method : value[method];
+ return func == null ? func : func.apply(value, args);
+ });
+ };
+
+ // Convenience version of a common use case of `map`: fetching a property.
+ _.pluck = function(obj, key) {
+ return _.map(obj, _.property(key));
+ };
+
+ // Convenience version of a common use case of `filter`: selecting only objects
+ // containing specific `key:value` pairs.
+ _.where = function(obj, attrs) {
+ return _.filter(obj, _.matcher(attrs));
+ };
+
+ // Convenience version of a common use case of `find`: getting the first object
+ // containing specific `key:value` pairs.
+ _.findWhere = function(obj, attrs) {
+ return _.find(obj, _.matcher(attrs));
+ };
+
+ // Return the maximum element (or element-based computation).
+ _.max = function(obj, iteratee, context) {
+ var result = -Infinity, lastComputed = -Infinity,
+ value, computed;
+ if (iteratee == null && obj != null) {
+ obj = isArrayLike(obj) ? obj : _.values(obj);
+ for (var i = 0, length = obj.length; i < length; i++) {
+ value = obj[i];
+ if (value > result) {
+ result = value;
+ }
+ }
+ } else {
+ iteratee = cb(iteratee, context);
+ _.each(obj, function(value, index, list) {
+ computed = iteratee(value, index, list);
+ if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
+ result = value;
+ lastComputed = computed;
+ }
+ });
+ }
+ return result;
+ };
+
+ // Return the minimum element (or element-based computation).
+ _.min = function(obj, iteratee, context) {
+ var result = Infinity, lastComputed = Infinity,
+ value, computed;
+ if (iteratee == null && obj != null) {
+ obj = isArrayLike(obj) ? obj : _.values(obj);
+ for (var i = 0, length = obj.length; i < length; i++) {
+ value = obj[i];
+ if (value < result) {
+ result = value;
+ }
+ }
+ } else {
+ iteratee = cb(iteratee, context);
+ _.each(obj, function(value, index, list) {
+ computed = iteratee(value, index, list);
+ if (computed < lastComputed || computed === Infinity && result === Infinity) {
+ result = value;
+ lastComputed = computed;
+ }
+ });
+ }
+ return result;
+ };
+
+ // Shuffle a collection, using the modern version of the
+ // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
+ _.shuffle = function(obj) {
+ var set = isArrayLike(obj) ? obj : _.values(obj);
+ var length = set.length;
+ var shuffled = Array(length);
+ for (var index = 0, rand; index < length; index++) {
+ rand = _.random(0, index);
+ if (rand !== index) shuffled[index] = shuffled[rand];
+ shuffled[rand] = set[index];
+ }
+ return shuffled;
+ };
+
+ // Sample **n** random values from a collection.
+ // If **n** is not specified, returns a single random element.
+ // The internal `guard` argument allows it to work with `map`.
+ _.sample = function(obj, n, guard) {
+ if (n == null || guard) {
+ if (!isArrayLike(obj)) obj = _.values(obj);
+ return obj[_.random(obj.length - 1)];
+ }
+ return _.shuffle(obj).slice(0, Math.max(0, n));
+ };
+
+ // Sort the object's values by a criterion produced by an iteratee.
+ _.sortBy = function(obj, iteratee, context) {
+ iteratee = cb(iteratee, context);
+ return _.pluck(_.map(obj, function(value, index, list) {
+ return {
+ value: value,
+ index: index,
+ criteria: iteratee(value, index, list)
+ };
+ }).sort(function(left, right) {
+ var a = left.criteria;
+ var b = right.criteria;
+ if (a !== b) {
+ if (a > b || a === void 0) return 1;
+ if (a < b || b === void 0) return -1;
+ }
+ return left.index - right.index;
+ }), 'value');
+ };
+
+ // An internal function used for aggregate "group by" operations.
+ var group = function(behavior) {
+ return function(obj, iteratee, context) {
+ var result = {};
+ iteratee = cb(iteratee, context);
+ _.each(obj, function(value, index) {
+ var key = iteratee(value, index, obj);
+ behavior(result, value, key);
+ });
+ return result;
+ };
+ };
+
+ // Groups the object's values by a criterion. Pass either a string attribute
+ // to group by, or a function that returns the criterion.
+ _.groupBy = group(function(result, value, key) {
+ if (_.has(result, key)) result[key].push(value); else result[key] = [value];
+ });
+
+ // Indexes the object's values by a criterion, similar to `groupBy`, but for
+ // when you know that your index values will be unique.
+ _.indexBy = group(function(result, value, key) {
+ result[key] = value;
+ });
+
+ // Counts instances of an object that group by a certain criterion. Pass
+ // either a string attribute to count by, or a function that returns the
+ // criterion.
+ _.countBy = group(function(result, value, key) {
+ if (_.has(result, key)) result[key]++; else result[key] = 1;
+ });
+
+ // Safely create a real, live array from anything iterable.
+ _.toArray = function(obj) {
+ if (!obj) return [];
+ if (_.isArray(obj)) return slice.call(obj);
+ if (isArrayLike(obj)) return _.map(obj, _.identity);
+ return _.values(obj);
+ };
+
+ // Return the number of elements in an object.
+ _.size = function(obj) {
+ if (obj == null) return 0;
+ return isArrayLike(obj) ? obj.length : _.keys(obj).length;
+ };
+
+ // Split a collection into two arrays: one whose elements all satisfy the given
+ // predicate, and one whose elements all do not satisfy the predicate.
+ _.partition = function(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var pass = [], fail = [];
+ _.each(obj, function(value, key, obj) {
+ (predicate(value, key, obj) ? pass : fail).push(value);
+ });
+ return [pass, fail];
+ };
+
+ // Array Functions
+ // ---------------
+
+ // Get the first element of an array. Passing **n** will return the first N
+ // values in the array. Aliased as `head` and `take`. The **guard** check
+ // allows it to work with `_.map`.
+ _.first = _.head = _.take = function(array, n, guard) {
+ if (array == null) return void 0;
+ if (n == null || guard) return array[0];
+ return _.initial(array, array.length - n);
+ };
+
+ // Returns everything but the last entry of the array. Especially useful on
+ // the arguments object. Passing **n** will return all the values in
+ // the array, excluding the last N.
+ _.initial = function(array, n, guard) {
+ return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n)));
+ };
+
+ // Get the last element of an array. Passing **n** will return the last N
+ // values in the array.
+ _.last = function(array, n, guard) {
+ if (array == null) return void 0;
+ if (n == null || guard) return array[array.length - 1];
+ return _.rest(array, Math.max(0, array.length - n));
+ };
+
+ // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
+ // Especially useful on the arguments object. Passing an **n** will return
+ // the rest N values in the array.
+ _.rest = _.tail = _.drop = function(array, n, guard) {
+ return slice.call(array, n == null || guard ? 1 : n);
+ };
+
+ // Trim out all falsy values from an array.
+ _.compact = function(array) {
+ return _.filter(array, _.identity);
+ };
+
+ // Internal implementation of a recursive `flatten` function.
+ var flatten = function(input, shallow, strict, startIndex) {
+ var output = [], idx = 0;
+ for (var i = startIndex || 0, length = getLength(input); i < length; i++) {
+ var value = input[i];
+ if (isArrayLike(value) && (_.isArray(value) || _.isArguments(value))) {
+ //flatten current level of array or arguments object
+ if (!shallow) value = flatten(value, shallow, strict);
+ var j = 0, len = value.length;
+ output.length += len;
+ while (j < len) {
+ output[idx++] = value[j++];
+ }
+ } else if (!strict) {
+ output[idx++] = value;
+ }
+ }
+ return output;
+ };
+
+ // Flatten out an array, either recursively (by default), or just one level.
+ _.flatten = function(array, shallow) {
+ return flatten(array, shallow, false);
+ };
+
+ // Return a version of the array that does not contain the specified value(s).
+ _.without = function(array) {
+ return _.difference(array, slice.call(arguments, 1));
+ };
+
+ // Produce a duplicate-free version of the array. If the array has already
+ // been sorted, you have the option of using a faster algorithm.
+ // Aliased as `unique`.
+ _.uniq = _.unique = function(array, isSorted, iteratee, context) {
+ if (!_.isBoolean(isSorted)) {
+ context = iteratee;
+ iteratee = isSorted;
+ isSorted = false;
+ }
+ if (iteratee != null) iteratee = cb(iteratee, context);
+ var result = [];
+ var seen = [];
+ for (var i = 0, length = getLength(array); i < length; i++) {
+ var value = array[i],
+ computed = iteratee ? iteratee(value, i, array) : value;
+ if (isSorted) {
+ if (!i || seen !== computed) result.push(value);
+ seen = computed;
+ } else if (iteratee) {
+ if (!_.contains(seen, computed)) {
+ seen.push(computed);
+ result.push(value);
+ }
+ } else if (!_.contains(result, value)) {
+ result.push(value);
+ }
+ }
+ return result;
+ };
+
+ // Produce an array that contains the union: each distinct element from all of
+ // the passed-in arrays.
+ _.union = function() {
+ return _.uniq(flatten(arguments, true, true));
+ };
+
+ // Produce an array that contains every item shared between all the
+ // passed-in arrays.
+ _.intersection = function(array) {
+ var result = [];
+ var argsLength = arguments.length;
+ for (var i = 0, length = getLength(array); i < length; i++) {
+ var item = array[i];
+ if (_.contains(result, item)) continue;
+ for (var j = 1; j < argsLength; j++) {
+ if (!_.contains(arguments[j], item)) break;
+ }
+ if (j === argsLength) result.push(item);
+ }
+ return result;
+ };
+
+ // Take the difference between one array and a number of other arrays.
+ // Only the elements present in just the first array will remain.
+ _.difference = function(array) {
+ var rest = flatten(arguments, true, true, 1);
+ return _.filter(array, function(value){
+ return !_.contains(rest, value);
+ });
+ };
+
+ // Zip together multiple lists into a single array -- elements that share
+ // an index go together.
+ _.zip = function() {
+ return _.unzip(arguments);
+ };
+
+ // Complement of _.zip. Unzip accepts an array of arrays and groups
+ // each array's elements on shared indices
+ _.unzip = function(array) {
+ var length = array && _.max(array, getLength).length || 0;
+ var result = Array(length);
+
+ for (var index = 0; index < length; index++) {
+ result[index] = _.pluck(array, index);
+ }
+ return result;
+ };
+
+ // Converts lists into objects. Pass either a single array of `[key, value]`
+ // pairs, or two parallel arrays of the same length -- one of keys, and one of
+ // the corresponding values.
+ _.object = function(list, values) {
+ var result = {};
+ for (var i = 0, length = getLength(list); i < length; i++) {
+ if (values) {
+ result[list[i]] = values[i];
+ } else {
+ result[list[i][0]] = list[i][1];
+ }
+ }
+ return result;
+ };
+
+ // Generator function to create the findIndex and findLastIndex functions
+ function createPredicateIndexFinder(dir) {
+ return function(array, predicate, context) {
+ predicate = cb(predicate, context);
+ var length = getLength(array);
+ var index = dir > 0 ? 0 : length - 1;
+ for (; index >= 0 && index < length; index += dir) {
+ if (predicate(array[index], index, array)) return index;
+ }
+ return -1;
+ };
+ }
+
+ // Returns the first index on an array-like that passes a predicate test
+ _.findIndex = createPredicateIndexFinder(1);
+ _.findLastIndex = createPredicateIndexFinder(-1);
+
+ // Use a comparator function to figure out the smallest index at which
+ // an object should be inserted so as to maintain order. Uses binary search.
+ _.sortedIndex = function(array, obj, iteratee, context) {
+ iteratee = cb(iteratee, context, 1);
+ var value = iteratee(obj);
+ var low = 0, high = getLength(array);
+ while (low < high) {
+ var mid = Math.floor((low + high) / 2);
+ if (iteratee(array[mid]) < value) low = mid + 1; else high = mid;
+ }
+ return low;
+ };
+
+ // Generator function to create the indexOf and lastIndexOf functions
+ function createIndexFinder(dir, predicateFind, sortedIndex) {
+ return function(array, item, idx) {
+ var i = 0, length = getLength(array);
+ if (typeof idx == 'number') {
+ if (dir > 0) {
+ i = idx >= 0 ? idx : Math.max(idx + length, i);
+ } else {
+ length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1;
+ }
+ } else if (sortedIndex && idx && length) {
+ idx = sortedIndex(array, item);
+ return array[idx] === item ? idx : -1;
+ }
+ if (item !== item) {
+ idx = predicateFind(slice.call(array, i, length), _.isNaN);
+ return idx >= 0 ? idx + i : -1;
+ }
+ for (idx = dir > 0 ? i : length - 1; idx >= 0 && idx < length; idx += dir) {
+ if (array[idx] === item) return idx;
+ }
+ return -1;
+ };
+ }
+
+ // Return the position of the first occurrence of an item in an array,
+ // or -1 if the item is not included in the array.
+ // If the array is large and already in sort order, pass `true`
+ // for **isSorted** to use binary search.
+ _.indexOf = createIndexFinder(1, _.findIndex, _.sortedIndex);
+ _.lastIndexOf = createIndexFinder(-1, _.findLastIndex);
+
+ // Generate an integer Array containing an arithmetic progression. A port of
+ // the native Python `range()` function. See
+ // [the Python documentation](http://docs.python.org/library/functions.html#range).
+ _.range = function(start, stop, step) {
+ if (stop == null) {
+ stop = start || 0;
+ start = 0;
+ }
+ step = step || 1;
+
+ var length = Math.max(Math.ceil((stop - start) / step), 0);
+ var range = Array(length);
+
+ for (var idx = 0; idx < length; idx++, start += step) {
+ range[idx] = start;
+ }
+
+ return range;
+ };
+
+ // Function (ahem) Functions
+ // ------------------
+
+ // Determines whether to execute a function as a constructor
+ // or a normal function with the provided arguments
+ var executeBound = function(sourceFunc, boundFunc, context, callingContext, args) {
+ if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args);
+ var self = baseCreate(sourceFunc.prototype);
+ var result = sourceFunc.apply(self, args);
+ if (_.isObject(result)) return result;
+ return self;
+ };
+
+ // Create a function bound to a given object (assigning `this`, and arguments,
+ // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+ // available.
+ _.bind = function(func, context) {
+ if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+ if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function');
+ var args = slice.call(arguments, 2);
+ var bound = function() {
+ return executeBound(func, bound, context, this, args.concat(slice.call(arguments)));
+ };
+ return bound;
+ };
+
+ // Partially apply a function by creating a version that has had some of its
+ // arguments pre-filled, without changing its dynamic `this` context. _ acts
+ // as a placeholder, allowing any combination of arguments to be pre-filled.
+ _.partial = function(func) {
+ var boundArgs = slice.call(arguments, 1);
+ var bound = function() {
+ var position = 0, length = boundArgs.length;
+ var args = Array(length);
+ for (var i = 0; i < length; i++) {
+ args[i] = boundArgs[i] === _ ? arguments[position++] : boundArgs[i];
+ }
+ while (position < arguments.length) args.push(arguments[position++]);
+ return executeBound(func, bound, this, this, args);
+ };
+ return bound;
+ };
+
+ // Bind a number of an object's methods to that object. Remaining arguments
+ // are the method names to be bound. Useful for ensuring that all callbacks
+ // defined on an object belong to it.
+ _.bindAll = function(obj) {
+ var i, length = arguments.length, key;
+ if (length <= 1) throw new Error('bindAll must be passed function names');
+ for (i = 1; i < length; i++) {
+ key = arguments[i];
+ obj[key] = _.bind(obj[key], obj);
+ }
+ return obj;
+ };
+
+ // Memoize an expensive function by storing its results.
+ _.memoize = function(func, hasher) {
+ var memoize = function(key) {
+ var cache = memoize.cache;
+ var address = '' + (hasher ? hasher.apply(this, arguments) : key);
+ if (!_.has(cache, address)) cache[address] = func.apply(this, arguments);
+ return cache[address];
+ };
+ memoize.cache = {};
+ return memoize;
+ };
+
+ // Delays a function for the given number of milliseconds, and then calls
+ // it with the arguments supplied.
+ _.delay = function(func, wait) {
+ var args = slice.call(arguments, 2);
+ return setTimeout(function(){
+ return func.apply(null, args);
+ }, wait);
+ };
+
+ // Defers a function, scheduling it to run after the current call stack has
+ // cleared.
+ _.defer = _.partial(_.delay, _, 1);
+
+ // Returns a function, that, when invoked, will only be triggered at most once
+ // during a given window of time. Normally, the throttled function will run
+ // as much as it can, without ever going more than once per `wait` duration;
+ // but if you'd like to disable the execution on the leading edge, pass
+ // `{leading: false}`. To disable execution on the trailing edge, ditto.
+ _.throttle = function(func, wait, options) {
+ var context, args, result;
+ var timeout = null;
+ var previous = 0;
+ if (!options) options = {};
+ var later = function() {
+ previous = options.leading === false ? 0 : _.now();
+ timeout = null;
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
+ };
+ return function() {
+ var now = _.now();
+ if (!previous && options.leading === false) previous = now;
+ var remaining = wait - (now - previous);
+ context = this;
+ args = arguments;
+ if (remaining <= 0 || remaining > wait) {
+ if (timeout) {
+ clearTimeout(timeout);
+ timeout = null;
+ }
+ previous = now;
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
+ } else if (!timeout && options.trailing !== false) {
+ timeout = setTimeout(later, remaining);
+ }
+ return result;
+ };
+ };
+
+ // Returns a function, that, as long as it continues to be invoked, will not
+ // be triggered. The function will be called after it stops being called for
+ // N milliseconds. If `immediate` is passed, trigger the function on the
+ // leading edge, instead of the trailing.
+ _.debounce = function(func, wait, immediate) {
+ var timeout, args, context, timestamp, result;
+
+ var later = function() {
+ var last = _.now() - timestamp;
+
+ if (last < wait && last >= 0) {
+ timeout = setTimeout(later, wait - last);
+ } else {
+ timeout = null;
+ if (!immediate) {
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
+ }
+ }
+ };
+
+ return function() {
+ context = this;
+ args = arguments;
+ timestamp = _.now();
+ var callNow = immediate && !timeout;
+ if (!timeout) timeout = setTimeout(later, wait);
+ if (callNow) {
+ result = func.apply(context, args);
+ context = args = null;
+ }
+
+ return result;
+ };
+ };
+
+ // Returns the first function passed as an argument to the second,
+ // allowing you to adjust arguments, run code before and after, and
+ // conditionally execute the original function.
+ _.wrap = function(func, wrapper) {
+ return _.partial(wrapper, func);
+ };
+
+ // Returns a negated version of the passed-in predicate.
+ _.negate = function(predicate) {
+ return function() {
+ return !predicate.apply(this, arguments);
+ };
+ };
+
+ // Returns a function that is the composition of a list of functions, each
+ // consuming the return value of the function that follows.
+ _.compose = function() {
+ var args = arguments;
+ var start = args.length - 1;
+ return function() {
+ var i = start;
+ var result = args[start].apply(this, arguments);
+ while (i--) result = args[i].call(this, result);
+ return result;
+ };
+ };
+
+ // Returns a function that will only be executed on and after the Nth call.
+ _.after = function(times, func) {
+ return function() {
+ if (--times < 1) {
+ return func.apply(this, arguments);
+ }
+ };
+ };
+
+ // Returns a function that will only be executed up to (but not including) the Nth call.
+ _.before = function(times, func) {
+ var memo;
+ return function() {
+ if (--times > 0) {
+ memo = func.apply(this, arguments);
+ }
+ if (times <= 1) func = null;
+ return memo;
+ };
+ };
+
+ // Returns a function that will be executed at most one time, no matter how
+ // often you call it. Useful for lazy initialization.
+ _.once = _.partial(_.before, 2);
+
+ // Object Functions
+ // ----------------
+
+ // Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed.
+ var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString');
+ var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString',
+ 'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString'];
+
+ function collectNonEnumProps(obj, keys) {
+ var nonEnumIdx = nonEnumerableProps.length;
+ var constructor = obj.constructor;
+ var proto = (_.isFunction(constructor) && constructor.prototype) || ObjProto;
+
+ // Constructor is a special case.
+ var prop = 'constructor';
+ if (_.has(obj, prop) && !_.contains(keys, prop)) keys.push(prop);
+
+ while (nonEnumIdx--) {
+ prop = nonEnumerableProps[nonEnumIdx];
+ if (prop in obj && obj[prop] !== proto[prop] && !_.contains(keys, prop)) {
+ keys.push(prop);
+ }
+ }
+ }
+
+ // Retrieve the names of an object's own properties.
+ // Delegates to **ECMAScript 5**'s native `Object.keys`
+ _.keys = function(obj) {
+ if (!_.isObject(obj)) return [];
+ if (nativeKeys) return nativeKeys(obj);
+ var keys = [];
+ for (var key in obj) if (_.has(obj, key)) keys.push(key);
+ // Ahem, IE < 9.
+ if (hasEnumBug) collectNonEnumProps(obj, keys);
+ return keys;
+ };
+
+ // Retrieve all the property names of an object.
+ _.allKeys = function(obj) {
+ if (!_.isObject(obj)) return [];
+ var keys = [];
+ for (var key in obj) keys.push(key);
+ // Ahem, IE < 9.
+ if (hasEnumBug) collectNonEnumProps(obj, keys);
+ return keys;
+ };
+
+ // Retrieve the values of an object's properties.
+ _.values = function(obj) {
+ var keys = _.keys(obj);
+ var length = keys.length;
+ var values = Array(length);
+ for (var i = 0; i < length; i++) {
+ values[i] = obj[keys[i]];
+ }
+ return values;
+ };
+
+ // Returns the results of applying the iteratee to each element of the object
+ // In contrast to _.map it returns an object
+ _.mapObject = function(obj, iteratee, context) {
+ iteratee = cb(iteratee, context);
+ var keys = _.keys(obj),
+ length = keys.length,
+ results = {},
+ currentKey;
+ for (var index = 0; index < length; index++) {
+ currentKey = keys[index];
+ results[currentKey] = iteratee(obj[currentKey], currentKey, obj);
+ }
+ return results;
+ };
+
+ // Convert an object into a list of `[key, value]` pairs.
+ _.pairs = function(obj) {
+ var keys = _.keys(obj);
+ var length = keys.length;
+ var pairs = Array(length);
+ for (var i = 0; i < length; i++) {
+ pairs[i] = [keys[i], obj[keys[i]]];
+ }
+ return pairs;
+ };
+
+ // Invert the keys and values of an object. The values must be serializable.
+ _.invert = function(obj) {
+ var result = {};
+ var keys = _.keys(obj);
+ for (var i = 0, length = keys.length; i < length; i++) {
+ result[obj[keys[i]]] = keys[i];
+ }
+ return result;
+ };
+
+ // Return a sorted list of the function names available on the object.
+ // Aliased as `methods`
+ _.functions = _.methods = function(obj) {
+ var names = [];
+ for (var key in obj) {
+ if (_.isFunction(obj[key])) names.push(key);
+ }
+ return names.sort();
+ };
+
+ // Extend a given object with all the properties in passed-in object(s).
+ _.extend = createAssigner(_.allKeys);
+
+ // Assigns a given object with all the own properties in the passed-in object(s)
+ // (https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)
+ _.extendOwn = _.assign = createAssigner(_.keys);
+
+ // Returns the first key on an object that passes a predicate test
+ _.findKey = function(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var keys = _.keys(obj), key;
+ for (var i = 0, length = keys.length; i < length; i++) {
+ key = keys[i];
+ if (predicate(obj[key], key, obj)) return key;
+ }
+ };
+
+ // Return a copy of the object only containing the whitelisted properties.
+ _.pick = function(object, oiteratee, context) {
+ var result = {}, obj = object, iteratee, keys;
+ if (obj == null) return result;
+ if (_.isFunction(oiteratee)) {
+ keys = _.allKeys(obj);
+ iteratee = optimizeCb(oiteratee, context);
+ } else {
+ keys = flatten(arguments, false, false, 1);
+ iteratee = function(value, key, obj) { return key in obj; };
+ obj = Object(obj);
+ }
+ for (var i = 0, length = keys.length; i < length; i++) {
+ var key = keys[i];
+ var value = obj[key];
+ if (iteratee(value, key, obj)) result[key] = value;
+ }
+ return result;
+ };
+
+ // Return a copy of the object without the blacklisted properties.
+ _.omit = function(obj, iteratee, context) {
+ if (_.isFunction(iteratee)) {
+ iteratee = _.negate(iteratee);
+ } else {
+ var keys = _.map(flatten(arguments, false, false, 1), String);
+ iteratee = function(value, key) {
+ return !_.contains(keys, key);
+ };
+ }
+ return _.pick(obj, iteratee, context);
+ };
+
+ // Fill in a given object with default properties.
+ _.defaults = createAssigner(_.allKeys, true);
+
+ // Creates an object that inherits from the given prototype object.
+ // If additional properties are provided then they will be added to the
+ // created object.
+ _.create = function(prototype, props) {
+ var result = baseCreate(prototype);
+ if (props) _.extendOwn(result, props);
+ return result;
+ };
+
+ // Create a (shallow-cloned) duplicate of an object.
+ _.clone = function(obj) {
+ if (!_.isObject(obj)) return obj;
+ return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+ };
+
+ // Invokes interceptor with the obj, and then returns obj.
+ // The primary purpose of this method is to "tap into" a method chain, in
+ // order to perform operations on intermediate results within the chain.
+ _.tap = function(obj, interceptor) {
+ interceptor(obj);
+ return obj;
+ };
+
+ // Returns whether an object has a given set of `key:value` pairs.
+ _.isMatch = function(object, attrs) {
+ var keys = _.keys(attrs), length = keys.length;
+ if (object == null) return !length;
+ var obj = Object(object);
+ for (var i = 0; i < length; i++) {
+ var key = keys[i];
+ if (attrs[key] !== obj[key] || !(key in obj)) return false;
+ }
+ return true;
+ };
+
+
+ // Internal recursive comparison function for `isEqual`.
+ var eq = function(a, b, aStack, bStack) {
+ // Identical objects are equal. `0 === -0`, but they aren't identical.
+ // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
+ if (a === b) return a !== 0 || 1 / a === 1 / b;
+ // A strict comparison is necessary because `null == undefined`.
+ if (a == null || b == null) return a === b;
+ // Unwrap any wrapped objects.
+ if (a instanceof _) a = a._wrapped;
+ if (b instanceof _) b = b._wrapped;
+ // Compare `[[Class]]` names.
+ var className = toString.call(a);
+ if (className !== toString.call(b)) return false;
+ switch (className) {
+ // Strings, numbers, regular expressions, dates, and booleans are compared by value.
+ case '[object RegExp]':
+ // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')
+ case '[object String]':
+ // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+ // equivalent to `new String("5")`.
+ return '' + a === '' + b;
+ case '[object Number]':
+ // `NaN`s are equivalent, but non-reflexive.
+ // Object(NaN) is equivalent to NaN
+ if (+a !== +a) return +b !== +b;
+ // An `egal` comparison is performed for other numeric values.
+ return +a === 0 ? 1 / +a === 1 / b : +a === +b;
+ case '[object Date]':
+ case '[object Boolean]':
+ // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+ // millisecond representations. Note that invalid dates with millisecond representations
+ // of `NaN` are not equivalent.
+ return +a === +b;
+ }
+
+ var areArrays = className === '[object Array]';
+ if (!areArrays) {
+ if (typeof a != 'object' || typeof b != 'object') return false;
+
+ // Objects with different constructors are not equivalent, but `Object`s or `Array`s
+ // from different frames are.
+ var aCtor = a.constructor, bCtor = b.constructor;
+ if (aCtor !== bCtor && !(_.isFunction(aCtor) && aCtor instanceof aCtor &&
+ _.isFunction(bCtor) && bCtor instanceof bCtor)
+ && ('constructor' in a && 'constructor' in b)) {
+ return false;
+ }
+ }
+ // Assume equality for cyclic structures. The algorithm for detecting cyclic
+ // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+
+ // Initializing stack of traversed objects.
+ // It's done here since we only need them for objects and arrays comparison.
+ aStack = aStack || [];
+ bStack = bStack || [];
+ var length = aStack.length;
+ while (length--) {
+ // Linear search. Performance is inversely proportional to the number of
+ // unique nested structures.
+ if (aStack[length] === a) return bStack[length] === b;
+ }
+
+ // Add the first object to the stack of traversed objects.
+ aStack.push(a);
+ bStack.push(b);
+
+ // Recursively compare objects and arrays.
+ if (areArrays) {
+ // Compare array lengths to determine if a deep comparison is necessary.
+ length = a.length;
+ if (length !== b.length) return false;
+ // Deep compare the contents, ignoring non-numeric properties.
+ while (length--) {
+ if (!eq(a[length], b[length], aStack, bStack)) return false;
+ }
+ } else {
+ // Deep compare objects.
+ var keys = _.keys(a), key;
+ length = keys.length;
+ // Ensure that both objects contain the same number of properties before comparing deep equality.
+ if (_.keys(b).length !== length) return false;
+ while (length--) {
+ // Deep compare each member
+ key = keys[length];
+ if (!(_.has(b, key) && eq(a[key], b[key], aStack, bStack))) return false;
+ }
+ }
+ // Remove the first object from the stack of traversed objects.
+ aStack.pop();
+ bStack.pop();
+ return true;
+ };
+
+ // Perform a deep comparison to check if two objects are equal.
+ _.isEqual = function(a, b) {
+ return eq(a, b);
+ };
+
+ // Is a given array, string, or object empty?
+ // An "empty" object has no enumerable own-properties.
+ _.isEmpty = function(obj) {
+ if (obj == null) return true;
+ if (isArrayLike(obj) && (_.isArray(obj) || _.isString(obj) || _.isArguments(obj))) return obj.length === 0;
+ return _.keys(obj).length === 0;
+ };
+
+ // Is a given value a DOM element?
+ _.isElement = function(obj) {
+ return !!(obj && obj.nodeType === 1);
+ };
+
+ // Is a given value an array?
+ // Delegates to ECMA5's native Array.isArray
+ _.isArray = nativeIsArray || function(obj) {
+ return toString.call(obj) === '[object Array]';
+ };
+
+ // Is a given variable an object?
+ _.isObject = function(obj) {
+ var type = typeof obj;
+ return type === 'function' || type === 'object' && !!obj;
+ };
+
+ // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp, isError.
+ _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp', 'Error'], function(name) {
+ _['is' + name] = function(obj) {
+ return toString.call(obj) === '[object ' + name + ']';
+ };
+ });
+
+ // Define a fallback version of the method in browsers (ahem, IE < 9), where
+ // there isn't any inspectable "Arguments" type.
+ if (!_.isArguments(arguments)) {
+ _.isArguments = function(obj) {
+ return _.has(obj, 'callee');
+ };
+ }
+
+ // Optimize `isFunction` if appropriate. Work around some typeof bugs in old v8,
+ // IE 11 (#1621), and in Safari 8 (#1929).
+ if (typeof /./ != 'function' && typeof Int8Array != 'object') {
+ _.isFunction = function(obj) {
+ return typeof obj == 'function' || false;
+ };
+ }
+
+ // Is a given object a finite number?
+ _.isFinite = function(obj) {
+ return isFinite(obj) && !isNaN(parseFloat(obj));
+ };
+
+ // Is the given value `NaN`? (NaN is the only number which does not equal itself).
+ _.isNaN = function(obj) {
+ return _.isNumber(obj) && obj !== +obj;
+ };
+
+ // Is a given value a boolean?
+ _.isBoolean = function(obj) {
+ return obj === true || obj === false || toString.call(obj) === '[object Boolean]';
+ };
+
+ // Is a given value equal to null?
+ _.isNull = function(obj) {
+ return obj === null;
+ };
+
+ // Is a given variable undefined?
+ _.isUndefined = function(obj) {
+ return obj === void 0;
+ };
+
+ // Shortcut function for checking if an object has a given property directly
+ // on itself (in other words, not on a prototype).
+ _.has = function(obj, key) {
+ return obj != null && hasOwnProperty.call(obj, key);
+ };
+
+ // Utility Functions
+ // -----------------
+
+ // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+ // previous owner. Returns a reference to the Underscore object.
+ _.noConflict = function() {
+ root._ = previousUnderscore;
+ return this;
+ };
+
+ // Keep the identity function around for default iteratees.
+ _.identity = function(value) {
+ return value;
+ };
+
+ // Predicate-generating functions. Often useful outside of Underscore.
+ _.constant = function(value) {
+ return function() {
+ return value;
+ };
+ };
+
+ _.noop = function(){};
+
+ _.property = property;
+
+ // Generates a function for a given object that returns a given property.
+ _.propertyOf = function(obj) {
+ return obj == null ? function(){} : function(key) {
+ return obj[key];
+ };
+ };
+
+ // Returns a predicate for checking whether an object has a given set of
+ // `key:value` pairs.
+ _.matcher = _.matches = function(attrs) {
+ attrs = _.extendOwn({}, attrs);
+ return function(obj) {
+ return _.isMatch(obj, attrs);
+ };
+ };
+
+ // Run a function **n** times.
+ _.times = function(n, iteratee, context) {
+ var accum = Array(Math.max(0, n));
+ iteratee = optimizeCb(iteratee, context, 1);
+ for (var i = 0; i < n; i++) accum[i] = iteratee(i);
+ return accum;
+ };
+
+ // Return a random integer between min and max (inclusive).
+ _.random = function(min, max) {
+ if (max == null) {
+ max = min;
+ min = 0;
+ }
+ return min + Math.floor(Math.random() * (max - min + 1));
+ };
+
+ // A (possibly faster) way to get the current timestamp as an integer.
+ _.now = Date.now || function() {
+ return new Date().getTime();
+ };
+
+ // List of HTML entities for escaping.
+ var escapeMap = {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ "'": ''',
+ '`': '`'
+ };
+ var unescapeMap = _.invert(escapeMap);
+
+ // Functions for escaping and unescaping strings to/from HTML interpolation.
+ var createEscaper = function(map) {
+ var escaper = function(match) {
+ return map[match];
+ };
+ // Regexes for identifying a key that needs to be escaped
+ var source = '(?:' + _.keys(map).join('|') + ')';
+ var testRegexp = RegExp(source);
+ var replaceRegexp = RegExp(source, 'g');
+ return function(string) {
+ string = string == null ? '' : '' + string;
+ return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string;
+ };
+ };
+ _.escape = createEscaper(escapeMap);
+ _.unescape = createEscaper(unescapeMap);
+
+ // If the value of the named `property` is a function then invoke it with the
+ // `object` as context; otherwise, return it.
+ _.result = function(object, property, fallback) {
+ var value = object == null ? void 0 : object[property];
+ if (value === void 0) {
+ value = fallback;
+ }
+ return _.isFunction(value) ? value.call(object) : value;
+ };
+
+ // Generate a unique integer id (unique within the entire client session).
+ // Useful for temporary DOM ids.
+ var idCounter = 0;
+ _.uniqueId = function(prefix) {
+ var id = ++idCounter + '';
+ return prefix ? prefix + id : id;
+ };
+
+ // By default, Underscore uses ERB-style template delimiters, change the
+ // following template settings to use alternative delimiters.
+ _.templateSettings = {
+ evaluate : /<%([\s\S]+?)%>/g,
+ interpolate : /<%=([\s\S]+?)%>/g,
+ escape : /<%-([\s\S]+?)%>/g
+ };
+
+ // When customizing `templateSettings`, if you don't want to define an
+ // interpolation, evaluation or escaping regex, we need one that is
+ // guaranteed not to match.
+ var noMatch = /(.)^/;
+
+ // Certain characters need to be escaped so that they can be put into a
+ // string literal.
+ var escapes = {
+ "'": "'",
+ '\\': '\\',
+ '\r': 'r',
+ '\n': 'n',
+ '\u2028': 'u2028',
+ '\u2029': 'u2029'
+ };
+
+ var escaper = /\\|'|\r|\n|\u2028|\u2029/g;
+
+ var escapeChar = function(match) {
+ return '\\' + escapes[match];
+ };
+
+ // JavaScript micro-templating, similar to John Resig's implementation.
+ // Underscore templating handles arbitrary delimiters, preserves whitespace,
+ // and correctly escapes quotes within interpolated code.
+ // NB: `oldSettings` only exists for backwards compatibility.
+ _.template = function(text, settings, oldSettings) {
+ if (!settings && oldSettings) settings = oldSettings;
+ settings = _.defaults({}, settings, _.templateSettings);
+
+ // Combine delimiters into one regular expression via alternation.
+ var matcher = RegExp([
+ (settings.escape || noMatch).source,
+ (settings.interpolate || noMatch).source,
+ (settings.evaluate || noMatch).source
+ ].join('|') + '|$', 'g');
+
+ // Compile the template source, escaping string literals appropriately.
+ var index = 0;
+ var source = "__p+='";
+ text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+ source += text.slice(index, offset).replace(escaper, escapeChar);
+ index = offset + match.length;
+
+ if (escape) {
+ source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+ } else if (interpolate) {
+ source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+ } else if (evaluate) {
+ source += "';\n" + evaluate + "\n__p+='";
+ }
+
+ // Adobe VMs need the match returned to produce the correct offest.
+ return match;
+ });
+ source += "';\n";
+
+ // If a variable is not specified, place data values in local scope.
+ if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+ source = "var __t,__p='',__j=Array.prototype.join," +
+ "print=function(){__p+=__j.call(arguments,'');};\n" +
+ source + 'return __p;\n';
+
+ try {
+ var render = new Function(settings.variable || 'obj', '_', source);
+ } catch (e) {
+ e.source = source;
+ throw e;
+ }
+
+ var template = function(data) {
+ return render.call(this, data, _);
+ };
+
+ // Provide the compiled source as a convenience for precompilation.
+ var argument = settings.variable || 'obj';
+ template.source = 'function(' + argument + '){\n' + source + '}';
+
+ return template;
+ };
+
+ // Add a "chain" function. Start chaining a wrapped Underscore object.
+ _.chain = function(obj) {
+ var instance = _(obj);
+ instance._chain = true;
+ return instance;
+ };
+
+ // OOP
+ // ---------------
+ // If Underscore is called as a function, it returns a wrapped object that
+ // can be used OO-style. This wrapper holds altered versions of all the
+ // underscore functions. Wrapped objects may be chained.
+
+ // Helper function to continue chaining intermediate results.
+ var result = function(instance, obj) {
+ return instance._chain ? _(obj).chain() : obj;
+ };
+
+ // Add your own custom functions to the Underscore object.
+ _.mixin = function(obj) {
+ _.each(_.functions(obj), function(name) {
+ var func = _[name] = obj[name];
+ _.prototype[name] = function() {
+ var args = [this._wrapped];
+ push.apply(args, arguments);
+ return result(this, func.apply(_, args));
+ };
+ });
+ };
+
+ // Add all of the Underscore functions to the wrapper object.
+ _.mixin(_);
+
+ // Add all mutator Array functions to the wrapper.
+ _.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+ var method = ArrayProto[name];
+ _.prototype[name] = function() {
+ var obj = this._wrapped;
+ method.apply(obj, arguments);
+ if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0];
+ return result(this, obj);
+ };
+ });
+
+ // Add all accessor Array functions to the wrapper.
+ _.each(['concat', 'join', 'slice'], function(name) {
+ var method = ArrayProto[name];
+ _.prototype[name] = function() {
+ return result(this, method.apply(this._wrapped, arguments));
+ };
+ });
+
+ // Extracts the result from a wrapped and chained object.
+ _.prototype.value = function() {
+ return this._wrapped;
+ };
+
+ // Provide unwrapping proxy for some methods used in engine operations
+ // such as arithmetic and JSON stringification.
+ _.prototype.valueOf = _.prototype.toJSON = _.prototype.value;
+
+ _.prototype.toString = function() {
+ return '' + this._wrapped;
+ };
+
+ // AMD registration happens at the end for compatibility with AMD loaders
+ // that may not enforce next-turn semantics on modules. Even though general
+ // practice for AMD registration is to be anonymous, underscore registers
+ // as a named module because, like jQuery, it is a base library that is
+ // popular enough to be bundled in a third party lib, but not be part of
+ // an AMD load request. Those cases could generate an error when an
+ // anonymous define() is called outside of a loader request.
+ if (typeof define === 'function' && define.amd) {
+ define('underscore', [], function() {
+ return _;
+ });
+ }
+}.call(this));
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/util/Json.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/util/Json.js
index 340b53d5cbc..82b676a177b 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/util/Json.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/openbis/js/v3/util/Json.js
@@ -87,7 +87,7 @@ define([ "underscore" ], function(_) {
if (jsonObject in hashedObjects) {
return hashedObjects[jsonObject];
} else {
- throw "Object with id: " + jsonObject + " and type: " + jsonType + " haven't been found in cache";
+ throw "Object with id: " + JSON.stringify(jsonObject) + " and type: " + jsonType + " haven't been found in cache";
}
} else {
return jsonObject;
@@ -102,7 +102,11 @@ define([ "underscore" ], function(_) {
var moduleName = typeToModuleName(jsonType);
var module = modulesMap[moduleName];
var moduleFieldTypeMap = module.$typeDescription || {};
- var object = new module;
+ try {
+ var object = new module(""); // some entities have a mandatory non-null constructor parameters
+ } catch(e) {
+ throw "Failed deserializing object " + JSON.stringify(jsonObject) + " into type " + jsonType + " with error " + e.message;
+ }
if (jsonId) {
if (jsonId in hashedObjects) {
--
GitLab