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

Timestamp:

12/10/14 14:33:08 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha 9: corpus view UI improvements, bug fixes

File:

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

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

@@ -90 +90 @@
                 var inline = {display:"inline-block"};
                 return  React.createElement("div", {style: inline}, 
-                                        React.createElement("span", {className: "corpusName"}, " ", corpus.displayName), 
+                                        React.createElement("span", {className: "corpusName"}, " ", corpus.title ? corpus.title : corpus.displayName), 
                                         React.createElement("span", {className: "institutionName"}, " — ", corpus.institution.name)
                                 );
@@ -98 +98 @@
                 var inline = {display:"inline-block"};
                 return  React.createElement("div", null, 
-                                        React.createElement(InfoPopover, {placement: "left", title: corpus.displayName}, 
+                                        React.createElement(InfoPopover, {placement: "left", 
+                                                        title: corpus.title ? corpus.title : corpus.displayName}, 
                                                 React.createElement("dl", {className: "dl-horizontal"}, 
                                                         React.createElement("dt", null, "Institution"), 
@@ -165 +166 @@
         },
 
-        renderFoundMessage: function() {
+        renderFoundMessage: function(hits) {
                 if (this.props.results.length === 0)
                         return false;
-                var hits = this.props.results.filter(function(corpusHit) { return corpusHit.kwics.length > 0; }).length;
                 var total = this.props.results.length;
                 return hits + " collections with results found in " + total + " searched collections";
@@ -191 +191 @@
 
         render: function() {
+                var hits = this.props.results.filter(function(corpusHit) { return corpusHit.kwics.length > 0; }).length;
                 var margintop = {marginTop:"10px"};
                 var margin = {marginTop:"0", padding:"20px"};
@@ -198 +199 @@
                                         React.createElement(ReactCSSTransitionGroup, {transitionName: "fade"}, 
                                                 React.createElement("div", {key: "-searching-message-", style: margintop}, this.renderSearchingMessage(), " "), 
-                                                React.createElement("div", {key: "-found-message-", style: margintop}, this.renderFoundMessage(), " "), 
+                                                React.createElement("div", {key: "-found-message-", style: margintop}, this.renderFoundMessage(hits), " "), 
                                                 React.createElement("div", {key: "-progress-", style: margintop}, this.renderProgressBar()), 
-                                                this.props.results.length > 0 ? this.renderKwicCheckbox() : false, 
+                                                hits > 0 ? this.renderKwicCheckbox() : false, 
                                                 this.props.results.map(this.renderResultPanels)
                                         )