Changeset 5957 for SRUAggregator/trunk/src/main/resources/assets/js/search.js

Timestamp:

01/28/15 09:14:40 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha15: added support for new spec explains/search; misc UI corrections

File:

• SRUAggregator/trunk/src/main/resources/assets/js/search.js (modified) (11 diffs)

SRUAggregator/trunk/src/main/resources/assets/js/search.js

@@ -52 +52 @@
                         return r;
                 }
-                var t1 = x.title ? x.title : x.displayName;
-                var t2 = y.title ? y.title : y.displayName;
-                return t1.toLowerCase().localeCompare(t2.toLowerCase()); 
+                return x.title.toLowerCase().localeCompare(y.title.toLowerCase()); 
         };
 
@@ -177 +175 @@
                         corpora: new Corpora([], this.updateCorpora),
                         languageMap: {},
+                        query: "",
                         language: this.anyLanguage,
                         languageFilter: 'byMeta',
@@ -214 +213 @@
         },
 
-        search: function(query) {
-                // console.log(query);
+        search: function() {
+                var query = this.state.query;
                 if (!query) {
                         this.setState({ hits: this.nohits, searchId: null });
@@ -253 +252 @@
                                         // console.log("new search in: " + this.timeout+ "ms");
                                 } else {
-                                        // console.log("search ended");
+                                        console.log("search ended; hits:", json);
                                 }
                                 this.setState({hits:json});
-                                // console.log("hits:", json);
                         }.bind(this),
                 });
@@ -316 +314 @@
         },
 
+        handleChange: function(event) {
+        this.setState({query: event.target.value});
+        },
+
+        handleKey: function(event) {
+        if (event.keyCode==13) {
+                this.search();
+        }
+        },
+
         renderAggregator: function() {
                 var layer = layerMap[this.state.searchLayerId];
@@ -327 +335 @@
                                                         ), 
 
-                                                        React.createElement(SearchBox, {search: this.search, placeholder: layer.searchPlaceholder}), 
+                                                        React.createElement("input", {className: "form-control input-lg search", name: "query", type: "text", 
+                                                                value: this.state.query, placeholder: this.props.placeholder, 
+                                                                tabIndex: "1", onChange: this.handleChange, onKeyDown: this.handleKey}), 
                                                         React.createElement("div", {className: "input-group-btn"}, 
                                                                 React.createElement("button", {className: "btn btn-default input-lg", type: "button", onClick: this.search}, 
@@ -496 +506 @@
         }
 });
-/////////////////////////////////
-
-var SearchBox = React.createClass({displayName: 'SearchBox',
-        propTypes: {
-                search: PT.func.isRequired,
-                placeholder: PT.string.isRequired,
-        },
-
-        getInitialState: function () {
-                return {
-                        query: "",
-                };
-        },
-
-        handleChange: function(event) {
-        this.setState({query: event.target.value});
-        },
-
-        handleKey: function(event) {
-        if (event.keyCode==13) {
-                this.search();
-        }
-        },
-
-        search: function() {
-                this.props.search(this.state.query);
-        },
-
-        render: function() {
-                return  React.createElement("input", {className: "form-control input-lg search", 
-                                        name: "query", 
-                                        type: "text", 
-                                        value: this.state.query, 
-                                        placeholder: this.props.placeholder, 
-                                        tabIndex: "1", 
-                                        onChange: this.handleChange, 
-                                        onKeyDown: this.handleKey})  ;
-        }
-});
 
 /////////////////////////////////
@@ -584 +555 @@
                 var inline = {display:"inline-block"};
                 return  React.createElement("div", {style: inline}, 
-                                        React.createElement("span", {className: "corpusName"}, " ", corpus.title ? corpus.title : corpus.displayName), 
+                                        React.createElement("span", {className: "corpusName"}, " ", corpus.title), 
                                         React.createElement("span", {className: "institutionName"}, " — ", corpus.institution.name)
                                 );
@@ -592 +563 @@
                 var inline = {display:"inline-block"};
                 return  React.createElement("div", null, 
-                                        React.createElement(InfoPopover, {placement: "left", 
-                                                        title: corpus.title ? corpus.title : corpus.displayName}, 
+                                        React.createElement(InfoPopover, {placement: "left", title: corpus.title}, 
                                                 React.createElement("dl", {className: "dl-horizontal"}, 
                                                         React.createElement("dt", null, "Institution"), 
@@ -625 +595 @@
 
                 return corpusHit.diagnostics.map(function(d) {
-                        return  React.createElement("div", {className: "alert alert-danger", role: "alert"}, 
+                        return  React.createElement("div", {className: "alert alert-danger", role: "alert", key: d.dgnUri}, 
                                                 d.dgnMessage, ": ", d.dgnDiagnostic
                                         );
@@ -653 +623 @@
                         return false;
                 }
-                return  React.createElement(Panel, {key: corpusHit.corpus.displayName, 
+                return  React.createElement(Panel, {key: corpusHit.corpus.title, 
                                                 title: this.renderPanelTitle(corpusHit.corpus), 
                                                 info: this.renderPanelInfo(corpusHit.corpus)},